Changeset 5942 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlinePearsonsRSquaredCalculator.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/OnlinePearsonsRSquaredCalculator.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlinePearsonsRSquaredEvaluator.cs) (5 diffs)

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

@@ -25 +25 @@
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  public class OnlinePearsonsRSquaredEvaluator : IOnlineEvaluator {
-    private OnlineCovarianceEvaluator covEvaluator = new OnlineCovarianceEvaluator();
-    private OnlineMeanAndVarianceCalculator sxEvaluator = new OnlineMeanAndVarianceCalculator();
-    private OnlineMeanAndVarianceCalculator syEvaluator = new OnlineMeanAndVarianceCalculator();
+  public class OnlinePearsonsRSquaredCalculator : IOnlineCalculator {
+    private OnlineCovarianceCalculator covCalculator = new OnlineCovarianceCalculator();
+    private OnlineMeanAndVarianceCalculator sxCalculator = new OnlineMeanAndVarianceCalculator();
+    private OnlineMeanAndVarianceCalculator syCalculator = new OnlineMeanAndVarianceCalculator();
 
     public double RSquared {
       get {
-        double xVar = sxEvaluator.PopulationVariance;
-        double yVar = syEvaluator.PopulationVariance;
+        double xVar = sxCalculator.PopulationVariance;
+        double yVar = syCalculator.PopulationVariance;
         if (xVar.IsAlmost(0.0) || yVar.IsAlmost(0.0)) {
           return 0.0;
         } else {
-          double r = covEvaluator.Covariance / (Math.Sqrt(xVar) * Math.Sqrt(yVar));
+          double r = covCalculator.Covariance / (Math.Sqrt(xVar) * Math.Sqrt(yVar));
           return r * r;
         }
@@ -43 +43 @@
     }
 
-    public OnlinePearsonsRSquaredEvaluator() { }
+    public OnlinePearsonsRSquaredCalculator() { }
 
-    #region IOnlineEvaluator Members
-    public OnlineEvaluatorError ErrorState {
-      get { return covEvaluator.ErrorState | sxEvaluator.PopulationVarianceErrorState | syEvaluator.PopulationVarianceErrorState; }
+    #region IOnlineCalculator Members
+    public OnlineCalculatorError ErrorState {
+      get { return covCalculator.ErrorState | sxCalculator.PopulationVarianceErrorState | syCalculator.PopulationVarianceErrorState; }
     }
     public double Value {
@@ -53 +53 @@
     }
     public void Reset() {
-      covEvaluator.Reset();
-      sxEvaluator.Reset();
-      syEvaluator.Reset();
+      covCalculator.Reset();
+      sxCalculator.Reset();
+      syCalculator.Reset();
     }
 
     public void Add(double x, double y) {
       // no need to check validity of values explicitly here as it is checked in all three evaluators 
-      covEvaluator.Add(x, y);
-      sxEvaluator.Add(x);
-      syEvaluator.Add(y);
+      covCalculator.Add(x, y);
+      sxCalculator.Add(x);
+      syCalculator.Add(y);
     }
 
     #endregion
 
-    public static double Calculate(IEnumerable<double> first, IEnumerable<double> second, out OnlineEvaluatorError errorState) {
+    public static double Calculate(IEnumerable<double> first, IEnumerable<double> second, out OnlineCalculatorError errorState) {
       IEnumerator<double> firstEnumerator = first.GetEnumerator();
       IEnumerator<double> secondEnumerator = second.GetEnumerator();
-      OnlinePearsonsRSquaredEvaluator rSquaredEvaluator = new OnlinePearsonsRSquaredEvaluator();
+      OnlinePearsonsRSquaredCalculator rSquaredCalculator = new OnlinePearsonsRSquaredCalculator();
 
       // always move forward both enumerators (do not use short-circuit evaluation!)
@@ -76 +76 @@
         double estimated = secondEnumerator.Current;
         double original = firstEnumerator.Current;
-        rSquaredEvaluator.Add(original, estimated);
+        rSquaredCalculator.Add(original, estimated);
       }
 
@@ -83 +83 @@
         throw new ArgumentException("Number of elements in first and second enumeration doesn't match.");
       } else {
-        errorState = rSquaredEvaluator.ErrorState;
-        return rSquaredEvaluator.RSquared;
+        errorState = rSquaredCalculator.ErrorState;
+        return rSquaredCalculator.RSquared;
       }
     }