Changeset 773 for trunk

Timestamp:

11/18/08 17:14:42 (16 years ago)

Author:

gkronber

Message:

fixed bugs in evaluator introduced with r767. #364 (Improve GP evaluation performance)

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification/BakedTreeEvaluator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification/BakedTreeEvaluator.cs

@@ -92 +92 @@
         constExpr &= branchConstExpr;
       }
-      codeArr[index].exprLength = exprLength;
 
       if (constExpr) {
-        codeArr[index].symbol = EvaluatorSymbolTable.CONSTANT;
         PC = index;
         codeArr[index].d_arg0 = EvaluateBakedCode();
-      }
+        codeArr[index].symbol = EvaluatorSymbolTable.CONSTANT;
+      }
+      codeArr[index].exprLength = exprLength;
     }
 
@@ -108 +108 @@
         case EvaluatorSymbolTable.DIFFERENTIAL:
         case EvaluatorSymbolTable.VARIABLE: {
-            instr.i_arg0 = (byte)f.data[0]; // var
+            instr.i_arg0 = (short)f.data[0]; // var
             instr.d_arg0 = f.data[1]; // weight
-            instr.i_arg1 = (byte)f.data[2]; // sample-offset
+            instr.i_arg1 = (short)f.data[2]; // sample-offset
             instr.exprLength = 1;
             break;