Changeset 9363 for branches/OaaS/HeuristicLab.Optimization/3.3/RunCollectionModification

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.Optimization/3.3/RunCollectionModification/Calculator.cs (modified) (10 diffs)
• HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionDiscretizer.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionFormulaModifer.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionGroupCreater.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionRunRemover.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionSorter.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionValueRemover.cs (modified) (1 diff)

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

branches/OaaS/HeuristicLab.Optimization/3.3/RunCollectionModification/Calculator.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
 using HeuristicLab.Common;
@@ -8 +30 @@
 using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System.Text;
 
 namespace HeuristicLab.Optimization {
@@ -21 +42 @@
     [Storable]
     public string Formula {
-      get { return string.Join(" ", tokens); }
+      get { return tokens == null ? string.Empty : string.Join(" ", tokens); }
       set { tokens = Tokenize(value).ToList(); }
     }
@@ -56 +77 @@
       int i = 0;
       try {
-        for (; i<tokens.Count; i++) {
+        for (; i < tokens.Count; i++) {
           var token = tokens[i];
           double d;
@@ -64 +85 @@
             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 +111 @@
     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 +126 @@
     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 +208 @@
       try {
         stack.Push(func(a));
-      } catch (Exception) {
+      }
+      catch (Exception) {
         stack.Push(a);
         throw;
@@ -199 +222 @@
       try {
         stack.Push(func(a, b));
-      } catch (Exception) {
+      }
+      catch (Exception) {
         stack.Push(b);
         stack.Push(a);
@@ -214 +238 @@
       try {
         stack.Push(func(a, b, c));
-      } catch (Exception) {
+      }
+      catch (Exception) {
         stack.Push(a);
         stack.Push(b);

branches/OaaS/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionDiscretizer.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;

branches/OaaS/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionFormulaModifer.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;

branches/OaaS/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionGroupCreater.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;

branches/OaaS/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionRunRemover.cs

@@ -1 @@
-using System.Collections.Generic;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;

branches/OaaS/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionSorter.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;

branches/OaaS/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionValueRemover.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages