Changeset 236 for trunk/sources/HeuristicLab.Functions/BakedTreeEvaluator.cs

Timestamp:

05/12/08 22:31:35 (16 years ago)

Author:

gkronber

Message:

minor changes

File:

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

trunk/sources/HeuristicLab.Functions/BakedTreeEvaluator.cs

@@ -104 +104 @@
 
     private static double EvaluateBakedCode() {
-      int arity = codeArr[PC++];
-      int functionSymbol = codeArr[PC++];
-      int nLocalVariables = codeArr[PC++];
+      int arity = codeArr[PC];
+      int functionSymbol = codeArr[PC+1];
+      int nLocalVariables = codeArr[PC+2];
+      PC += 3;
       switch(functionSymbol) {
         case VARIABLE: {
-            int var = (int)dataArr[DP++];
-            double weight = dataArr[DP++];
-            int offset = (int)dataArr[DP++];
-            int row = sampleIndex + offset;
+            int var = (int)dataArr[DP];
+            double weight = dataArr[DP+1];
+            int row = sampleIndex + (int)dataArr[DP+2];
+            DP += 3;
             if(row < 0 || row >= dataset.Rows) return double.NaN;
             else return weight * dataset.GetValue(row, var);
           }
         case CONSTANT: {
-            double value = dataArr[DP++];
-            return value;
+            return dataArr[DP++];
           }
         case MULTIPLICATION: {
-            double result = 1.0;
-            for(int i = 0; i < arity; i++) {
+            double result = EvaluateBakedCode();
+            for(int i = 1; i < arity; i++) {
               result *= EvaluateBakedCode();
             }
@@ -128 +128 @@
           }
         case ADDITION: {
-            double sum = 0.0;
-            for(int i = 0; i < arity; i++) {
+            double sum = EvaluateBakedCode();
+            for(int i = 1; i < arity; i++) {
               sum += EvaluateBakedCode();
             }
@@ -146 +146 @@
           }
         case DIVISION: {
+            double result;
             if(arity == 1) {
-              double divisor = EvaluateBakedCode();
-              if(divisor == 0) return 0;
-              else return 1.0 / divisor;
+              result = 1.0 / EvaluateBakedCode();
             } else {
-              double result = EvaluateBakedCode();
+              result = EvaluateBakedCode();
               for(int i = 1; i < arity; i++) {
-                double divisor = EvaluateBakedCode();
-                if(divisor == 0) result = 0;
-                else result /= divisor;
+                result /= EvaluateBakedCode();
               }
-              return result;
-            }
+            }
+            if(double.IsInfinity(result)) return 0.0;
+            else return result;
           }
         case AVERAGE: {
-            double sum = 0.0;
-            for(int i = 0; i < arity; i++) {
+            double sum = EvaluateBakedCode();
+            for(int i = 1; i < arity; i++) {
               sum += EvaluateBakedCode();
             }
@@ -185 +183 @@
           }
         case SIGNUM: {
-            // protected signum
             double value = EvaluateBakedCode();
-            if(value < 0) return -1;
-            if(value > 0) return 1;
-            return 0;
+            if(double.IsNaN(value)) return double.NaN;
+            else return Math.Sign(value);
           }
         case SQRT: {
@@ -203 +199 @@
             for(int i = 0; i < arity; i++) {
               double x = Math.Round(EvaluateBakedCode());
-              if(x == 0) result *= 0;
-              else if(x == 1.0) result *= 1.0;
-              else result *= double.NaN;
+              if(x == 0 || x==1.0) result *= x;
+              else result = double.NaN;
             }
             return result;