Normalize line endings

Thieum · Sep 4, 2013 · d9e5021 · d9e5021
1 parent 908d3e0
commit d9e5021
Show file tree

Hide file tree

Showing 12 changed files with 11,583 additions and 11,583 deletions.
diff --git a/README.md b/README.md
@@ -1,22 +1,22 @@
-Math Expression Evaluator is a library for evaluating simple mathematical expressions. It supports simple expressions such as `2.5+5.9`, `17.89-2.47+7.16`, `5/2/2+1.5*3+4.58`, expressions with parentheses `(((9-6/2)*2-4)/2-6-1)/(2+24/(2+4))` and expressions with variables:
-
-``` csharp
-
-var a = 6;
-var b = 4.32m;
-var c = 24.15m;
-Assert.That(engine.Evaluate("(((9-a/2)*2-b)/2-a-1)/(2+c/(2+4))",new { a, b, c}), 
- Is.EqualTo((((9 - a / 2) * 2 - b) / 2 - a - 1) / (2 + c / (2 + 4))));
-```
-It is also possible to specify variables by using named arguments like this:
-
-``` csharp
-
-dynamic dynamicEngine = new ExpressionEvaluator();
-
-var a = 6;
-var b = 4.5m;
-var c = 2.6m;
-Assert.That(dynamicEngine.Evaluate("(c+b)*a", a: 6, b: 4.5, c: 2.6),
- Is.EqualTo((c + b) * a));
+Math Expression Evaluator is a library for evaluating simple mathematical expressions. It supports simple expressions such as `2.5+5.9`, `17.89-2.47+7.16`, `5/2/2+1.5*3+4.58`, expressions with parentheses `(((9-6/2)*2-4)/2-6-1)/(2+24/(2+4))` and expressions with variables:
+
+``` csharp
+
+var a = 6;
+var b = 4.32m;
+var c = 24.15m;
+Assert.That(engine.Evaluate("(((9-a/2)*2-b)/2-a-1)/(2+c/(2+4))",new { a, b, c}), 
+ Is.EqualTo((((9 - a / 2) * 2 - b) / 2 - a - 1) / (2 + c / (2 + 4))));
+```
+It is also possible to specify variables by using named arguments like this:
+
+``` csharp
+
+dynamic dynamicEngine = new ExpressionEvaluator();
+
+var a = 6;
+var b = 4.5m;
+var c = 2.6m;
+Assert.That(dynamicEngine.Evaluate("(c+b)*a", a: 6, b: 4.5, c: 2.6),
+ Is.EqualTo((c + b) * a));
 ```
diff --git a/SimpleExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs b/SimpleExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs
@@ -1,145 +1,145 @@
-using System;
-
-using NUnit.Framework;
-
-namespace SimpleExpressionEvaluator.Tests
-{
- public class ExpressionEvaluatorTests
- {
- private ExpressionEvaluator engine;
- private Random generator;
-
- [TestFixtureSetUp]
- public void SetUp()
- {
- engine = new ExpressionEvaluator();
- generator = new Random();
- }
-
- [Test]
- public void Empty_String_Is_Zero()
- {
- Assert.That(engine.Evaluate(""), Is.EqualTo(0));
- }
-
- [Test]
- public void Decimal_Is_Treated_As_Decimal()
- {
- var left = generator.Next(1, 100);
-
- Assert.That(engine.Evaluate(left.ToString()), Is.EqualTo(left));
- }
-
- [Test]
- public void Two_Plus_Two_Is_Four()
- {
- Assert.That(engine.Evaluate("2+2"), Is.EqualTo(4));
- }
-
- [Test]
- public void Can_Add_Two_Decimal_Numbers()
- {
- Assert.That(engine.Evaluate("2.7+3.2"), Is.EqualTo(2.7m + 3.2m));
- }
-
- [Test]
- public void Can_Add_Many_Numbers()
- {
- Assert.That(engine.Evaluate("1.2+3.4+5.6+7.8"), Is.EqualTo(1.2m + 3.4m + 5.6m + 7.8m));
- Assert.That(engine.Evaluate("1.7+2.9+14.24+6.58"), Is.EqualTo(1.7m + 2.9m + 14.24m + 6.58m));
- }
-
- [Test]
- public void Can_Subtract_Two_Numbers()
- {
- Assert.That(engine.Evaluate("5-2"), Is.EqualTo(5 - 2));
- }
-
- [Test]
- public void Can_Subtract_Multiple_Numbers()
- {
- Assert.That(engine.Evaluate("15.2-2.3-4.8-0.58"), Is.EqualTo(15.2m - 2.3m - 4.8m - 0.58m));
- }
-
- [Test]
- public void Can_Add_And_Subtract_Multiple_Numbers()
- {
- Assert.That(engine.Evaluate("15+8-4-2+7"), Is.EqualTo(15 + 8 - 4 - 2 + 7));
- Assert.That(engine.Evaluate("17.89-2.47+7.16"), Is.EqualTo(17.89m - 2.47m + 7.16m));
-
- }
-
- [Test]
- public void Can_Add_Subtract_Multiply_Divide_Multiple_Numbers()
- {
- Assert.That(engine.Evaluate("50-5*3*2+7"), Is.EqualTo(50 - 5 * 3 * 2 + 7));
- Assert.That(engine.Evaluate("84+15+4-4*3*9+24+4-54/3-5-7+47"), Is.EqualTo(84 + 15 + 4 - 4 * 3 * 9 + 24 + 4 - 54 / 3 - 5 - 7 + 47));
- Assert.That(engine.Evaluate("50-48/4/3+7*2*4+2+5+8"), Is.EqualTo(50 - 48 / 4 / 3 + 7 * 2 * 4 + 2 + 5 + 8));
- Assert.That(engine.Evaluate("5/2/2+1.5*3+4.58"), Is.EqualTo(5 / 2m / 2m + 1.5m * 3m + 4.58m));
- Assert.That(engine.Evaluate("25/3+1.34*2.56+1.49+2.36/1.48"), Is.EqualTo(25 / 3m + 1.34m * 2.56m + 1.49m + 2.36m / 1.48m));
- Assert.That(engine.Evaluate("2*3+5-4-2*5+7"), Is.EqualTo(2 * 3 + 5 - 4 - 2 * 5 + 7));
- }
-
- [Test]
- public void Supports_Parentheses()
- {
- Assert.That(engine.Evaluate("2*(5+3)"), Is.EqualTo(2 * (5 + 3)));
- Assert.That(engine.Evaluate("(5+3)*2"), Is.EqualTo((5 + 3) * 2));
- Assert.That(engine.Evaluate("(5+3)*5-2"), Is.EqualTo((5 + 3) * 5 - 2));
- Assert.That(engine.Evaluate("(5+3)*(5-2)"), Is.EqualTo((5 + 3) * (5 - 2)));
- Assert.That(engine.Evaluate("((5+3)*3-(8-2)/2)/2"), Is.EqualTo(((5 + 3) * 3 - (8 - 2) / 2) / 2m));
- Assert.That(engine.Evaluate("(4*(3+5)-4-8/2-(6-4)/2)*((2+4)*4-(8-5)/3)-5"), Is.EqualTo((4 * (3 + 5) - 4 - 8 / 2 - (6 - 4) / 2) * ((2 + 4) * 4 - (8 - 5) / 3) - 5));
- Assert.That(engine.Evaluate("(((9-6/2)*2-4)/2-6-1)/(2+24/(2+4))"), Is.EqualTo((((9 - 6 / 2) * 2 - 4) / 2m - 6 - 1) / (2 + 24 / (2 + 4))));
- }
-
- [Test]
- public void Can_Process_Simple_Variables()
- {
- decimal a = 2.6m;
- decimal b = 5.7m;
-
- Assert.That(engine.Evaluate("a", new { a }), Is.EqualTo(a));
- Assert.That(engine.Evaluate("a+a", new { a }), Is.EqualTo(a + a));
- Assert.That(engine.Evaluate("a+b", new { a, b }), Is.EqualTo(a + b));
- }
-
- [Test]
- public void Can_Process_Multiple_Variables()
- {
- var a = 6;
- var b = 4.5m;
- var c = 2.6m;
- Assert.That(engine.Evaluate("(((9-a/2)*2-b)/2-a-1)/(2+c/(2+4))", new { a, b, c }), Is.EqualTo((((9 - a / 2) * 2 - b) / 2 - a - 1) / (2 + c / (2 + 4))));
- Assert.That(engine.Evaluate("(c+b)*a", new { a, b, c }), Is.EqualTo((c + b) * a));
- }
-
- [Test]
- public void Can_Pass_Named_Variables()
- {
- dynamic dynamicEngine = new ExpressionEvaluator();
-
- var a = 6;
- var b = 4.5m;
- var c = 2.6m;
-
- Assert.That(dynamicEngine.Evaluate("(c+b)*a", a: 6, b: 4.5, c: 2.6), Is.EqualTo((c + b) * a));
- }
-
- [Test]
- public void Can_Invoke_Expression_Multiple_Times()
- {
- var a = 6m;
- var b = 3.9m;
- var c = 4.9m;
-
- var compiled = engine.Compile("(a+b)/(a+c)");
- Assert.That(compiled(new { a, b, c }), Is.EqualTo((a + b) / (a + c)));
-
- a = 5.4m;
- b = -2.4m;
- c = 7.5m;
-
- Assert.That(compiled(new { a, b, c }), Is.EqualTo((a + b) / (a + c)));
- }
- }
+using System;
+
+using NUnit.Framework;
+
+namespace SimpleExpressionEvaluator.Tests
+{
+ public class ExpressionEvaluatorTests
+ {
+ private ExpressionEvaluator engine;
+ private Random generator;
+
+ [TestFixtureSetUp]
+ public void SetUp()
+ {
+ engine = new ExpressionEvaluator();
+ generator = new Random();
+ }
+
+ [Test]
+ public void Empty_String_Is_Zero()
+ {
+ Assert.That(engine.Evaluate(""), Is.EqualTo(0));
+ }
+
+ [Test]
+ public void Decimal_Is_Treated_As_Decimal()
+ {
+ var left = generator.Next(1, 100);
+
+ Assert.That(engine.Evaluate(left.ToString()), Is.EqualTo(left));
+ }
+
+ [Test]
+ public void Two_Plus_Two_Is_Four()
+ {
+ Assert.That(engine.Evaluate("2+2"), Is.EqualTo(4));
+ }
+
+ [Test]
+ public void Can_Add_Two_Decimal_Numbers()
+ {
+ Assert.That(engine.Evaluate("2.7+3.2"), Is.EqualTo(2.7m + 3.2m));
+ }
+
+ [Test]
+ public void Can_Add_Many_Numbers()
+ {
+ Assert.That(engine.Evaluate("1.2+3.4+5.6+7.8"), Is.EqualTo(1.2m + 3.4m + 5.6m + 7.8m));
+ Assert.That(engine.Evaluate("1.7+2.9+14.24+6.58"), Is.EqualTo(1.7m + 2.9m + 14.24m + 6.58m));
+ }
+
+ [Test]
+ public void Can_Subtract_Two_Numbers()
+ {
+ Assert.That(engine.Evaluate("5-2"), Is.EqualTo(5 - 2));
+ }
+
+ [Test]
+ public void Can_Subtract_Multiple_Numbers()
+ {
+ Assert.That(engine.Evaluate("15.2-2.3-4.8-0.58"), Is.EqualTo(15.2m - 2.3m - 4.8m - 0.58m));
+ }
+
+ [Test]
+ public void Can_Add_And_Subtract_Multiple_Numbers()
+ {
+ Assert.That(engine.Evaluate("15+8-4-2+7"), Is.EqualTo(15 + 8 - 4 - 2 + 7));
+ Assert.That(engine.Evaluate("17.89-2.47+7.16"), Is.EqualTo(17.89m - 2.47m + 7.16m));
+
+ }
+
+ [Test]
+ public void Can_Add_Subtract_Multiply_Divide_Multiple_Numbers()
+ {
+ Assert.That(engine.Evaluate("50-5*3*2+7"), Is.EqualTo(50 - 5 * 3 * 2 + 7));
+ Assert.That(engine.Evaluate("84+15+4-4*3*9+24+4-54/3-5-7+47"), Is.EqualTo(84 + 15 + 4 - 4 * 3 * 9 + 24 + 4 - 54 / 3 - 5 - 7 + 47));
+ Assert.That(engine.Evaluate("50-48/4/3+7*2*4+2+5+8"), Is.EqualTo(50 - 48 / 4 / 3 + 7 * 2 * 4 + 2 + 5 + 8));
+ Assert.That(engine.Evaluate("5/2/2+1.5*3+4.58"), Is.EqualTo(5 / 2m / 2m + 1.5m * 3m + 4.58m));
+ Assert.That(engine.Evaluate("25/3+1.34*2.56+1.49+2.36/1.48"), Is.EqualTo(25 / 3m + 1.34m * 2.56m + 1.49m + 2.36m / 1.48m));
+ Assert.That(engine.Evaluate("2*3+5-4-2*5+7"), Is.EqualTo(2 * 3 + 5 - 4 - 2 * 5 + 7));
+ }
+
+ [Test]
+ public void Supports_Parentheses()
+ {
+ Assert.That(engine.Evaluate("2*(5+3)"), Is.EqualTo(2 * (5 + 3)));
+ Assert.That(engine.Evaluate("(5+3)*2"), Is.EqualTo((5 + 3) * 2));
+ Assert.That(engine.Evaluate("(5+3)*5-2"), Is.EqualTo((5 + 3) * 5 - 2));
+ Assert.That(engine.Evaluate("(5+3)*(5-2)"), Is.EqualTo((5 + 3) * (5 - 2)));
+ Assert.That(engine.Evaluate("((5+3)*3-(8-2)/2)/2"), Is.EqualTo(((5 + 3) * 3 - (8 - 2) / 2) / 2m));
+ Assert.That(engine.Evaluate("(4*(3+5)-4-8/2-(6-4)/2)*((2+4)*4-(8-5)/3)-5"), Is.EqualTo((4 * (3 + 5) - 4 - 8 / 2 - (6 - 4) / 2) * ((2 + 4) * 4 - (8 - 5) / 3) - 5));
+ Assert.That(engine.Evaluate("(((9-6/2)*2-4)/2-6-1)/(2+24/(2+4))"), Is.EqualTo((((9 - 6 / 2) * 2 - 4) / 2m - 6 - 1) / (2 + 24 / (2 + 4))));
+ }
+
+ [Test]
+ public void Can_Process_Simple_Variables()
+ {
+ decimal a = 2.6m;
+ decimal b = 5.7m;
+
+ Assert.That(engine.Evaluate("a", new { a }), Is.EqualTo(a));
+ Assert.That(engine.Evaluate("a+a", new { a }), Is.EqualTo(a + a));
+ Assert.That(engine.Evaluate("a+b", new { a, b }), Is.EqualTo(a + b));
+ }
+
+ [Test]
+ public void Can_Process_Multiple_Variables()
+ {
+ var a = 6;
+ var b = 4.5m;
+ var c = 2.6m;
+ Assert.That(engine.Evaluate("(((9-a/2)*2-b)/2-a-1)/(2+c/(2+4))", new { a, b, c }), Is.EqualTo((((9 - a / 2) * 2 - b) / 2 - a - 1) / (2 + c / (2 + 4))));
+ Assert.That(engine.Evaluate("(c+b)*a", new { a, b, c }), Is.EqualTo((c + b) * a));
+ }
+
+ [Test]
+ public void Can_Pass_Named_Variables()
+ {
+ dynamic dynamicEngine = new ExpressionEvaluator();
+
+ var a = 6;
+ var b = 4.5m;
+ var c = 2.6m;
+
+ Assert.That(dynamicEngine.Evaluate("(c+b)*a", a: 6, b: 4.5, c: 2.6), Is.EqualTo((c + b) * a));
+ }
+
+ [Test]
+ public void Can_Invoke_Expression_Multiple_Times()
+ {
+ var a = 6m;
+ var b = 3.9m;
+ var c = 4.9m;
+
+ var compiled = engine.Compile("(a+b)/(a+c)");
+ Assert.That(compiled(new { a, b, c }), Is.EqualTo((a + b) / (a + c)));
+
+ a = 5.4m;
+ b = -2.4m;
+ c = 7.5m;
+
+ Assert.That(compiled(new { a, b, c }), Is.EqualTo((a + b) / (a + c)));
+ }
+ }
 }