1.6

vbodurov · Sep 22, 2013 · c015cf5 · c015cf5
1 parent 9601728
commit c015cf5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/GrapherApp.UI/Evaluator.cs b/GrapherApp.UI/Evaluator.cs
@@ -12,9 +12,9 @@ public class Evaluator
 
                 class Eval
                 {
-
                     public function ifNotNan(a : double, b : double) { return double.IsNaN(a) ? b : a; }
                     public function ifElse(condition : boolean, ifTrue : double, ifFalse : double) { return condition ? ifTrue : ifFalse; }
+                    public function lerp(a : double, b : double, c : double) { return (b - a) * c + a; }
                     public function avg(a : double, b : double) { return (b - a) * 0.5 + a; }
                     public function pow(x : double, n : double) { return System.Math.Pow(x, n); }
                     public function abs(x : double) { return System.Math.Abs(x); }
@@ -42,6 +42,7 @@ class Eval
 
                     public function IfNotNan(a : double, b : double) { return ifNotNan(a, b); }
                     public function IfElse(condition : boolean, ifTrue : double, ifFalse : double) { return ifElse(condition, ifTrue, ifFalse); }
+                    public function Lerp(a : double, b : double, c : double) { return lerp(a, b, c); }
                     public function Avg(a : double, b : double) { return avg(a,b); }
                     public function Pow(x : double, n : double) { return pow(x, n); }
                     public function Abs(x : double) { return abs(x); }
@@ -69,10 +70,10 @@ class Eval
 
                     public function EvaluateCode(code : String, x : double) : double
                     {
-                        var E : double = Math.E;
-                        var e : double = Math.E;
-                        var PI : double = Math.PI;
-                        var pi : double = Math.PI;
+                        var E : double = System.Math.E;
+                        var e : double = System.Math.E;
+                        var PI : double = System.Math.PI;
+                        var pi : double = System.Math.PI;
                         return eval(code);
                     }
                 }";

diff --git a/GrapherApp.UI/GrapherApp.UI.csproj b/GrapherApp.UI/GrapherApp.UI.csproj
@@ -30,8 +30,8 @@
     <SupportUrl>http://www.youvisio.com</SupportUrl>
     <ProductName>Grapher</ProductName>
     <PublisherName>YouVisio Productions Inc.</PublisherName>
-    <ApplicationRevision>18</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <ApplicationRevision>20</ApplicationRevision>
+    <ApplicationVersion>1.6.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/GrapherApp.UI/Properties/AssemblyInfo.cs b/GrapherApp.UI/Properties/AssemblyInfo.cs
@@ -49,5 +49,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("1.5.*")]
-[assembly: AssemblyFileVersion("1.5.*")]
+[assembly: AssemblyVersion("1.6.*")]
+[assembly: AssemblyFileVersion("1.6.*")]