Changeset 8778 for trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionModification

Timestamp:

10/10/12 12:10:22 (12 years ago)

Author:

ascheibe

Message:

#1890 fixed a NullReferenceException when serializing a calculator that has not been assigned a formula

File:

• trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionModification/Calculator.cs (modified) (10 diffs)

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

@@ -3 +3 @@
 using System.Globalization;
 using System.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
 using HeuristicLab.Common;
@@ -8 +9 @@
 using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System.Text;
 
 namespace HeuristicLab.Optimization {
@@ -21 +21 @@
     [Storable]
     public string Formula {
-      get { return string.Join(" ", tokens); }
+      get { return tokens == null ? string.Empty : string.Join(" ", tokens); }
       set { tokens = Tokenize(value).ToList(); }
     }
@@ -56 +56 @@
       int i = 0;
       try {
-        for (; i<tokens.Count; i++) {
+        for (; i < tokens.Count; i++) {
           var token = tokens[i];
           double d;
@@ -64 +64 @@
             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);
           }
         }
-      } catch (Exception x) {
+      }
+      catch (Exception x) {
         throw new Exception(string.Format(
           "Calculation of '{1}'{0}failed at token #{2}: {3} {0}current stack is: {0}{4}", Environment.NewLine,
-          Formula, i, TokenWithContext(tokens, i, 3), 
+          Formula, i, TokenWithContext(tokens, i, 3),
           string.Join(Environment.NewLine, stack.Select(AsString))),
           x);
@@ -89 +90 @@
     private string TokenWithContext(List<string> tokens, int i, int context) {
       var sb = new StringBuilder();
-      if (i > context+1)
+      if (i > context + 1)
         sb.Append("... ");
       int prefix = Math.Max(0, i - context);
@@ -104 +105 @@
     private static void Apply(string token, Stack<object> stack, IDictionary<string, IItem> variables) {
       switch (token) {
-        case "null":  stack.Push(null); break;
-        case "true":  stack.Push(true); break;
+        case "null": stack.Push(null); break;
+        case "true": stack.Push(true); break;
         case "false": stack.Push(false); break;
 
@@ -186 +187 @@
       try {
         stack.Push(func(a));
-      } catch (Exception) {
+      }
+      catch (Exception) {
         stack.Push(a);
         throw;
@@ -199 +201 @@
       try {
         stack.Push(func(a, b));
-      } catch (Exception) {
+      }
+      catch (Exception) {
         stack.Push(b);
         stack.Push(a);
@@ -214 +217 @@
       try {
         stack.Push(func(a, b, c));
-      } catch (Exception) {
+      }
+      catch (Exception) {
         stack.Push(a);
         stack.Push(b);