Changeset 363 for trunk/sources/HeuristicLab.Functions

Timestamp:

07/04/08 17:30:24 (16 years ago)

Author:

gkronber

Message:

• implemented operator to store the best of run solution, in regard of a specific fitness variable).
• adapted struct-id infrastructure to allow evaluation of models on validation data.

ticket #194

Location:

trunk/sources/HeuristicLab.Functions

Files:

• BakedFunctionTree.cs (modified) (1 diff)
• BakedTreeEvaluator.cs (modified) (2 diffs)
• IFunctionTree.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Functions/BakedFunctionTree.cs

@@ -262 +262 @@
     }
 
-    bool evaluatorReset = false;
-    public double Evaluate(Dataset dataset, int sampleIndex) {
+    public void PrepareEvaluation(Dataset dataset) {
       FlattenVariables();
       FlattenTrees();
-      if(!evaluatorReset) {
-        BakedTreeEvaluator.ResetEvaluator(linearRepresentation);
-        evaluatorReset = true;
-      }
-      return BakedTreeEvaluator.Evaluate(dataset, sampleIndex);
+      BakedTreeEvaluator.ResetEvaluator(dataset, linearRepresentation);
+    }
+
+    public double Evaluate(int sampleIndex) {
+      return BakedTreeEvaluator.Evaluate(sampleIndex);
     }
 

trunk/sources/HeuristicLab.Functions/BakedTreeEvaluator.cs

@@ -53 +53 @@
     }
 
-    public static void ResetEvaluator(List<LightWeightFunction> linearRepresentation) {
+    public static void ResetEvaluator(Dataset dataset, List<LightWeightFunction> linearRepresentation) {
       int i = 0;
+      BakedTreeEvaluator.dataset = dataset;
       foreach(LightWeightFunction f in linearRepresentation) {
         TranslateToInstr(f, codeArr[i++]);
@@ -78 +79 @@
     }
 
-    internal static double Evaluate(Dataset dataset, int sampleIndex) {
+    internal static double Evaluate(int sampleIndex) {
       PC = 0;
       BakedTreeEvaluator.sampleIndex = sampleIndex;
-      BakedTreeEvaluator.dataset = dataset;
       return EvaluateBakedCode();
     }

trunk/sources/HeuristicLab.Functions/IFunctionTree.cs

@@ -40 +40 @@
     void RemoveSubTree(int index);
 
-    double Evaluate(Dataset dataset, int sampleIndex);
+    void PrepareEvaluation(Dataset dataset);
+    double Evaluate(int sampleIndex);
   }
 }