Changeset 10774 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter

Timestamp:

04/23/14 13:12:07 (11 years ago)

Author:

mkommend

Message:

#2177: Implemented XOR symbol and adapted the interpreters and grammars.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter

Files:

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

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/OpCodes.cs

@@ -46 +46 @@
     public const byte OR = 14;
     public const byte NOT = 15;
+    public const byte XOR = 45;
 
 
@@ -99 +100 @@
       { typeof(Or), OpCodes.OR },
       { typeof(Not), OpCodes.NOT},
+      { typeof(Xor),OpCodes.XOR},
       { typeof(Average), OpCodes.Average},
       { typeof(InvokeFunction), OpCodes.Call },

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

@@ -344 +344 @@
             return Evaluate(dataset, ref row, state) > 0.0 ? -1.0 : 1.0;
           }
+        case OpCodes.XOR: {
+            double firstArgument = Evaluate(dataset, ref row, state);
+            double result = 1.0;
+            for (int i = 1; i < currentInstr.nArguments; i++) {
+              if (result <= 0.0) {
+                state.SkipInstructions();
+              } else {
+                double evalutationResult = Evaluate(dataset, ref row, state);
+                if (firstArgument <= 0 && evalutationResult > 0) result = -1.0;
+                else if (firstArgument > 0 && evalutationResult <= 0) result = -1.0;
+              }
+            }
+            return result > 0.0 ? 1.0 : -1.0;
+          }
         case OpCodes.GT: {
             double x = Evaluate(dataset, ref row, state);

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs

@@ -311 +311 @@
         } else if (instr.opCode == OpCodes.NOT) {
           instr.value = code[instr.childIndex].value > 0.0 ? -1.0 : 1.0;
+        } else if (instr.opCode == OpCodes.XOR) {
+          double firstArgument = code[instr.childIndex].value;
+          instr.value = 1.0;
+          for (int j = 1; j < instr.nArguments; j++) {
+            if (instr.value > 0.0) {
+              if (firstArgument <= 0 && code[instr.childIndex + j].value > 0) instr.value = -1.0;
+              if (firstArgument > 0 && code[instr.childIndex + j].value <= 0) instr.value = -1.0;
+            } else break;
+          }
+          instr.value = instr.value > 0.0 ? 1.0 : -1.0;
         } else if (instr.opCode == OpCodes.GT) {
           double x = code[instr.childIndex].value;