Changeset 9788 for branches

Timestamp:

07/26/13 15:01:41 (11 years ago)

Author:

bburlacu

Message:

#2021: Fixed evaluation bug for LaggedVariable symbols.

File:

• branches/HeuristicLab.DataAnalysis.Symbolic.LinearInterpreter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs (modified) (2 diffs)

branches/HeuristicLab.DataAnalysis.Symbolic.LinearInterpreter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs

@@ -129 +129 @@
 
     private static LinearInstruction[] GetPrefixSequence(LinearInstruction[] code, int startIndex) {
-      var instr = code[startIndex];
-      var list = new List<LinearInstruction> { instr };
-      for (int i = 0; i != instr.nArguments; ++i) {
-        list.AddRange(GetPrefixSequence(code, instr.childIndex + i));
-      }
-      return list.ToArray();
+      Action<LinearInstruction, List<LinearInstruction>> getPrefix = null;
+      getPrefix = (instr, list) => {
+        list.Add(instr);
+        for (int i = 0; i != instr.nArguments; ++i) {
+          getPrefix(code[instr.childIndex + i], list);
+        }
+      };
+      var l = new List<LinearInstruction>();
+      getPrefix(code[startIndex], l);
+      return l.ToArray();
     }
 
@@ -199 +203 @@
               var laggedVariableTreeNode = (LaggedVariableTreeNode)instr.dynamicNode;
               int actualRow = row + laggedVariableTreeNode.Lag;
-              if (actualRow < 0 || actualRow >= dataset.Rows) instr.value = double.NaN;
-              instr.value = ((IList<double>)instr.iArg0)[actualRow] * laggedVariableTreeNode.Weight;
+              if (actualRow < 0 || actualRow >= dataset.Rows)
+                instr.value = double.NaN;
+              else
+                instr.value = ((IList<double>)instr.iArg0)[actualRow] * laggedVariableTreeNode.Weight;
             }
             break;