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

Timestamp:

03/30/11 18:04:03 (13 years ago)

Author:

gkronber

Message:

#1453: Added an ErrorState property to online evaluators to indicate if the result value is valid or if there has been an error in the calculation. Adapted all classes that use one of the online evaluators to check this property.

File:

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

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

@@ -208 +208 @@
           var variableTreeNode = instr.dynamicNode as VariableTreeNode;
           instr.iArg0 = (ushort)dataset.GetVariableIndex(variableTreeNode.VariableName);
-          code[i] = instr;
+          instr.dArg0 = variableTreeNode.Weight;
         } else if (instr.opCode == OpCodes.LagVariable) {
           var variableTreeNode = instr.dynamicNode as LaggedVariableTreeNode;
           instr.iArg0 = (ushort)dataset.GetVariableIndex(variableTreeNode.VariableName);
-          code[i] = instr;
+          instr.dArg0 = variableTreeNode.Weight;
         } else if (instr.opCode == OpCodes.VariableCondition) {
           var variableConditionTreeNode = instr.dynamicNode as VariableConditionTreeNode;
           instr.iArg0 = (ushort)dataset.GetVariableIndex(variableConditionTreeNode.VariableName);
+          instr.dArg0 = variableConditionTreeNode.Threshold;
+        } else if (instr.opCode == OpCodes.Constant) {
+          var constTreeNode = instr.dynamicNode as ConstantTreeNode;
+          instr.dArg0 = constTreeNode.Value;
         }
       }
@@ -408 +412 @@
           }
         case OpCodes.Variable: {
-            var variableTreeNode = currentInstr.dynamicNode as VariableTreeNode;
-            return dataset[row, currentInstr.iArg0] * variableTreeNode.Weight;
+            return dataset[row, currentInstr.iArg0] * currentInstr.dArg0;
           }
         case OpCodes.LagVariable: {
@@ -415 +418 @@
             int actualRow = row + laggedVariableTreeNode.Lag;
             if (actualRow < 0 || actualRow >= dataset.Rows) throw new ArgumentException("Out of range access to dataset row: " + row);
-            return dataset[actualRow, currentInstr.iArg0] * laggedVariableTreeNode.Weight;
+            return dataset[actualRow, currentInstr.iArg0] * currentInstr.dArg0;
           }
         case OpCodes.Constant: {
-            var constTreeNode = currentInstr.dynamicNode as ConstantTreeNode;
-            return constTreeNode.Value;
+            return currentInstr.dArg0;
           }
 
@@ -427 +429 @@
             var variableConditionTreeNode = (VariableConditionTreeNode)currentInstr.dynamicNode;
             double variableValue = dataset[row, currentInstr.iArg0];
-            double x = variableValue - variableConditionTreeNode.Threshold;
+            double x = variableValue - currentInstr.dArg0;
             double p = 1 / (1 + Math.Exp(-variableConditionTreeNode.Slope * x));