Changeset 322

Timestamp:

06/18/08 11:47:35 (16 years ago)

Author:

gkronber

Message:

made evaluator static (related to ticket #168)

Location:

trunk/sources/HeuristicLab.Functions

Files:

• BakedFunctionTree.cs (modified) (2 diffs)
• BakedTreeEvaluator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Functions/BakedFunctionTree.cs

@@ -52 +52 @@
     private bool variablesExpanded = false;
     private List<IVariable> variables;
-    private BakedTreeEvaluator evaluator = null;
 
     public BakedFunctionTree() {
@@ -221 +220 @@
     }
 
+    bool resetted = false;
     public double Evaluate(Dataset dataset, int sampleIndex) {
       FlattenVariables();
       FlattenTrees();
-      if(evaluator == null) evaluator = new BakedTreeEvaluator(linearRepresentation);
-      return evaluator.Evaluate(dataset, sampleIndex);
+      if(!resetted) {
+        BakedTreeEvaluator.ResetEvaluator(linearRepresentation);
+        resetted = true;
+      }
+      return BakedTreeEvaluator.Evaluate(dataset, sampleIndex);
     }
 

trunk/sources/HeuristicLab.Functions/BakedTreeEvaluator.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Functions {
-  internal class BakedTreeEvaluator {
+  internal static class BakedTreeEvaluator {
+    private const int MAX_TREE_SIZE = 4096;
+
     private class Instr {
       public double d_arg0;
@@ -38 +40 @@
     }
 
-    private Instr[] codeArr;
-    private int PC;
-    private Dataset dataset;
-    private int sampleIndex;
-
-    public BakedTreeEvaluator(List<LightWeightFunction> linearRepresentation) {
-      codeArr = new Instr[linearRepresentation.Count];
+    private static Instr[] codeArr;
+    private static int PC;
+    private static Dataset dataset;
+    private static int sampleIndex;
+
+
+    static BakedTreeEvaluator() {
+      codeArr = new Instr[MAX_TREE_SIZE];
+      for(int i = 0; i < MAX_TREE_SIZE; i++) {
+        codeArr[i] = new Instr();
+      }
+    }
+
+    public static void ResetEvaluator(List<LightWeightFunction> linearRepresentation) {
       int i = 0;
       foreach(LightWeightFunction f in linearRepresentation) {
-        codeArr[i++] = TranslateToInstr(f);
-      }
-    }
-
-    private Instr TranslateToInstr(LightWeightFunction f) {
-      Instr instr = new Instr();
+        TranslateToInstr(f, codeArr[i++]);
+      }
+    }
+
+    private static Instr TranslateToInstr(LightWeightFunction f, Instr instr) {
       instr.arity = f.arity;
       instr.symbol = EvaluatorSymbolTable.MapFunction(f.functionType);
@@ -70 +78 @@
     }
 
-    internal double Evaluate(Dataset dataset, int sampleIndex) {
+    internal static double Evaluate(Dataset dataset, int sampleIndex) {
       PC = 0;
-      this.sampleIndex = sampleIndex;
-      this.dataset = dataset;
+      BakedTreeEvaluator.sampleIndex = sampleIndex;
+      BakedTreeEvaluator.dataset = dataset;
       return EvaluateBakedCode();
     }
 
-    private double EvaluateBakedCode() {
+    private static double EvaluateBakedCode() {
       Instr currInstr = codeArr[PC++];
       switch(currInstr.symbol) {