Changeset 14237 for branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter

Timestamp:

08/05/16 14:25:28 (8 years ago)

Author:

gkronber

Message:

#2650: work in progress..

Location:

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

Files:

• SymbolicDataAnalysisExpressionTreeILEmittingInterpreter.cs (modified) (2 diffs)
• SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (1 diff)
• SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs (modified) (1 diff)

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

@@ -639 +639 @@
               il.Emit(System.Reflection.Emit.OpCodes.Ldc_R8, varNode.VariableValue); 
               il.Emit(System.Reflection.Emit.OpCodes.Call, string_eq);
+              throw new NotSupportedException();
               // TODO: convert bool to 1 / 0?
             } else {
@@ -652 +653 @@
               il.Emit(System.Reflection.Emit.OpCodes.Ldc_R8, varNode.VariableValue);
               il.Emit(System.Reflection.Emit.OpCodes.Call, string_eq);
+              throw new NotSupportedException();
               // TODO: convert bool to 1 / 0?
               il.Emit(System.Reflection.Emit.OpCodes.Br, normalResult);

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

@@ -462 +462 @@
             if (row < 0 || row >= dataset.Rows) return double.NaN;
             var factorVarTreeNode = currentInstr.dynamicNode as FactorVariableTreeNode;
-            return ((IList<string>)currentInstr.data)[row] == factorVarTreeNode.VariableValue ? 1 : 0;
+            return ((IList<string>)currentInstr.data)[row] == factorVarTreeNode.VariableValue ? factorVarTreeNode.Weight : 0;
           }
         case OpCodes.LagVariable: {

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

@@ -152 +152 @@
           else {
             var factorTreeNode = instr.dynamicNode as FactorVariableTreeNode;
-            instr.value = ((IList<string>)instr.data)[row] == factorTreeNode.VariableValue ? 1 : 0;
+            instr.value = ((IList<string>)instr.data)[row] == factorTreeNode.VariableValue ? factorTreeNode.Weight : 0;
           }
         } else if (instr.opCode == OpCodes.LagVariable) {