Changeset 14878 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeInterpreter.cs
- Timestamp:
- 04/19/17 16:53:09 (7 years ago)
- Location:
- branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
-
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeInterpreter.cs
r14576 r14878 22 22 using System; 23 23 using System.Collections.Generic; 24 using System.Linq; 24 25 using HeuristicLab.Common; 25 26 using HeuristicLab.Core; … … 143 144 var variableTreeNode = (VariableTreeNode)instr.dynamicNode; 144 145 instr.data = dataset.GetReadOnlyDoubleValues(variableTreeNode.VariableName); 146 } else if (instr.opCode == OpCodes.FactorVariable) { 147 var factorTreeNode = instr.dynamicNode as FactorVariableTreeNode; 148 instr.data = dataset.GetReadOnlyStringValues(factorTreeNode.VariableName); 149 } else if (instr.opCode == OpCodes.BinaryFactorVariable) { 150 var factorTreeNode = instr.dynamicNode as BinaryFactorVariableTreeNode; 151 instr.data = dataset.GetReadOnlyStringValues(factorTreeNode.VariableName); 145 152 } else if (instr.opCode == OpCodes.LagVariable) { 146 153 var laggedVariableTreeNode = (LaggedVariableTreeNode)instr.dynamicNode; … … 455 462 return ((IList<double>)currentInstr.data)[row] * variableTreeNode.Weight; 456 463 } 464 case OpCodes.BinaryFactorVariable: { 465 if (row < 0 || row >= dataset.Rows) return double.NaN; 466 var factorVarTreeNode = currentInstr.dynamicNode as BinaryFactorVariableTreeNode; 467 return ((IList<string>)currentInstr.data)[row] == factorVarTreeNode.VariableValue ? factorVarTreeNode.Weight : 0; 468 } 469 case OpCodes.FactorVariable: { 470 if (row < 0 || row >= dataset.Rows) return double.NaN; 471 var factorVarTreeNode = currentInstr.dynamicNode as FactorVariableTreeNode; 472 return factorVarTreeNode.GetValue(((IList<string>)currentInstr.data)[row]); 473 } 457 474 case OpCodes.LagVariable: { 458 475 var laggedVariableTreeNode = (LaggedVariableTreeNode)currentInstr.dynamicNode;
Note: See TracChangeset
for help on using the changeset viewer.