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

Timestamp:

04/04/11 15:38:16 (14 years ago)

Author:

mkommend

Message:

#1453: Renamed IOnlineEvaluator to IOnlineCalculator

File:

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

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

@@ -44 +44 @@
           return 1;
         else
-          return originalTargetCovarianceEvaluator.Covariance / originalMeanAndVarianceCalculator.PopulationVariance;
+          return originalTargetCovarianceCalculator.Covariance / originalMeanAndVarianceCalculator.PopulationVariance;
       }
     }
 
-    public OnlineEvaluatorError ErrorState {
+    public OnlineCalculatorError ErrorState {
       get {
         return targetMeanCalculator.MeanErrorState | originalMeanAndVarianceCalculator.MeanErrorState |
-          originalMeanAndVarianceCalculator.PopulationVarianceErrorState | originalTargetCovarianceEvaluator.ErrorState;
+          originalMeanAndVarianceCalculator.PopulationVarianceErrorState | originalTargetCovarianceCalculator.ErrorState;
       }
     }
@@ -58 +58 @@
     private OnlineMeanAndVarianceCalculator targetMeanCalculator;
     private OnlineMeanAndVarianceCalculator originalMeanAndVarianceCalculator;
-    private OnlineCovarianceEvaluator originalTargetCovarianceEvaluator;
+    private OnlineCovarianceCalculator originalTargetCovarianceCalculator;
 
     public OnlineLinearScalingParameterCalculator() {
       targetMeanCalculator = new OnlineMeanAndVarianceCalculator();
       originalMeanAndVarianceCalculator = new OnlineMeanAndVarianceCalculator();
-      originalTargetCovarianceEvaluator = new OnlineCovarianceEvaluator();
+      originalTargetCovarianceCalculator = new OnlineCovarianceCalculator();
       Reset();
     }
@@ -71 +71 @@
       targetMeanCalculator.Reset();
       originalMeanAndVarianceCalculator.Reset();
-      originalTargetCovarianceEvaluator.Reset();
+      originalTargetCovarianceCalculator.Reset();
     }
 
@@ -83 +83 @@
       targetMeanCalculator.Add(target);
       originalMeanAndVarianceCalculator.Add(original);
-      originalTargetCovarianceEvaluator.Add(original, target);
+      originalTargetCovarianceCalculator.Add(original, target);
 
       cnt++;
@@ -97 +97 @@
     /// <param name="beta">Multiplicative factor for the linear scaling</param>
     /// <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) {
+    public static void Calculate(IEnumerable<double> original, IEnumerable<double> target, out double alpha, out double beta, out OnlineCalculatorError errorState) {
       OnlineLinearScalingParameterCalculator calculator = new OnlineLinearScalingParameterCalculator();
       IEnumerator<double> originalEnumerator = original.GetEnumerator();