Changeset 5026 for branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionInterpreter.cs

Timestamp:

12/06/10 10:28:34 (14 years ago)

Author:

mkommend

Message:

Added branched projects for new GP symbols (ticket #1256).

Location:

branches/GP.Symbols (TimeLag, Diff, Integral)

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis)
• HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionInterpreter.cs (modified) (3 diffs)

branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionInterpreter.cs

@@ -66 +66 @@
       public const byte Constant = 20;
       public const byte Arg = 21;
+
+      public const byte TimeLag = 22;
     }
 
@@ -90 +92 @@
       { typeof(Constant), OpCodes.Constant },
       { typeof(Argument), OpCodes.Arg },
+      { typeof(TimeLag), OpCodes.TimeLag},
     };
     private const int ARGUMENT_STACK_SIZE = 1024;
@@ -290 +293 @@
             return constTreeNode.Value;
           }
+        case OpCodes.TimeLag: {
+            var timeLagTreeNode = (LaggedTreeNode)currentInstr.dynamicNode;
+            row += timeLagTreeNode.Lag;
+            if (row < 0 || row >= dataset.Rows) {
+              row -= timeLagTreeNode.Lag;
+              return double.NaN;
+            }
+            double result = Evaluate();
+            row -= timeLagTreeNode.Lag;
+            return result;
+          }
         default: throw new NotSupportedException();
       }