Changeset 1070 for branches/CEDMA-Refactoring-Ticket419

Timestamp:

12/25/08 13:58:01 (16 years ago)

Author:

gkronber

Message:

fixed #448 (Calculation of mean throws an exception if the input data contains NaN values) in CEDMA refactoring branch (#419).

File:

• branches/CEDMA-Refactoring-Ticket419/HeuristicLab.DataAnalysis/Statistics.cs (modified) (3 diffs)

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.DataAnalysis/Statistics.cs

@@ -158 +158 @@
       if(values.Length == 0) throw new InvalidOperationException();
       double sum = 0.0;
-      int n = end - start;
+      int n = 0;
       for(int i = start; i < end; i++) {
-        if(double.IsNaN(values[i])) {
-          throw new NotFiniteNumberException();
-        } else {
+        if(!double.IsNaN(values[i])) {
           sum += values[i];
-        }
-      }
+          n++;
+        }
+      }
+      if (n == 0) throw new InvalidOperationException();
       return sum / n;
     }
@@ -221 +221 @@
     /// <returns></returns>
     public static double Variance(double[] values, int start, int end) {
-      int n = end - start;
-      if(n == 0) {
-        throw new InvalidOperationException();
-      }
-      if(n == 1)
+      if (end - start == 1)
         return 0.0;
 
@@ -231 +227 @@
       double squaredErrorsSum = 0.0;
 
-      for(int i = start; i < end; i++) {
-        if(double.IsNaN(values[i])) {
-          throw new NotFiniteNumberException();
-        }
-        double d = values[i] - mean;
-        squaredErrorsSum += d * d;
-      }
-      return squaredErrorsSum / (n - 1);      
+      int n = 0;
+      for (int i = start; i < end; i++) {
+        if (!double.IsNaN(values[i])) {
+          double d = values[i] - mean;
+          squaredErrorsSum += d * d;
+          n++;
+        }
+      }
+      if (n < 2) {
+        throw new InvalidOperationException();
+      }
+      return squaredErrorsSum / (n - 1);
     }
   }