Changeset 5897

Timestamp:

03/30/11 18:15:29 (13 years ago)

Author:

gkronber

Message:

#1453: fixed build fail by reverting unintentionally committed changes

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);
-          instr.dArg0 = variableTreeNode.Weight;
+          code[i] = instr;
         } else if (instr.opCode == OpCodes.LagVariable) {
           var variableTreeNode = instr.dynamicNode as LaggedVariableTreeNode;
           instr.iArg0 = (ushort)dataset.GetVariableIndex(variableTreeNode.VariableName);
-          instr.dArg0 = variableTreeNode.Weight;
+          code[i] = instr;
         } 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;
         }
       }
@@ -412 +408 @@
           }
         case OpCodes.Variable: {
-            return dataset[row, currentInstr.iArg0] * currentInstr.dArg0;
+            var variableTreeNode = currentInstr.dynamicNode as VariableTreeNode;
+            return dataset[row, currentInstr.iArg0] * variableTreeNode.Weight;
           }
         case OpCodes.LagVariable: {
@@ -418 +415 @@
             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] * currentInstr.dArg0;
+            return dataset[actualRow, currentInstr.iArg0] * laggedVariableTreeNode.Weight;
           }
         case OpCodes.Constant: {
-            return currentInstr.dArg0;
+            var constTreeNode = currentInstr.dynamicNode as ConstantTreeNode;
+            return constTreeNode.Value;
           }
 
@@ -429 +427 @@
             var variableConditionTreeNode = (VariableConditionTreeNode)currentInstr.dynamicNode;
             double variableValue = dataset[row, currentInstr.iArg0];
-            double x = variableValue - currentInstr.dArg0;
+            double x = variableValue - variableConditionTreeNode.Threshold;
             double p = 1 / (1 + Math.Exp(-variableConditionTreeNode.Slope * x));