Changeset 14319 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Timestamp:

10/02/16 13:02:03 (8 years ago)

Author:

gkronber

Message:

#2657:

• added switch to determine if numeric parameters should be initialized randomly.
• fixed a bug in the infix parser

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/InfixExpressionParser.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/InfixExpressionParser.cs

@@ -143 +143 @@
           pos++;
           while (pos < str.Length && !char.IsWhiteSpace(str[pos])
-            && (str[pos] != '+' || str[pos-1] == 'e' || str[pos-1] == 'E')     // continue reading exponents
+            && (str[pos] != '+' || str[pos - 1] == 'e' || str[pos - 1] == 'E')     // continue reading exponents
             && (str[pos] != '-' || str[pos - 1] == 'e' || str[pos - 1] == 'E')
-            && str[pos] != '*'           
+            && str[pos] != '*'
             && str[pos] != '/'
             && str[pos] != ')') {
@@ -211 +211 @@
           pos++;
           yield return new Token { TokenType = TokenType.RightPar, strVal = ")" };
+        } else {
+          throw new ArgumentException("Invalid character: " + str[pos]);
         }
       }