Changeset 2619 for trunk/sources/HeuristicLab.SupportVectorMachines/3.2

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.SupportVectorMachines/3.2/Predictor.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/Predictor.cs

@@ -66 +66 @@
     }
 
-    public override double[] Predict(Dataset input, int start, int end) {
+    public override IEnumerable<double> Predict(Dataset input, int start, int end) {
       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");
@@ -78 +78 @@
       int targetVariableIndex = input.GetVariableIndex(targetVariable);
       int rows = end - start;
-      double[] result = new double[rows];
+      //double[] result = new double[rows];
       int problemRow = 0;
       for (int resultRow = 0; resultRow < rows; resultRow++) {
         if (double.IsNaN(input.GetValue(resultRow, targetVariableIndex)))
-          result[resultRow] = UpperPredictionLimit;
+          yield return UpperPredictionLimit;
         else if (resultRow + maxTimeOffset < 0) {
-          result[resultRow] = UpperPredictionLimit;
           problemRow++;
+          yield return UpperPredictionLimit;
         } else {
-          result[resultRow] = Math.Max(Math.Min(SVM.Prediction.Predict(model, scaledProblem.X[problemRow++]), UpperPredictionLimit), LowerPredictionLimit);
+          yield return Math.Max(Math.Min(SVM.Prediction.Predict(model, scaledProblem.X[problemRow++]), UpperPredictionLimit), LowerPredictionLimit);
         }
       }
-      return result;
     }