Changeset 5945

Timestamp:

04/04/11 18:09:49 (14 years ago)

Author:

mkommend

Message:

#1453: Stopped iterating over the enumerables in the static calculate method in OnlineCalculators.

Location:

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

Files:

• OnlineAccuracyCalculator.cs (modified) (1 diff)
• OnlineCovarianceCalcualtor.cs (modified) (1 diff)
• OnlineLinearScalingParameterCalculator.cs (modified) (1 diff)
• OnlineMeanAbsolutePercentageErrorCalculator.cs (modified) (1 diff)
• OnlineMeanAndVarianceCalculator.cs (modified) (1 diff)
• OnlineMeanSquaredErrorCalculator.cs (modified) (1 diff)
• OnlineNormalizedMeanSquaredErrorCalculator.cs (modified) (1 diff)
• OnlinePearsonsRSquaredCalculator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineAccuracyCalculator.cs

@@ -78 +78 @@
         double original = firstEnumerator.Current;
         accuracyCalculator.Add(original, estimated);
+        if (accuracyCalculator.ErrorState != OnlineCalculatorError.None) break;
       }
 
       // check if both enumerators are at the end to make sure both enumerations have the same length
-      if (secondEnumerator.MoveNext() || firstEnumerator.MoveNext()) {
+      if (accuracyCalculator.ErrorState == OnlineCalculatorError.None &&
+          (secondEnumerator.MoveNext() || firstEnumerator.MoveNext())) {
         throw new ArgumentException("Number of elements in first and second enumeration doesn't match.");
       } else {

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineCovarianceCalcualtor.cs

@@ -82 +82 @@
         double original = firstEnumerator.Current;
         covarianceCalculator.Add(original, estimated);
+        if (covarianceCalculator.ErrorState != OnlineCalculatorError.None) break;
       }
 
       // check if both enumerators are at the end to make sure both enumerations have the same length
-      if (secondEnumerator.MoveNext() || firstEnumerator.MoveNext()) {
+      if (covarianceCalculator.ErrorState == OnlineCalculatorError.None &&
+          (secondEnumerator.MoveNext() || firstEnumerator.MoveNext())) {
         throw new ArgumentException("Number of elements in first and second enumeration doesn't match.");
       } else {

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineLinearScalingParameterCalculator.cs

@@ -107 +107 @@
         double targetElement = targetEnumerator.Current;
         calculator.Add(originalElement, targetElement);
+        if (calculator.ErrorState != OnlineCalculatorError.None) break;
       }
 
       // check if both enumerators are at the end to make sure both enumerations have the same length
-      if (originalEnumerator.MoveNext() || targetEnumerator.MoveNext()) {
+      if (calculator.ErrorState == OnlineCalculatorError.None &&
+            (originalEnumerator.MoveNext() || targetEnumerator.MoveNext())) {
         throw new ArgumentException("Number of elements in original and target enumeration do not match.");
       } else {

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineMeanAbsolutePercentageErrorCalculator.cs

@@ -77 +77 @@
         double original = firstEnumerator.Current;
         calculator.Add(original, estimated);
+        if (calculator.ErrorState != OnlineCalculatorError.None) break;
       }
 
       // check if both enumerators are at the end to make sure both enumerations have the same length
-      if (secondEnumerator.MoveNext() || firstEnumerator.MoveNext()) {
+      if (calculator.ErrorState == OnlineCalculatorError.None &&
+            (secondEnumerator.MoveNext() || firstEnumerator.MoveNext())) {
         throw new ArgumentException("Number of elements in first and second enumeration doesn't match.");
       } else {

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

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineMeanSquaredErrorCalculator.cs

@@ -75 +75 @@
         double original = firstEnumerator.Current;
         mseCalculator.Add(original, estimated);
+        if (mseCalculator.ErrorState != OnlineCalculatorError.None) break;
       }
 
       // check if both enumerators are at the end to make sure both enumerations have the same length
-      if (secondEnumerator.MoveNext() || firstEnumerator.MoveNext()) {
+      if (mseCalculator.ErrorState == OnlineCalculatorError.None &&
+         (secondEnumerator.MoveNext() || firstEnumerator.MoveNext())) {
         throw new ArgumentException("Number of elements in first and second enumeration doesn't match.");
       } else {

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineNormalizedMeanSquaredErrorCalculator.cs

@@ -73 +73 @@
         double original = firstEnumerator.Current;
         normalizedMSECalculator.Add(original, estimated);
+        if (normalizedMSECalculator.ErrorState != OnlineCalculatorError.None) break;
       }
 
       // check if both enumerators are at the end to make sure both enumerations have the same length
-      if (secondEnumerator.MoveNext() || firstEnumerator.MoveNext()) {
+      if (normalizedMSECalculator.ErrorState == OnlineCalculatorError.None &&
+           (secondEnumerator.MoveNext() || firstEnumerator.MoveNext())) {
         throw new ArgumentException("Number of elements in first and second enumeration doesn't match.");
       } else {

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlinePearsonsRSquaredCalculator.cs

@@ -77 +77 @@
         double original = firstEnumerator.Current;
         rSquaredCalculator.Add(original, estimated);
+        if (rSquaredCalculator.ErrorState != OnlineCalculatorError.None) break;
       }
 
       // check if both enumerators are at the end to make sure both enumerations have the same length
-      if (secondEnumerator.MoveNext() || firstEnumerator.MoveNext()) {
+      if (rSquaredCalculator.ErrorState == OnlineCalculatorError.None &&
+           (secondEnumerator.MoveNext() || firstEnumerator.MoveNext())) {
         throw new ArgumentException("Number of elements in first and second enumeration doesn't match.");
       } else {