Changeset 6011 for branches/histogram/HeuristicLab.Problems.DataAnalysis

Timestamp:

04/15/11 14:54:43 (14 years ago)

Author:

abeham

Message:

#1465

• updated branch with changes from trunk
• fixed some bugs
• introduced secondary x-axis option

Location:

branches/histogram

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolution.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineNormalizedMeanSquaredErrorCalculator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Tests/OnlineCalculatorPerformanceTest.cs (modified) (2 diffs)

branches/histogram/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();

branches/histogram/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()) {

branches/histogram/HeuristicLab.Problems.DataAnalysis/3.4/Tests/OnlineCalculatorPerformanceTest.cs

@@ -75 +75 @@
       var twister = new MersenneTwister(31415);
       var dataset = CreateRandomDataset(twister, Rows, Columns);
-      var errorState = new OnlineCalculatorError();
+      OnlineCalculatorError errorState = OnlineCalculatorError.None; ;
 
       Stopwatch watch = new Stopwatch();
@@ -81 +81 @@
       for (int i = 0; i < Repetitions; i++) {
         double value = calculateFunc(dataset.GetEnumeratedVariableValues(0), dataset.GetEnumeratedVariableValues(1), out errorState);
-
       }
+      Assert.AreEqual(errorState, OnlineCalculatorError.None);
       watch.Stop();