Changeset 2844

Timestamp:

02/19/10 18:51:36 (14 years ago)

Author:

gkronber

Message:

Added a check to SimpleStableCorrelationCoefficientEvaluator so that a r^{2 of 0.0 is returned instead of NaN (in case of division by zero). Also removed unnecessary try {} catch block in SimplePearsonCorrelationCoefficientEvaluator. #881}

Location:

trunk/sources/HeuristicLab.Modeling/3.2

Files:

• SimplePearsonCorrelationCoefficientEvaluator.cs (modified) (1 diff)
• SimpleStableCorrelationCoefficientEvaluator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Modeling/3.2/SimplePearsonCorrelationCoefficientEvaluator.cs

@@ -17 +17 @@
 
     public override double Evaluate(double[,] values) {
-      try {
-        return Calculate(values);
-      }
-      catch (ArgumentException) {
-        return double.NegativeInfinity;
-      }
+      return Calculate(values);
     }
 

trunk/sources/HeuristicLab.Modeling/3.2/SimpleStableCorrelationCoefficientEvaluator.cs

@@ -50 +50 @@
       double pop_sd_y = Math.Sqrt(sum_sq_y / values.GetLength(0));
       double cov_x_y = sum_coproduct / values.GetLength(0);
-      double r = cov_x_y / (pop_sd_x * pop_sd_y);
-      return r * r;
+
+      if (pop_sd_x == 0.0 || pop_sd_y == 0.0)
+        return 0.0;
+      else {
+        double r = cov_x_y / (pop_sd_x * pop_sd_y);
+        return r * r;
+      }
     }