Changeset 322 for trunk/sources/HeuristicLab.Functions/BakedFunctionTree.cs

Timestamp:

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

Author:

gkronber

Message:

made evaluator static (related to ticket #168)

File:

• trunk/sources/HeuristicLab.Functions/BakedFunctionTree.cs (modified) (2 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);
     }