Changeset 4233 for branches

Timestamp:

08/16/10 19:17:13 (14 years ago)

Author:

gkronber

Message:

Added operator to apply covariant parsimony pressure. #1142

Location:

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3

Files:

• Evaluators/OnlineCovarianceEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis-3.3.csproj (modified) (1 diff)
• Operators/CovariantParsimonyPressure.cs (added)

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Evaluators/OnlineCovarianceEvaluator.cs

@@ -25 +25 @@
   public class OnlineCovarianceEvaluator : IOnlineEvaluator {
 
-    private double originalMean, estimatedMean, Cn;
+    private double xMean, yMean, Cn;
     private int n;
     public double Covariance {
@@ -47 +47 @@
       n = 0;
       Cn = 0.0;
-      originalMean = 0.0;
-      estimatedMean = 0.0;
+      xMean = 0.0;
+      yMean = 0.0;
     }
 
-    public void Add(double original, double estimated) {
-      if (double.IsNaN(estimated) || double.IsInfinity(estimated) ||
-          double.IsNaN(original) || double.IsInfinity(original)) {
+    public void Add(double x, double y) {
+      if (double.IsNaN(x) || double.IsInfinity(x) ||
+          double.IsNaN(y) || double.IsInfinity(y)) {
         throw new ArgumentException("Covariance is not defined for series containing NaN or infinity elements");
       } else {
         n++;
         // online calculation of tMean
-        originalMean = originalMean + (original - originalMean) / n;
-        double delta = estimated - estimatedMean; // delta = (y - yMean(n-1))
-        estimatedMean = estimatedMean + delta / n;
+
+        xMean = xMean + (x - xMean) / n;
+        double deltaY = y - yMean; // delta = (y - yMean(n-1))
+        yMean = yMean + deltaY / n;
 
         // online calculation of covariance
-        Cn = Cn + delta * (original - originalMean); // C(n) = C(n-1) + (y - yMean(n-1)) (t - tMean(n))       
+        Cn = Cn + deltaY * (x - xMean); // C(n) = C(n-1) + (y - yMean(n-1)) (x - xMean(n))
       }
     }

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj

@@ -133 +133 @@
     <Compile Include="Interfaces\IOnlineEvaluator.cs" />
     <Compile Include="MatrixExtensions.cs" />
+    <Compile Include="Operators\CovariantParsimonyPressure.cs" />
     <Compile Include="Operators\DynamicDepthLimitInitializer.cs" />
     <Compile Include="Operators\DynOpEqHistogramInitializer.cs" />