Changeset 3409 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionEvaluator.cs

Timestamp:

04/19/10 10:18:15 (14 years ago)

Author:

gkronber

Message:

Worked on ADF aware evaluation for symbolic regression problems #938 (Data types and operators for regression problems)

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionEvaluator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionEvaluator.cs

@@ -44 +44 @@
         this.row = row;
         pc = 0;
+        arguments.Clear();
         var estimatedValue = Evaluate();
         if (double.IsNaN(estimatedValue) || double.IsInfinity(estimatedValue)) yield return 0.0;
@@ -50 +51 @@
     }
 
+    private List<double> arguments = new List<double>();
     public double Evaluate() {
       var currentInstr = code[pc++];
@@ -81 +83 @@
             return p;
           }
+        case CodeSymbol.Call: {
+            // save current arguments
+            var oldArgs = new List<double>(arguments);
+            arguments.Clear();
+            // evaluate sub-trees
+            for (int i = 0; i < currentInstr.nArguments; i++) {
+              arguments.Add(Evaluate());
+            }
+            // save the pc
+            int nextPc = pc;
+            // set pc to start of function  
+            pc = currentInstr.iArg0;
+            // evaluate the function
+            double v = Evaluate();
+            // restore the pc => evaluation will continue at point after my subtrees  
+            pc = nextPc;
+            // restore arguments
+            arguments = oldArgs;
+            return v;
+          }
+        case CodeSymbol.Arg: {
+            return arguments[currentInstr.iArg0];
+          }
         case CodeSymbol.Dynamic: {
             var variableTreeNode = currentInstr.dynamicNode as VariableTreeNode;