Merge branch 'master' of https://github.com/sbesada/java.math.expression.parser

Author: sbesada

README.md

@@ -47,47 +47,58 @@ This algorithm is faster than JEP math expresion parser!!! If you compare java.m
 
 ### Real numbers
 
+        Parser.SimpleEval("6.5*7.8^2.3 + (3.5^3+7/2)^3 -(5*4/(2-3))*4"); --> for real functions
+
         String f_x = "+3 +5*5*(+1)";
 
-        ParserResult result = Parser.eval(f_x);
+        ParserResult result = Parser.eval(f_x); --> for real or complex functions
         assertTrue(result.getValue() == 28.0);
 
         final Point xo = new Point("x", new Double(2));
         f_x = "2.35*e^(-3)*x";
 
-        result = Parser.eval(f_x, xo);
+        result = Parser.eval(f_x, xo);  --> for real or complex functions with real or complex vars
         assertTrue(result.getValue() == 0.2339992213289606);
 
-
         final Point xo = new Point("x", new Double(2));
         final Point zo = new Point("z", new Double(1));
         String f_xs = " 2*(-(((z*3)*sqrt(x^(2)))+3))";        
         
-        Parser.Eval(f_xs, xo, zo);
+        Parser.Eval(f_xs, xo, zo); --> multiple vars
         
         String f_xs = "x+5*y+(3 -y)";
         final Point xo = new Point("x", "1+1");
         final Point yo = new Point("y", "0+2*0+1*5-5 +1^4"); //math expression in vars
 
         ParserResult result = Parser.eval(f_xs, xo, yo);
 		
-        final double result = Parser.eval("6.5*7.8^2.3 + (3.5^3+7/2)^3 -(5*4/(2-3))*4", null, null); 
-        --> execution time = 4ms in i7-6500U
- 
+       
+      
 ### Complex numbers
-
-The last version supports expressions with complex numbers and multiple vars. Here an example:
-
-        String f_x = " e^(1*x*acos((3/2-2j)^(pi)))";
         
-        Point xo = new Point("x", new Complex(1, 2));
+	    String f_x = " e^(1*x*acos((3/2-2j)^(pi)))";
+        
+        Point xo = new Point("x", new Complex(1, 2)); --> complex var: 1+ 2j
         ParserResult result = Parser.eval(f_x, xo);
         
         String f_x = "1+j +x";
         final Point xo = new Point("x", "2 +j"); //complex math expression in vars
 
         ParserResult result = Parser.eval(f_x, xo);
      
+### Execution time
+ 
+       These are the results for the version 3.0 (master). You can check the speedTests in the project
+  
+	   Parser.SimpleEval("6.5*7.8^2.3 + (3.5^3+7/2)^3 -(5*4/(2-3))*4 + 6.5*7.8^2.3 + (3.5^3+7/2)^3 -(5*4/(2-3))*4
+	   + 6.5*7.8^2.3 + (3.5^3+7/2)^3 -(5*4/(2-3))*4 + 6.5*7.8^2.3 + (3.5^3+7/2)^3 -(5*4/(2-3))*4");
+
+       CPU: i7-6500U
+       
+       test 1: one execution: 4ms
+       test 2: 100000 executions : 2100 ms --> mean time 0.021 ms per execution 
+       test 3: million executions: 16500 ms --> mean time 0.0165 ms per execution
+
 
 This version is compiled for Java 1.6