Changeset 8483 for branches/DatasetFeatureCorrelation/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlinePearsonsRSquaredCalculator.cs

Timestamp:

08/14/12 13:05:48 (12 years ago)

Author:

sforsten

Message:

#1292:

• Renamed ExtendedHeatMap to FeatureCorrelation
• deleted old CorrelationHeatMapView
• added FeatureCorrelationView

File:

• branches/DatasetFeatureCorrelation/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlinePearsonsRSquaredCalculator.cs (modified) (4 diffs)

branches/DatasetFeatureCorrelation/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlinePearsonsRSquaredCalculator.cs

@@ -30 +30 @@
     private OnlineMeanAndVarianceCalculator syCalculator = new OnlineMeanAndVarianceCalculator();
 
-    public double RSquared {
+    public double PearsonsR {
       get {
         double xVar = sxCalculator.PopulationVariance;
@@ -38 +38 @@
         } else {
           double r = covCalculator.Covariance / (Math.Sqrt(xVar) * Math.Sqrt(yVar));
-          return r * r;
+          return r;
         }
+      }
+    }
+
+    public double RSquared {
+      get {
+        return Math.Pow(PearsonsR, 2);
       }
     }
@@ -67 +73 @@
     #endregion
 
-    public static double Calculate(IEnumerable<double> first, IEnumerable<double> second, out OnlineCalculatorError errorState) {
+    public static double CalculateR(IEnumerable<double> first, IEnumerable<double> second, out OnlineCalculatorError errorState) {
       IEnumerator<double> firstEnumerator = first.GetEnumerator();
       IEnumerator<double> secondEnumerator = second.GetEnumerator();
@@ -86 +92 @@
       } else {
         errorState = rSquaredCalculator.ErrorState;
-        return rSquaredCalculator.RSquared;
+        return rSquaredCalculator.PearsonsR;
       }
+    }
+
+    public static double Calculate(IEnumerable<double> first, IEnumerable<double> second, out OnlineCalculatorError errorState) {
+      return Math.Pow(CalculateR(first, second, out errorState), 2);
     }
   }