Changeset 2449

Timestamp:

10/27/09 09:50:46 (15 years ago)

Author:

gkronber

Message:

Fixed minor evaluation inconsistencies in HL3 tree evaluator. #791

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/HL3TreeEvaluator.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/HL3TreeEvaluator.cs

@@ -70 +70 @@
         case EvaluatorSymbolTable.SUBTRACTION: {
             double result = EvaluateBakedCode();
+            if (currInstr.arity == 1) return -result;
             for (int i = 1; i < currInstr.arity; i++) {
               result -= EvaluateBakedCode();
@@ -78 +79 @@
             double result;
             result = EvaluateBakedCode();
+            if (currInstr.arity == 1) {
+              return result.IsAlmost(0.0) ? 0.0 : 1.0 / result;
+            }
             for (int i = 1; i < currInstr.arity; i++) {
-              result /= EvaluateBakedCode();
+              double tmp = EvaluateBakedCode();
+              result = tmp.IsAlmost(0.0) ? 0.0 : result /= tmp;
             }
-            if (double.IsInfinity(result)) return 0.0;
-            else return result;
+            return result;
           }
         case EvaluatorSymbolTable.AVERAGE: {
@@ -122 +126 @@
             double result = EvaluateBakedCode();
             for (int i = 1; i < currInstr.arity; i++) {
-              if (result < 0.0) SkipBakedCode();
+              if (result <= 0.0) SkipBakedCode();
               else {
                 result = EvaluateBakedCode();
               }
             }
-            return Math.Sign(result);
+            return result <= 0.0 ? -1.0 : 1.0;
           }
         case EvaluatorSymbolTable.EQU: {
@@ -143 +147 @@
             double condition = EvaluateBakedCode();
             double result;
-            if (condition < 0.0) {
+            if (condition > 0.0) {
               result = EvaluateBakedCode(); SkipBakedCode();
             } else {
@@ -162 +166 @@
             double result = EvaluateBakedCode();
             for (int i = 1; i < currInstr.arity; i++) {
-              if (result >= 0.0) SkipBakedCode();
+              if (result > 0.0) SkipBakedCode();
               else {
                 result = EvaluateBakedCode();
               }
             }
-            return Math.Sign(result);
+            return result > 0.0 ? 1.0 : -1.0;
           }
         case EvaluatorSymbolTable.XOR: {
@@ -178 +182 @@
             }
             // invariant y >= x 
-            if (y < 0.0 || x > 0.0) return -1.0;
+            if (y <= 0.0 || x > 0.0) return -1.0;
             else return 1.0;
           }