Changeset 2136 for trunk/sources/HeuristicLab.DataAnalysis/3.2

Timestamp:

07/06/09 17:12:37 (15 years ago)

Author:

gkronber

Message:

Improved handling of exceptional cases in data-based modeling evaluators. #688 (SimpleEvaluators should handle exceptional cases more gracefully)

File:

• trunk/sources/HeuristicLab.DataAnalysis/3.2/Statistics.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.DataAnalysis/3.2/Statistics.cs

@@ -119 +119 @@
 
     /// <summary>
-    /// calculates the sum of all values.
-    /// </summary>
-    /// <param name="values"></param>
-    /// <returns></returns>
-    public static double Sum(double[] values) {
-      int n = values.Length;
-      double sum = 0.0;
-      for (int i = 0; i < n; i++) {
-        if (double.IsNaN(values[i])) {
-          throw new NotFiniteNumberException();
-        } else {
-          sum += values[i];
-        }
-      }
-      return sum;
-    }
-
-    /// <summary>
     /// Calculates the mean of all values.
     /// </summary>
@@ -158 +140 @@
     /// <returns></returns>
     public static double Mean(double[] values, int start, int end) {
-      if (values.Length == 0) throw new InvalidOperationException();
+      if (values.Length == 0) throw new ArgumentException("Values is empty.");
+      if(end <=start) throw new ArgumentException("End is smaller or equal start");
       double sum = 0.0;
       int n = 0;
@@ -167 +150 @@
         }
       }
-      if (n == 0) throw new InvalidOperationException();
-      return sum / n;
+      if (n > 0)
+        return sum / n;
+      else throw new ArgumentException("Only NaN elements in values");
     }
 
@@ -223 +207 @@
     /// <returns></returns>
     public static double Variance(double[] values, int start, int end) {
+      if (values.Length == 0) throw new ArgumentException("Values is empty.");
+      if (end <= start) throw new ArgumentException("End is smaller or equal start");
       if (end - start == 1)
         return 0.0;
@@ -238 +224 @@
       }
       if (n < 2) {
-        throw new InvalidOperationException();
+        throw new ArgumentException("Only one non-NaN element in values");
       }
       return squaredErrorsSum / (n - 1);