Changeset 460 for trunk

Timestamp:

08/06/08 16:58:42 (16 years ago)

Author:

gkronber

Message:

minor changes in BakedTreeEvaluator to removed branches

File:

• trunk/sources/HeuristicLab.Functions/BakedTreeEvaluator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Functions/BakedTreeEvaluator.cs

@@ -204 +204 @@
             double x = EvaluateBakedCode();
             double y = EvaluateBakedCode();
-            if(condition == 0.0) return x;
-            else return y;
+            return condition * y - (condition - 1) * x;
           }
         case EvaluatorSymbolTable.LT: {
@@ -216 +215 @@
             double result = EvaluateBakedCode();
             Debug.Assert(result == 0.0 || result == 1.0);
-            if(result == 0.0) return 1.0;
-            else return 0.0;
+            return Math.Abs(result - 1.0);
           }
         case EvaluatorSymbolTable.OR: { // only defined for inputs 0 or 1
@@ -224 +222 @@
               double x = EvaluateBakedCode();
               Debug.Assert(x == 0.0 || x == 1.0);
-              if(x == 1.0) result = 1.0;
-            }
-            return result;
+              result += x;
+            }
+            return Math.Sign(result);
           }
         case EvaluatorSymbolTable.XOR: { // only defined for inputs 0 or 1