Changeset 5904 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4

Timestamp:

03/31/11 10:43:58 (14 years ago)

Author:

gkronber

Message:

#1453: improved performance of online evaluators.

Location:

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

Files:

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

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

@@ -55 +55 @@
 
     public void Add(double original, double estimated) {
-      if (double.IsNaN(estimated) || double.IsInfinity(estimated) || double.IsNaN(original) || double.IsInfinity(original)) {
+      if (double.IsNaN(estimated) || double.IsInfinity(estimated) || double.IsNaN(original) || double.IsInfinity(original) || (errorState & OnlineEvaluatorError.InvalidValueAdded) > 0) {
         errorState = errorState | OnlineEvaluatorError.InvalidValueAdded;
-      } else if (!errorState.HasFlag(OnlineEvaluatorError.InvalidValueAdded)) {
+      } else {
         n++;
-        errorState = OnlineEvaluatorError.None;        // n >= 1
+        errorState = errorState & (~OnlineEvaluatorError.InsufficientElementsAdded);        // n >= 1
 
         // online calculation of tMean

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

@@ -58 +58 @@
         original.IsAlmost(0.0)) {
         errorState = errorState | OnlineEvaluatorError.InvalidValueAdded;
-      } else if (!errorState.HasFlag(OnlineEvaluatorError.InvalidValueAdded)) {
+      } else {
         sre += Math.Abs((estimated - original) / original);
         n++;
-        errorState = OnlineEvaluatorError.None; // n >= 1
+        errorState = errorState & (~OnlineEvaluatorError.InsufficientElementsAdded);        // n >= 1
       }
     }

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

@@ -74 +74 @@
 
     public void Add(double x) {
-      if (double.IsNaN(x) || double.IsInfinity(x)) {
+      if (double.IsNaN(x) || double.IsInfinity(x) || (errorState & OnlineEvaluatorError.InvalidValueAdded) > 0) {
         errorState = errorState | OnlineEvaluatorError.InvalidValueAdded;
         varianceErrorState = errorState | OnlineEvaluatorError.InvalidValueAdded;
-      } else if (!errorState.HasFlag(OnlineEvaluatorError.InvalidValueAdded)) {
+      } else {
         n++;
         // See Knuth TAOCP vol 2, 3rd edition, page 232
@@ -83 +83 @@
           m_oldM = m_newM = x;
           m_oldS = 0.0;
-          errorState = OnlineEvaluatorError.None; // n >= 1
+          errorState = errorState & (~OnlineEvaluatorError.InsufficientElementsAdded);        // n >= 1
         } else {
-          varianceErrorState = OnlineEvaluatorError.None; // n >= 1
+          varianceErrorState = varianceErrorState & (~OnlineEvaluatorError.InsufficientElementsAdded);        // n >= 2
           m_newM = m_oldM + (x - m_oldM) / n;
           m_newS = m_oldS + (x - m_oldM) * (x - m_newM);

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

@@ -54 +54 @@
     public void Add(double original, double estimated) {
       if (double.IsNaN(estimated) || double.IsInfinity(estimated) ||
-          double.IsNaN(original) || double.IsInfinity(original)) {
+          double.IsNaN(original) || double.IsInfinity(original) || (errorState & OnlineEvaluatorError.InvalidValueAdded) > 0) {
         errorState = errorState | OnlineEvaluatorError.InvalidValueAdded;
-      } else if (!errorState.HasFlag(OnlineEvaluatorError.InvalidValueAdded)) {
+      } else {
         double error = estimated - original;
         sse += error * error;
         n++;
-        errorState = OnlineEvaluatorError.None; // n >= 1
+        errorState = errorState & (~OnlineEvaluatorError.InsufficientElementsAdded);        // n >= 1
       }
     }