Changeset 14249 for branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeInterpreter.cs
- Timestamp:
- 08/09/16 15:34:33 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeInterpreter.cs
r14243 r14249 146 146 } else if (instr.opCode == OpCodes.FactorVariable) { 147 147 var factorTreeNode = instr.dynamicNode as BinaryFactorVariableTreeNode; 148 instr.data = dataset.GetReadOnlyStringValues(factorTreeNode.VariableName); 148 instr.data = dataset.GetReadOnlyStringValues(factorTreeNode.VariableName); 149 149 } else if (instr.opCode == OpCodes.LagVariable) { 150 150 var laggedVariableTreeNode = (LaggedVariableTreeNode)instr.dynamicNode; … … 459 459 return ((IList<double>)currentInstr.data)[row] * variableTreeNode.Weight; 460 460 } 461 case OpCodes. FactorVariable: {461 case OpCodes.BinaryFactorVariable: { 462 462 if (row < 0 || row >= dataset.Rows) return double.NaN; 463 463 var factorVarTreeNode = currentInstr.dynamicNode as BinaryFactorVariableTreeNode; 464 464 return ((IList<string>)currentInstr.data)[row] == factorVarTreeNode.VariableValue ? factorVarTreeNode.Weight : 0; 465 } 466 case OpCodes.FactorVariable: { 467 if (row < 0 || row >= dataset.Rows) return double.NaN; 468 var factorVarTreeNode = currentInstr.dynamicNode as FactorVariableTreeNode; 469 return factorVarTreeNode.GetValue(((IList<string>)currentInstr.data)[row]); 465 470 } 466 471 case OpCodes.LagVariable: {
Note: See TracChangeset
for help on using the changeset viewer.