Changeset 1891 for trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/TreeEvaluatorBase.cs

Timestamp:

05/25/09 17:46:17 (15 years ago)

Author:

gkronber

Message:

Fixed #645 (Tree evaluators precompile the model for each evaluation of a row).

File:

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

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/TreeEvaluatorBase.cs

@@ -62 +62 @@
     }
 
+    public void PrepareForEvaluation(IFunctionTree functionTree) {
+      BakedFunctionTree bakedTree = functionTree as BakedFunctionTree;
+      if (bakedTree == null) throw new ArgumentException("TreeEvaluators can only evaluate BakedFunctionTrees");
+
+      List<LightWeightFunction> linearRepresentation = bakedTree.LinearRepresentation;
+      codeArr = new Instr[linearRepresentation.Count];
+      int i = 0;
+      foreach (LightWeightFunction f in linearRepresentation) {
+        codeArr[i++] = TranslateToInstr(f);
+      }
+    }
+
     private Instr TranslateToInstr(LightWeightFunction f) {
       Instr instr = new Instr();
@@ -86 +98 @@
     }
 
-    public double Evaluate(IFunctionTree functionTree, int sampleIndex) {
-      BakedFunctionTree bakedTree = functionTree as BakedFunctionTree;
-      if (bakedTree == null) throw new ArgumentException("TreeEvaluators can only evaluate BakedFunctionTrees");
-
-      List<LightWeightFunction> linearRepresentation = bakedTree.LinearRepresentation;
-      codeArr = new Instr[linearRepresentation.Count];
-      int i = 0;
-      foreach (LightWeightFunction f in linearRepresentation) {
-        codeArr[i++] = TranslateToInstr(f);
-      }
-
+    public double Evaluate(int sampleIndex) {
       PC = 0;
       this.sampleIndex = sampleIndex;