Changeset 9793

Timestamp:

07/26/13 15:58:54 (11 years ago)

Author:

bburlacu

Message:

#2021: Small code improvements.

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

@@ -178 +178 @@
           case OpCodes.Integral:
           case OpCodes.Derivative: {
+              Instruction[] seq = GetPrefixSequence(code, i);
+              var interpreterState = new InterpreterState(seq, 0);
+              instr.iArg0 = interpreterState;
               for (int j = 0; j != instr.nArguments; ++j) {
+                // the linear evaluator will skip these instructions and they will be evaluated using the default (recursive) evaluator
                 setSkip(code[instr.childIndex + j]);
               }
@@ -472 +476 @@
           case OpCodes.Integral:
           case OpCodes.Derivative: {
-              if (instr.iArg0 == null) {
-                instr.iArg0 = GetPrefixSequence(code, i); ;
-              }
-              var interpreterState = new InterpreterState((LinearInstruction[])instr.iArg0, 0);
-              instr.value = interpreter.Evaluate(dataset, ref row, interpreterState);
+              var state = (InterpreterState)instr.iArg0;
+              state.Reset();
+              instr.value = interpreter.Evaluate(dataset, ref row, state);
             }
             break;