Changeset 6908 for trunk

Timestamp:

10/12/11 15:45:04 (13 years ago)

Author:

epitzer

Message:

#1622 Fix quote handling and simplify tokenizer in Calculator and provide better error message.

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• Calculator.cs (modified) (3 diffs)
• RunCollectionDiscretizer.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/Calculator.cs

@@ -25 +25 @@
 
     private static readonly Regex TokenRegex =
-      new Regex(@"[a-zA-Z0-9._]+|""([^""]|\\"")*""|'([^']|\\')*'|[-+*/<>^]|dup|swap|drop|log|true|false|if|==|not|isnull|null|ismatch|rename");
+      new Regex(@"""(\\""|[^""])*""|'(\\'|[^'])*'|[^\s]+");
 
     #endregion
@@ -61 +61 @@
             stack.Push(d);
           } else if (token.StartsWith("\"")) {
-            stack.Push(GetVariableValue(variables, token.Substring(1, token.Length - 2).Replace(@"\""", @"""")));
+            stack.Push(GetVariableValue(variables, token.Substring(1, token.Length - 2).Replace("\\\"", "\"")));
           } else if (token.StartsWith("'")) {
-            stack.Push(token.Substring(1, token.Length-2).Replace("\'", "'"));
+            stack.Push(token.Substring(1, token.Length-2).Replace("\\'", "'"));
           } else {
             Apply(token, stack, variables);
@@ -70 +70 @@
       } catch (Exception x) {
         throw new Exception(string.Format(
-          "Calculation Failed at token #{1}: '{2}' {0}current stack is: {0}{3}", Environment.NewLine,
-          i, tokens[i], string.Join(Environment.NewLine, stack.Select(AsString))),
+          "Calculation of '{1}'{0}failed at token #{2}: '{3}' {0}current stack is: {0}{4}", Environment.NewLine,
+          Formula, i, tokens[i],
+          string.Join(Environment.NewLine, stack.Select(AsString))),
           x);
       }
-      if (stack.Count != 1) throw new Exception(string.Format("Invalid final evaluation stack size {0} (should be 1)", stack.Count));
+      if (stack.Count != 1)
+        throw new Exception(
+          string.Format("Invalid final evaluation stack size {0} (should be 1) in formula '{1}'",
+          stack.Count, Formula));
       var result = stack.Pop();
       if (result is string) return new StringValue((string)result);

trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionDiscretizer.cs

@@ -10 +10 @@
 
 namespace HeuristicLab.Optimization {
-  [Item("RunCollection Discretizer", "Creates several levels from the distribution of a certain result accross a run collection and assignes a discretized value.")]
+  [Item("RunCollection Discretizer",
+    "Creates several levels from the distribution of a certain result accross a run collection and " +
+    "assigns a discretized value. Non-existing numbers as well as NaN and infinities are excluded from the caluclation.")]
   [StorableClass]
   public class RunCollectionDiscretizer : ParameterizedNamedItem, IRunCollectionModifier {
@@ -139 +141 @@
       variables.TryGetValue(Source, out value);
       var intValue = value as IntValue;
-      if (intValue != null) {
+      if (intValue != null) 
         return intValue.Value;
-      } else {
-        var doubleValue = value as DoubleValue;
-        if (doubleValue != null)
-          return doubleValue.Value;
-      }
+      var doubleValue = value as DoubleValue;
+      if (doubleValue != null)
+        return doubleValue.Value;
       return null;
     }