Changeset 5894 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineLinearScalingParameterCalculator.cs

Timestamp:

03/30/11 18:04:03 (13 years ago)

Author:

gkronber

Message:

#1453: Added an ErrorState property to online evaluators to indicate if the result value is valid or if there has been an error in the calculation. Adapted all classes that use one of the online evaluators to check this property.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineLinearScalingParameterCalculator.cs (modified) (4 diffs)

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

@@ -32 +32 @@
     public double Alpha {
       get {
-        if (cnt < 2)
-          return 0;
-        else
-          return targetMeanCalculator.Mean - Beta * originalMeanAndVarianceCalculator.Mean;
+        return targetMeanCalculator.Mean - Beta * originalMeanAndVarianceCalculator.Mean;
       }
     }
@@ -44 +41 @@
     public double Beta {
       get {
-        if (cnt < 2)
-          return 1;
-        else if (originalMeanAndVarianceCalculator.PopulationVariance.IsAlmost(0.0))
+        if (originalMeanAndVarianceCalculator.PopulationVariance.IsAlmost(0.0))
           return 1;
         else
           return originalTargetCovarianceEvaluator.Covariance / originalMeanAndVarianceCalculator.PopulationVariance;
+      }
+    }
+
+    public OnlineEvaluatorError ErrorState {
+      get {
+        return targetMeanCalculator.MeanErrorState | originalMeanAndVarianceCalculator.MeanErrorState |
+          originalMeanAndVarianceCalculator.PopulationVarianceErrorState | originalTargetCovarianceEvaluator.ErrorState;
       }
     }
@@ -94 +96 @@
     /// <param name="alpha">Additive constant for the linear scaling</param>
     /// <param name="beta">Multiplicative factor for the linear scaling</param>
-    public static void Calculate(IEnumerable<double> original, IEnumerable<double> target, out double alpha, out double beta) {
+    /// <param name="errorState">Flag that indicates if errors occurred in the calculation of the linea scaling parameters.</param>
+    public static void Calculate(IEnumerable<double> original, IEnumerable<double> target, out double alpha, out double beta, out OnlineEvaluatorError errorState) {
       OnlineLinearScalingParameterCalculator calculator = new OnlineLinearScalingParameterCalculator();
       IEnumerator<double> originalEnumerator = original.GetEnumerator();
@@ -110 +113 @@
         throw new ArgumentException("Number of elements in original and target enumeration do not match.");
       } else {
+        errorState = calculator.ErrorState;
         alpha = calculator.Alpha;
         beta = calculator.Beta;