Changeset 523 for trunk

Timestamp:

08/20/08 08:24:10 (16 years ago)

Author:

gkronber

Message:

minor speed tuning of BakedTreeEvaluator

File:

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

trunk/sources/HeuristicLab.Functions/BakedTreeEvaluator.cs

@@ -68 +68 @@
       instr.symbol = EvaluatorSymbolTable.MapFunction(f.functionType);
       switch(instr.symbol) {
-        case EvaluatorSymbolTable.DIFFERENTIAL: 
+        case EvaluatorSymbolTable.DIFFERENTIAL:
         case EvaluatorSymbolTable.VARIABLE: {
             instr.i_arg0 = (int)f.data[0]; // var
@@ -87 +87 @@
       this.sampleIndex = sampleIndex;
       return EvaluateBakedCode();
+    }
+
+    // skips a whole branch
+    private void SkipBakedCode() {
+      int i = 1;
+      while(i > 0) {
+        i+=codeArr[PC++].arity;
+        i--;
+      }
     }
 
@@ -179 +188 @@
           }
         case EvaluatorSymbolTable.AND: { // only defined for inputs 1 and 0
-            double result = 1.0;
-            // have to evaluate all sub-trees, skipping would probably not lead to a big gain because 
-            // we have to iterate over the linear structure anyway
-            for(int i = 0; i < currInstr.arity; i++) {
-              double x = EvaluateBakedCode();
-              Debug.Assert(x == 0.0 || x == 1.0);
-              result *= x;
+            double result = EvaluateBakedCode();
+            for(int i = 1; i < currInstr.arity; i++) {
+              if(result == 0.0) SkipBakedCode();
+              else {
+                result = EvaluateBakedCode();
+              }
+              Debug.Assert(result == 0.0 || result == 1.0);
             }
             return result;
@@ -203 +212 @@
             double condition = EvaluateBakedCode();
             Debug.Assert(condition == 0.0 || condition == 1.0);
-            double x = EvaluateBakedCode();
-            double y = EvaluateBakedCode();
-            return condition * y - (condition - 1) * x;
+            double result;
+            if(condition == 0.0) {
+              result = EvaluateBakedCode(); SkipBakedCode();
+            } else {
+              SkipBakedCode(); result = EvaluateBakedCode();
+            }
+            return result;
           }
         case EvaluatorSymbolTable.LT: {
@@ -219 +232 @@
           }
         case EvaluatorSymbolTable.OR: { // only defined for inputs 0 or 1
-            double result = 0.0; // default is false
-            for(int i = 0; i < currInstr.arity; i++) {
-              double x = EvaluateBakedCode();
-              Debug.Assert(x == 0.0 || x == 1.0);
-              result += x;
-            }
-            return Math.Sign(result);
+            double result = EvaluateBakedCode();
+            for(int i = 1; i < currInstr.arity; i++) {
+              if(result > 0.0) SkipBakedCode();
+              else {
+                result = EvaluateBakedCode();
+                Debug.Assert(result == 0.0 || result == 1.0);
+              }
+            }
+            return result;
           }
         case EvaluatorSymbolTable.XOR: { // only defined for inputs 0 or 1
@@ -232 +247 @@
             return Math.Abs(x - y);
           }
+        case EvaluatorSymbolTable.UNKNOWN:
         default: {
             throw new NotImplementedException();