new version 3.3.0

Author: sbesada

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>com.expression.parser</groupId>
 	<artifactId>com.expression.parser</artifactId>
 	<packaging>jar</packaging>
-	<version>3.2.0</version>
+	<version>3.3.0</version>
 	<name>com.expression.parser</name>
 	<description></description>
 

src/main/java/com/expression/parser/function/ComplexFunction.java

@@ -435,11 +435,11 @@ private String nextFunction(final String f) throws CalculatorException {
 		for (int i = 0; i < f.length(); i++) {
 			final char character = f.charAt(i);
 
-			if (character == '+' || character == '*' || character == '-' || character == '/') {
-				i = f.length();
-			} else if (isValidNumericAndCharacter(character)) {
+			if (isValidNumericAndCharacter(character)) {
 				result += character;
-			} else if (character == '^' || character == '.') {
+			} else if (character == '+' || character == '*' || character == '-' || character == '/') {
+				i = f.length();
+			} else if (character == '.' || character == '^') {
 				result += character;
 			} else if (character == '(') {
 				final String new_f = f.substring(i, nextBracket(f) + 1);
@@ -470,13 +470,11 @@ private String nextMinusFunction(final String f) throws CalculatorException {
 		for (int i = 0; i < f.length(); i++) {
 			final char character = f.charAt(i);
 
-			if (character == '+' || character == '-') {
-				i = f.length();
-			} else if (character == '*' || character == '/') {
+			if (isValidNumericAndCharacter(character)) {
 				result += character;
-			} else if (isValidNumericAndCharacter(character)) {
-				result += character;
-			} else if (character == '^' || character == '.') {
+			} else if (character == '+' || character == '-') {
+				i = f.length();
+			} else if (character == '*' || character == '/' || character == '.' || character == '^') {
 				result += character;
 			} else if (character == '(') {
 				final String new_f = f.substring(i, nextBracket(f) + 1);

src/main/java/com/expression/parser/function/FunctionX.java

@@ -314,11 +314,11 @@ private String nextFunction(final String f_x) throws CalculatorException {
 		for (int i = 0; i < f_x.length(); i++) {
 			final char character = f_x.charAt(i);
 
-			if (character == '+' || character == '*' || character == '-' || character == '/') {
-				i = f_x.length();
-			} else if (isValidNumericAndCharacter(character)) {
+			if (isValidNumericAndCharacter(character)) {
 				result += character;
-			} else if (character == '^' || character == '.') {
+			} else if (character == '+' || character == '*' || character == '-' || character == '/') {
+				i = f_x.length();
+			} else if (character == '.' || character == '^') {
 				result += character;
 			} else if (character == '(') {
 				final String new_f_x = f_x.substring(i, nextBracket(f_x) + 1);
@@ -347,13 +347,11 @@ private String nextMinusFunction(final String f_x) throws CalculatorException {
 		for (int i = 0; i < f_x.length(); i++) {
 			final char character = f_x.charAt(i);
 
-			if (character == '+' || character == '-') {
-				i = f_x.length();
-			} else if (character == '*' || character == '/') {
+			if (isValidNumericAndCharacter(character)) {
 				result += character;
-			} else if (isValidNumericAndCharacter(character)) {
-				result += character;
-			} else if (character == '^' || character == '.') {
+			} else if (character == '+' || character == '-') {
+				i = f_x.length();
+			} else if (character == '*' || character == '/' || character == '.' || character == '^') {
 				result += character;
 			} else if (character == '(') {
 				final String new_f_x = f_x.substring(i, nextBracket(f_x) + 1);

src/main/java/com/expression/parser/function/FunctionXs.java

@@ -334,11 +334,11 @@ private String nextFunction(final String f) throws CalculatorException {
 		for (int i = 0; i < f.length(); i++) {
 			final char character = f.charAt(i);
 
-			if (character == '+' || character == '*' || character == '-' || character == '/') {
-				i = f.length();
-			} else if (isValidNumericAndCharacter(character)) {
+			if (isValidNumericAndCharacter(character)) {
 				result += character;
-			} else if (character == '^' || character == '.') {
+			} else if (character == '+' || character == '*' || character == '-' || character == '/') {
+				i = f.length();
+			} else if (character == '.' || character == '^') {
 				result += character;
 			} else if (character == '(') {
 				final String new_f = f.substring(i, nextBracket(f) + 1);
@@ -368,13 +368,11 @@ private String nextMinusFunction(final String f) throws CalculatorException {
 		for (int i = 0; i < f.length(); i++) {
 			final char character = f.charAt(i);
 
-			if (character == '+' || character == '-') {
-				i = f.length();
-			} else if (character == '*' || character == '/') {
+			if (isValidNumericAndCharacter(character)) {
 				result += character;
-			} else if (isValidNumericAndCharacter(character)) {
-				result += character;
-			} else if (character == '^' || character == '.') {
+			} else if (character == '+' || character == '-') {
+				i = f.length();
+			} else if (character == '*' || character == '/' || character == '.' || character == '^') {
 				result += character;
 			} else if (character == '(') {
 				final String new_f = f.substring(i, nextBracket(f) + 1);

src/test/java/com/expression/parser/SpeedTest.java

@@ -20,7 +20,7 @@ public void testTwo() {
 
 		final long time1 = System.currentTimeMillis();
 
-		for (int i = 0; i < 100000; i++) {
+		for (int i = 0; i < 1000000; i++) {
 			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");
 		}