Changeset 5962 for trunk/sources

Timestamp:

04/06/11 10:45:21 (14 years ago)

Author:

mkommend

Message:

#1418: Fixed OnlineNormalizedMeanSquaredErrorCalculator and added results description in RegressionSolution.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• Implementation/Regression/RegressionSolution.cs (modified) (1 diff)
• OnlineCalculators/OnlineNormalizedMeanSquaredErrorCalculator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolution.cs

@@ -107 +107 @@
       Add(new Result(TrainingRelativeErrorResultName, "Average of the relative errors of the model output and the actual values on the training partition", new PercentValue()));
       Add(new Result(TestRelativeErrorResultName, "Average of the relative errors of the model output and the actual values on the test partition", new PercentValue()));
-      Add(new Result(TrainingNormalizedMeanSquaredErrorResultName, "", new DoubleValue()));
-      Add(new Result(TestNormalizedMeanSquaredErrorResultName, "", new DoubleValue()));
+      Add(new Result(TrainingNormalizedMeanSquaredErrorResultName, "Normalized mean of squared errors of the model on the training partition", new DoubleValue()));
+      Add(new Result(TestNormalizedMeanSquaredErrorResultName, "Normalized mean of squared errors of the model on the test partition", new DoubleValue()));
 
       RecalculateResults();

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineNormalizedMeanSquaredErrorCalculator.cs

@@ -68 +68 @@
       OnlineNormalizedMeanSquaredErrorCalculator normalizedMSECalculator = new OnlineNormalizedMeanSquaredErrorCalculator();
 
+      //needed because otherwise the normalizedMSECalculator is in ErrorState.InsufficientValuesAdded
+      if (firstEnumerator.MoveNext() & secondEnumerator.MoveNext()) {
+        double estimated = secondEnumerator.Current;
+        double original = firstEnumerator.Current;
+        normalizedMSECalculator.Add(original, estimated);
+      }
+
       // always move forward both enumerators (do not use short-circuit evaluation!)
       while (firstEnumerator.MoveNext() & secondEnumerator.MoveNext()) {