Changeset 4460 for branches/DataAnalysis

Timestamp:

09/21/10 14:14:25 (14 years ago)

Author:

gkronber

Message:

Fixed bug in scaled MSE evaluator for time series. #1142

Location:

branches/DataAnalysis

Files:

• HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/Evaluators/SymbolicTimeSeriesPrognosisScaledNormalizedMseEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Evaluators/SymbolicRegressionScaledMeanAndVarianceSquaredErrorEvaluator.cs (modified) (1 diff)

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/Evaluators/SymbolicTimeSeriesPrognosisScaledNormalizedMseEvaluator.cs

@@ -287 +287 @@
           betas[component] = 1;
         } else {
-          if (estimatedVarianceEvaluators[component].Variance.IsAlmost(0.0))
+          if (estimatedVarianceEvaluators[component].PopulationVariance.IsAlmost(0.0))
             betas[component] = 1;
           else
-            betas[component] = covarianceEvaluators[component].Covariance / estimatedVarianceEvaluators[component].Variance;
+            betas[component] = covarianceEvaluators[component].Covariance / estimatedVarianceEvaluators[component].PopulationVariance;
 
           alphas[component] = originalMeanCalculators[component].Mean - betas[component] * estimatedVarianceEvaluators[component].Mean;

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Evaluators/SymbolicRegressionScaledMeanAndVarianceSquaredErrorEvaluator.cs

@@ -206 +206 @@
         beta = 1;
       } else {
-        if (yVarianceCalculator.Variance.IsAlmost(0.0))
+        if (yVarianceCalculator.PopulationVariance.IsAlmost(0.0))
           beta = 1;
         else
-          beta = ytCovarianceEvaluator.Covariance / yVarianceCalculator.Variance;
+          beta = ytCovarianceEvaluator.Covariance / yVarianceCalculator.PopulationVariance;
 
         alpha = tMeanCalculator.Mean - beta * yVarianceCalculator.Mean;