added if function + upgraded version number

pieterderycke · Oct 30, 2014 · ee149e7 · ee149e7
1 parent b46563e
commit ee149e7
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 11 deletions.
diff --git a/Jace.Tests/CalculationEngineTests.cs b/Jace.Tests/CalculationEngineTests.cs
@@ -429,14 +429,23 @@ public void TestComplicatedPrecedence2()
         }
 
         [TestMethod]
-        public void TestExpressionArguments()
+        public void TestExpressionArguments1()
         {
             CalculationEngine engine = new CalculationEngine(CultureInfo.InvariantCulture);
 
             double result = engine.Calculate("ifless(0.57, (3000-500)/(1500-500), 10, 20)");
             Assert.AreEqual(10, result);
         }
 
+        [TestMethod]
+        public void TestExpressionArguments2()
+        {
+            CalculationEngine engine = new CalculationEngine(CultureInfo.InvariantCulture);
+
+            double result = engine.Calculate("if(0.57 < (3000-500)/(1500-500), 10, 20)");
+            Assert.AreEqual(10, result);
+        }
+
         [TestMethod]
         public void TestNestedFunctions()
         {

diff --git a/Jace.WP7/Properties/AssemblyInfo.cs b/Jace.WP7/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.8.6")]
-[assembly: AssemblyFileVersion("0.8.6")]
+[assembly: AssemblyVersion("0.8.7")]
+[assembly: AssemblyFileVersion("0.8.7")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/Jace.WP8/Properties/AssemblyInfo.cs b/Jace.WP8/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.8.6")]
-[assembly: AssemblyFileVersion("0.8.6")]
+[assembly: AssemblyVersion("0.8.7")]
+[assembly: AssemblyFileVersion("0.8.7")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/Jace.WinRT/Properties/AssemblyInfo.cs b/Jace.WinRT/Properties/AssemblyInfo.cs
@@ -24,6 +24,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.8.6")]
-[assembly: AssemblyFileVersion("0.8.6")]
+[assembly: AssemblyVersion("0.8.7")]
+[assembly: AssemblyFileVersion("0.8.7")]
 [assembly: ComVisible(false)]
diff --git a/Jace/CalculationEngine.cs b/Jace/CalculationEngine.cs
@@ -262,6 +262,7 @@ private void RegisterDefaultFunctions()
             FunctionRegistry.RegisterFunction("abs", (Func<double, double>)((a) => Math.Abs(a)), false);
             FunctionRegistry.RegisterFunction("max", (Func<double, double, double>)((a, b) => Math.Max(a, b)), false);
             FunctionRegistry.RegisterFunction("min", (Func<double, double, double>)((a, b) => Math.Min(a, b)), false);
+            FunctionRegistry.RegisterFunction("if", (Func<double, double, double, double>)((a, b, c) => (a != 0.0 ? b : c)), false);
             FunctionRegistry.RegisterFunction("ifless", (Func<double, double, double, double, double>)((a, b, c, d) => (a < b ? c : d)), false);
             FunctionRegistry.RegisterFunction("ifmore", (Func<double, double, double, double, double>)((a, b, c, d) => (a > b ? c : d)), false);
             FunctionRegistry.RegisterFunction("ifequal", (Func<double, double, double, double, double>)((a, b, c, d) => (a == b ? c : d)), false);

diff --git a/Jace/Properties/AssemblyInfo.cs b/Jace/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.8.6")]
-[assembly: AssemblyFileVersion("0.8.6")]
+[assembly: AssemblyVersion("0.8.7")]
+[assembly: AssemblyFileVersion("0.8.7")]
diff --git a/buildNuGetPackage.cmd b/buildNuGetPackage.cmd
@@ -1,4 +1,4 @@
-SET version="0.8.6"
+SET version="0.8.7"
 
 msbuild /p:Configuration=Release Jace\Jace.csproj
 MKDIR nuget\lib\net40

diff --git a/buildZipPackage.cmd b/buildZipPackage.cmd
@@ -1,4 +1,4 @@
-SET version=0.8.6
+SET version=0.8.7
 
 msbuild /p:Configuration=Release Jace\Jace.csproj
 MKDIR zip\net40