Changeset 5746 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlinePearsonsRSquaredEvaluator.cs

Timestamp:

03/18/11 09:57:44 (13 years ago)

Author:

gkronber

Message:

#1418 bug fixes and minor changes to improve performance in online evaluators.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlinePearsonsRSquaredEvaluator.cs (modified) (3 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlinePearsonsRSquaredEvaluator.cs

@@ -56 +56 @@
 
     public void Add(double x, double y) {
-      if (IsInvalidValue(x) || IsInvalidValue(y)) {
-        throw new ArgumentException("R² is not defined for variables with NaN or infinity values.");
-      }
+      // no need to check validity of values explicitly here as it is checked in all three evaluators 
       covEvaluator.Add(x, y);
       sxEvaluator.Add(x);
@@ -65 +63 @@
 
     #endregion
-
-    private static bool IsInvalidValue(double x) {
-      return double.IsNaN(x) || double.IsInfinity(x);
-    }
 
     public static double Calculate(IEnumerable<double> first, IEnumerable<double> second) {
@@ -79 +73 @@
         double estimated = secondEnumerator.Current;
         double original = firstEnumerator.Current;
-        if (!IsInvalidValue(estimated) && !IsInvalidValue(original))
-          rSquaredEvaluator.Add(original, estimated);
+        rSquaredEvaluator.Add(original, estimated);
       }