Changeset 6732 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeInterpreter.cs

Timestamp:

09/10/11 15:34:19 (13 years ago)

Author:

gkronber

Message:

#1480 added IL emitting tree interpreter for symbolic data analysis and test case. Found and fixed a bug in the existing interpreter for boolean operators OR and AND with NaN arguments. However, this means that the output of previously stored solutions changes. We Probably we should keep the incorrect behavior now and document this accordingly, as changing this would need a version increment of all data analysis plugins.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeInterpreter.cs

@@ -308 +308 @@
             double result = Evaluate(dataset, ref row, state);
             for (int i = 1; i < currentInstr.nArguments; i++) {
-              if (result <= 0.0) SkipInstructions(state);
+              if (result > 0.0) result = Evaluate(dataset, ref row, state);
               else {
-                result = Evaluate(dataset, ref row, state);
+                SkipInstructions(state);
               }
             }
-            return result <= 0.0 ? -1.0 : 1.0;
+            return result > 0.0 ? 1.0 : -1.0;
           }
         case OpCodes.OR: {
             double result = Evaluate(dataset, ref row, state);
             for (int i = 1; i < currentInstr.nArguments; i++) {
-              if (result > 0.0) SkipInstructions(state);
+              if (result <= 0.0) result = Evaluate(dataset, ref row, state);
               else {
-                result = Evaluate(dataset, ref row, state);
+                SkipInstructions(state);
               }
             }