Changeset 699 for trunk/sources/HeuristicLab.GP.StructureIdentification

Timestamp:

10/27/08 15:13:59 (16 years ago)

Author:

gkronber

Message:

quick fix for #327.

File:

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

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

@@ -31 +31 @@
 namespace HeuristicLab.GP.StructureIdentification {
   public class BakedTreeEvaluator {
-    private const int MAX_TREE_SIZE = 4096;
     private const double EPSILON = 1.0e-7;
 
@@ -43 +42 @@
     }
 
-    private Instr[] codeArr;
+    private List<Instr> code;
     private int PC;
     private Dataset dataset;
@@ -50 +49 @@
 
     public BakedTreeEvaluator() {
-      codeArr = new Instr[MAX_TREE_SIZE];
-      for(int i = 0; i < MAX_TREE_SIZE; i++) {
-        codeArr[i] = new Instr();
-      }
+      code = new List<Instr>();
     }
 
@@ -59 +55 @@
       this.dataset = dataset;
       List<LightWeightFunction> linearRepresentation = functionTree.LinearRepresentation;
-      int i = 0;
+      code.Clear();
       foreach(LightWeightFunction f in linearRepresentation) {
-        TranslateToInstr(f, codeArr[i++]);
-      }
-    }
-
-    private Instr TranslateToInstr(LightWeightFunction f, Instr instr) {
+        Instr curInstr = new Instr();
+        TranslateToInstr(f, curInstr);
+        code.Add(curInstr);
+      }
+    }
+
+    private void TranslateToInstr(LightWeightFunction f, Instr instr) {
       instr.arity = f.arity;
       instr.symbol = EvaluatorSymbolTable.MapFunction(f.functionType);
@@ -85 +83 @@
           }
       }
-      return instr;
     }
 
@@ -98 +95 @@
       int i = 1;
       while(i > 0) {
-        i += codeArr[PC++].arity;
+        i += code[PC++].arity;
         i--;
       }
@@ -104 +101 @@
 
     private double EvaluateBakedCode() {
-      Instr currInstr = codeArr[PC++];
+      Instr currInstr = code[PC++];
       switch(currInstr.symbol) {
         case EvaluatorSymbolTable.VARIABLE: {