Changeset 1891 for trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Evaluators/GPEvaluatorBase.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/Evaluators/GPEvaluatorBase.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Evaluators/GPEvaluatorBase.cs

@@ -57 +57 @@
       bool useEstimatedValues = GetVariableValue<BoolData>("UseEstimatedTargetValue", scope, true).Data;
       ITreeEvaluator evaluator = GetVariableValue<ITreeEvaluator>("TreeEvaluator", scope, true);
+      evaluator.PrepareForEvaluation(functionTree);
 
       double[] backupValues = null;
@@ -68 +69 @@
       }
 
-      Evaluate(scope, evaluator, functionTree, dataset, targetVariable, start, end, useEstimatedValues);
+      Evaluate(scope, evaluator, dataset, targetVariable, start, end, useEstimatedValues);
 
       // restore the values of the target variable from the backup array if necessary
@@ -82 +83 @@
     }
 
-    public abstract void Evaluate(IScope scope, ITreeEvaluator evaluator, IFunctionTree tree, Dataset dataset, int targetVariable, int start, int end, bool updateTargetValues);
+    public abstract void Evaluate(IScope scope, ITreeEvaluator evaluator, Dataset dataset, int targetVariable, int start, int end, bool updateTargetValues);
   }
 }