Changeset 2619 for trunk/sources/HeuristicLab.GP.StructureIdentification

Timestamp:

01/10/10 21:01:03 (15 years ago)

Author:

gkronber

Message:

Implemented #834 (IPredictor.Predict() should return an IEnumerable<double> instead of an double[]).

File:

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

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Predictor.cs ¶

@@ -29 +29 @@
 using System.Xml;
 using HeuristicLab.DataAnalysis;
+using System.Linq;
 
 namespace HeuristicLab.GP.StructureIdentification {
@@ -50 +51 @@
     }
 
-    public override double[] Predict(Dataset input, int start, int end) {
+    public override IEnumerable<double> Predict(Dataset input, int start, int end) {
       treeEvaluator.UpperEvaluationLimit = UpperPredictionLimit;
       treeEvaluator.LowerEvaluationLimit = LowerPredictionLimit;
@@ -56 +57 @@
       if (start < 0 || end <= start) throw new ArgumentException("start must be larger than zero and strictly smaller than end");
       if (end > input.Rows) throw new ArgumentOutOfRangeException("number of rows in input is smaller then end");
-      treeEvaluator.PrepareForEvaluation(input, functionTree.FunctionTree);
-      double[] result = new double[end - start];
-      for (int i = 0; i < result.Length; i++) {
-        try {
-          result[i] = treeEvaluator.Evaluate(i + start);
-        }
-        catch (ArgumentException) {
-          result[i] = double.NaN;
-        }
-      }
-      return result;
+      return treeEvaluator.Evaluate(input, functionTree.FunctionTree, Enumerable.Range(start, end - start));
     }