Changeset 5923 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

04/01/11 10:12:37 (14 years ago)

Author:

gkronber

Message:

#1418 fixed bugs in symbolic data analysis expression tree interpreter regarding evaluation of models with lagged variables and dynamic symbols.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeInterpreter.cs

@@ -339 +339 @@
         case OpCodes.TimeLag: {
             var timeLagTreeNode = (LaggedTreeNode)currentInstr.dynamicNode;
-            if (row + timeLagTreeNode.Lag < 0 || row + timeLagTreeNode.Lag >= dataset.Rows)
-              return double.NaN;
-
             row += timeLagTreeNode.Lag;
             double result = Evaluate(dataset, ref row, state);
@@ -350 +347 @@
             int savedPc = state.ProgramCounter;
             var timeLagTreeNode = (LaggedTreeNode)currentInstr.dynamicNode;
-            if (row + timeLagTreeNode.Lag < 0 || row + timeLagTreeNode.Lag >= dataset.Rows)
-              return double.NaN;
             double sum = 0.0;
             for (int i = 0; i < Math.Abs(timeLagTreeNode.Lag); i++) {
@@ -368 +363 @@
         // y' = 1/8h (f_i + 2f_i-1, -2 f_i-3 - f_i-4)
         case OpCodes.Derivative: {
-            if (row - 4 < 0) return double.NaN;
             int savedPc = state.ProgramCounter;
             double f_0 = Evaluate(dataset, ref row, state); ; row--;
@@ -408 +402 @@
           }
         case OpCodes.Variable: {
+            if (row < 0 || row >= dataset.Rows)
+              return double.NaN;
             var variableTreeNode = currentInstr.dynamicNode as VariableTreeNode;
             return dataset[row, currentInstr.iArg0] * variableTreeNode.Weight;
@@ -414 +410 @@
             var laggedVariableTreeNode = currentInstr.dynamicNode as LaggedVariableTreeNode;
             int actualRow = row + laggedVariableTreeNode.Lag;
-            if (actualRow < 0 || actualRow >= dataset.Rows) throw new ArgumentException("Out of range access to dataset row: " + row);
+            if (actualRow < 0 || actualRow >= dataset.Rows)
+              return double.NaN;
             return dataset[actualRow, currentInstr.iArg0] * laggedVariableTreeNode.Weight;
           }
@@ -425 +422 @@
         //to determine the relative amounts of the true and false branch see http://en.wikipedia.org/wiki/Logistic_function
         case OpCodes.VariableCondition: {
+            if (row < 0 || row >= dataset.Rows)
+              return double.NaN;
             var variableConditionTreeNode = (VariableConditionTreeNode)currentInstr.dynamicNode;
             double variableValue = dataset[row, currentInstr.iArg0];