Changeset 5845

Timestamp:

03/28/11 17:25:10 (14 years ago)

Author:

gkronber

Message:

#1453: changed OnlineEvaluators so that they do not throw an ArgumentException on receiving infinity of NaN values but instead return double.NaN as result.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators

Files:

• OnlineCovarianceEvaluator.cs (modified) (1 diff)
• OnlineMeanAbsolutePercentageErrorEvaluator.cs (modified) (1 diff)
• OnlineMeanAndVarianceCalculator.cs (modified) (1 diff)
• OnlineMeanSquaredErrorEvaluator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineCovarianceEvaluator.cs

@@ -51 +51 @@
     public void Add(double original, double estimated) {
       if (double.IsNaN(estimated) || double.IsInfinity(estimated) ||
-          double.IsNaN(original) || double.IsInfinity(original)) {
-        throw new ArgumentException("Covariance is not defined for series containing NaN or infinity elements");
+          double.IsNaN(original) || double.IsInfinity(original) ||
+         double.IsNaN(Cn)) {
+        Cn = double.NaN;
       } else {
         n++;

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineMeanAbsolutePercentageErrorEvaluator.cs

@@ -50 +50 @@
     public void Add(double original, double estimated) {
       if (double.IsNaN(estimated) || double.IsInfinity(estimated) ||
-          double.IsNaN(original) || double.IsInfinity(original)) {
-        throw new ArgumentException("Relative error is not defined for variables with NaN or infinity values.");
+          double.IsNaN(original) || double.IsInfinity(original) ||
+        double.IsNaN(sre)) {
+        sre = double.NaN;
       } else {
         if (!original.IsAlmost(0.0)) {

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineMeanAndVarianceCalculator.cs

@@ -60 +60 @@
 
     public void Add(double x) {
-      if (double.IsNaN(x) || double.IsInfinity(x)) {
-        throw new ArgumentException("Mean and variance are not defined for NaN or infinity elements");
+      if (double.IsNaN(x) || double.IsInfinity(x) || double.IsNaN(m_newM)) {
+        m_newM = double.NaN;
+        m_newS = double.NaN;
       } else {
         n++;

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineMeanSquaredErrorEvaluator.cs

@@ -49 +49 @@
     public void Add(double original, double estimated) {
       if (double.IsNaN(estimated) || double.IsInfinity(estimated) ||
-          double.IsNaN(original) || double.IsInfinity(original)) {
-        throw new ArgumentException("Mean squared error is not defined for NaN or infinity elements");
+          double.IsNaN(original) || double.IsInfinity(original) ||
+        double.IsNaN(sse)) {
+        sse = double.NaN;
       } else {
         double error = estimated - original;