Changeset 14243 for branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeInterpreter.cs

Timestamp:

08/08/16 13:00:06 (8 years ago)

Author:

gkronber

Message:

#2650: renamed FactorVariable -> BinaryFactorVariable

File:

• branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (2 diffs)

branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeInterpreter.cs

@@ -145 +145 @@
           instr.data = dataset.GetReadOnlyDoubleValues(variableTreeNode.VariableName);
         } else if (instr.opCode == OpCodes.FactorVariable) {
-          var factorTreeNode = instr.dynamicNode as FactorVariableTreeNode;
+          var factorTreeNode = instr.dynamicNode as BinaryFactorVariableTreeNode;
           instr.data = dataset.GetReadOnlyStringValues(factorTreeNode.VariableName); 
         } else if (instr.opCode == OpCodes.LagVariable) {
@@ -461 +461 @@
         case OpCodes.FactorVariable: {
             if (row < 0 || row >= dataset.Rows) return double.NaN;
-            var factorVarTreeNode = currentInstr.dynamicNode as FactorVariableTreeNode;
+            var factorVarTreeNode = currentInstr.dynamicNode as BinaryFactorVariableTreeNode;
             return ((IList<string>)currentInstr.data)[row] == factorVarTreeNode.VariableValue ? factorVarTreeNode.Weight : 0;
           }