Changeset 6687 for trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionFormulaModifer.cs

Timestamp:

08/31/11 17:42:00 (13 years ago)

Author:

epitzer

Message:

Extend calculator to support other data types, literals, stack manipulations and conditionals (#1622)

File:

• trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionFormulaModifer.cs (modified) (4 diffs)

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

@@ -20 +20 @@
     public ValueParameter<StringValue> ResultNameParameter {
       get { return (ValueParameter<StringValue>)Parameters["ResultName"]; }
-    }    
-    
+    }
+
     public ValueParameter<StringValue> FormulaParameter {
       get { return (ValueParameter<StringValue>)Parameters["Formula"]; }
-    }    
+    }
 
-    #region Construction & Cloning    
+    private string ResultName { get { return ResultNameParameter.Value.Value; } }
+    private string Formula { get { return FormulaParameter.Value.Value; } }
+
+    #region Construction & Cloning
     [StorableConstructor]
     protected RunCollectionFormulaModifer(bool deserializing) : base(deserializing) { }
@@ -35 +38 @@
     public RunCollectionFormulaModifer() {
       Parameters.Add(new ValueParameter<StringValue>("ResultName", "The name of the result to be generated by this formula.", new StringValue("Calc.Value")));
-      Parameters.Add(new ValueParameter<StringValue>("Formula", "RPN formula for new value. This can contain existing run parameters or results (optionally in quotes if they contain whitespace), numbers and arithmetic operators in postfix notation.", new StringValue("1 1 +")));
+      Parameters.Add(new ValueParameter<StringValue>("Formula",
+@"RPN formula for new value in postfix notation.
+
+This can contain the following elements:
+
+literals:
+  numbers, true, false, null and strings in single quotes
+variables (run parameters or results):
+  unquoted or in double quotes if they contain special characters or whitespace
+mathematical functions:
+  +, -, /, ^ (power), log
+predicates:
+  ==, <, >, isnull, not
+stack manipulation:
+  drop swap dup
+string matching:
+  <string> <pattern> ismatch
+string replacing:
+  <string> <pattern> <replacement> rename
+conditionals:
+  <then> <else> <condition> if
+
+If the final value is null, the result variable is removed if it exists.",
+        new StringValue("1 1 +")));
       UpdateName();
       RegisterEvents();
@@ -58 +84 @@
 
     private void UpdateName() {
-      name = string.Format("{0} := {1}", ResultNameParameter.Value.Value, FormulaParameter.Value.Value);
+      name = string.Format("{0} := {1}", ResultName, Formula);
       OnNameChanged();
     }
 
     public void Modify(List<IRun> runs) {
-      var calc = new Calculator {Formula = FormulaParameter.Value.Value};      
+      var calc = new Calculator { Formula = Formula };
       foreach (var run in runs) {
         var variables = new Dictionary<string, IItem>();
@@ -70 +96 @@
         foreach (var result in run.Results)
           variables[result.Key] = result.Value;
-        run.Results[ResultNameParameter.Value.Value] = calc.GetValue(variables);        
-      }      
+        var value = calc.GetValue(variables);
+        if (value != null)
+          run.Results[ResultName] = value;
+        else
+          run.Results.Remove(ResultName);
+      }
     }
-    
+
   }
 }