Changeset 2619 for trunk/sources/HeuristicLab.ArtificialNeuralNetworks/3.2/Predictor.cs

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.ArtificialNeuralNetworks/3.2/Predictor.cs (modified) (1 diff)

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

@@ -37 +37 @@
     }
 
-    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");
-      double[] result = new double[end - start];
-      for (int i = 0; i < result.Length; i++) {
-        try {
-          double[] output = new double[1];
-          double[] inputRow = new double[input.Columns - 1];
-          for (int c = 1; c < inputRow.Length; c++) {
-            inputRow[c - 1] = input.GetValue(i + start, c);
-          }
-          alglib.mlpbase.multilayerperceptron p = perceptron.Perceptron;
-          alglib.mlpbase.mlpprocess(ref p, ref inputRow, ref output);
-          perceptron.Perceptron = p;
-          result[i] = Math.Max(Math.Min(output[0], UpperPredictionLimit), LowerPredictionLimit);
+
+      for (int i = 0; i < end - start; i++) {
+        double[] output = new double[1];
+        double[] inputRow = new double[input.Columns - 1];
+        for (int c = 1; c < inputRow.Length; c++) {
+          inputRow[c - 1] = input.GetValue(i + start, c);
         }
-        catch (ArgumentException) {
-          result[i] = double.NaN;
-        }
+        alglib.mlpbase.multilayerperceptron p = perceptron.Perceptron;
+        alglib.mlpbase.mlpprocess(ref p, ref inputRow, ref output);
+        perceptron.Perceptron = p;
+        yield return Math.Max(Math.Min(output[0], UpperPredictionLimit), LowerPredictionLimit);
       }
-      return result;
     }