Changeset 2578 for trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/BaseClasses

Timestamp:

01/02/10 18:10:15 (15 years ago)

Author:

gkronber

Message:

Implemented #824 (Refactor: ITreeEvaluator interface to provide a method that evaluates a tree on a range of samples.)

File:

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

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

@@ -60 +60 @@
     }
 
-    public void PrepareForEvaluation(Dataset dataset, IFunctionTree functionTree) {
+    [Obsolete]
+    public virtual void PrepareForEvaluation(Dataset dataset, IFunctionTree functionTree) {
       this.dataset = dataset;
       codeArr = new Instr[functionTree.GetSize()];
@@ -94 +95 @@
     }
 
-    public double Evaluate(int sampleIndex) {
+    [Obsolete]
+    public virtual double Evaluate(int sampleIndex) {
       PC = 0;
       this.sampleIndex = sampleIndex;
@@ -101 +103 @@
       if (double.IsNaN(estimated)) estimated = UpperEvaluationLimit;
       return estimated;
+    }
+
+    public virtual IEnumerable<double> Evaluate(Dataset dataset, IFunctionTree tree, IEnumerable<int> rows) {
+      PrepareForEvaluation(dataset, tree);
+      foreach (int row in rows)
+        yield return Evaluate(row);
     }