Changeset 483

Timestamp:

08/10/08 14:24:30 (16 years ago)

Author:

gkronber

Message:

fixed a bug uncovered by r482

Location:

trunk/sources

Files:

• HeuristicLab.Functions/BakedFunctionTree.cs (modified) (1 diff)
• HeuristicLab.Functions/BakedTreeEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Functions/IEvaluator.cs (modified) (1 diff)
• HeuristicLab.Functions/IFunctionTree.cs (modified) (1 diff)
• HeuristicLab.StructureIdentification/Evaluation/GPEvaluatorBase.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Functions/BakedFunctionTree.cs

@@ -270 +270 @@
     }
 
-    public IEvaluator CreateEvaluator(Dataset dataset) {
-      return new BakedTreeEvaluator(dataset);
+    public IEvaluator CreateEvaluator() {
+      return new BakedTreeEvaluator();
     }
 

trunk/sources/HeuristicLab.Functions/BakedTreeEvaluator.cs

@@ -48 +48 @@
 
 
-    public BakedTreeEvaluator(Dataset dataset) {
-      this.dataset = dataset;
+    public BakedTreeEvaluator() {
       codeArr = new Instr[MAX_TREE_SIZE];
       for(int i = 0; i < MAX_TREE_SIZE; i++) {
@@ -56 +55 @@
     }
 
-    public void ResetEvaluator(IFunctionTree functionTree) {
+    public void ResetEvaluator(IFunctionTree functionTree, Dataset dataset) {
+      this.dataset = dataset;
       List<LightWeightFunction> linearRepresentation = ((BakedFunctionTree)functionTree).LinearRepresentation;
       int i = 0;

trunk/sources/HeuristicLab.Functions/IEvaluator.cs

@@ -3 +3 @@
 using System.Linq;
 using System.Text;
+using HeuristicLab.DataAnalysis;
 
 namespace HeuristicLab.Functions {
   public interface IEvaluator {
-    void ResetEvaluator(IFunctionTree functionTree);
+    void ResetEvaluator(IFunctionTree functionTree, Dataset dataset);
     double Evaluate(int sampleIndex);
   }

trunk/sources/HeuristicLab.Functions/IFunctionTree.cs

@@ -40 +40 @@
     void RemoveSubTree(int index);
 
-    IEvaluator CreateEvaluator(Dataset dataset);
+    IEvaluator CreateEvaluator();
   }
 }

trunk/sources/HeuristicLab.StructureIdentification/Evaluation/GPEvaluatorBase.cs

@@ -87 +87 @@
 
       // initialize and reset the evaluator
-      if(evaluator == null) evaluator = functionTree.CreateEvaluator(dataset);
-      evaluator.ResetEvaluator(functionTree);
+      if(evaluator == null) evaluator = functionTree.CreateEvaluator();
+      evaluator.ResetEvaluator(functionTree, dataset);
       evaluatedSamples = 0;
 
@@ -97 +97 @@
       // update the value of total evaluated nodes
       scope.GetVariableValue<DoubleData>("TotalEvaluatedNodes", true).Data = totalEvaluatedNodes + treeSize * evaluatedSamples;
-      // write the calculate quality value
       return null;
     }