Changeset 5742 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis

Timestamp:

03/17/11 21:40:31 (14 years ago)

Author:

gkronber

Message:

#1418 fixed grammar cloning bug, improved analyzers for multi objective symbolic data analysis problems.

Location:

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

Files:

• OnlineCovarianceEvaluator.cs (modified) (1 diff)
• OnlineMeanAbsolutePercentageErrorEvaluator.cs (modified) (1 diff)
• OnlinePearsonsRSquaredEvaluator.cs (modified) (2 diffs)

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

@@ -30 +30 @@
     public double Covariance {
       get {
-        if (n < 1)
-          throw new InvalidOperationException("No elements");
-        else
-          return Cn / n;
+        return n > 0 ? Cn / n : 0.0;
       }
     }

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

@@ -31 +31 @@
     public double MeanAbsolutePercentageError {
       get {
-        if (n < 1)
-          throw new InvalidOperationException("No elements");
-        else
-          return sre / n;
+        return n > 0 ? sre / n : 0.0;
       }
     }

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

@@ -66 +66 @@
     #endregion
 
-    private bool IsInvalidValue(double x) {
+    private static bool IsInvalidValue(double x) {
       return double.IsNaN(x) || double.IsInfinity(x);
     }
@@ -79 +79 @@
         double estimated = secondEnumerator.Current;
         double original = firstEnumerator.Current;
-        rSquaredEvaluator.Add(original, estimated);
+        if (!IsInvalidValue(estimated) && !IsInvalidValue(original))
+          rSquaredEvaluator.Add(original, estimated);
       }