Changeset 5274

Timestamp:

01/11/11 14:24:24 (14 years ago)

Author:

cfischer

Message:

Fixed calculation of R², MSE and rel. Error for training best classification solution #1369

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/Analyzer/TrainingBestSymbolicClassificationSolutionAnalyzer.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/Analyzer/TrainingBestSymbolicClassificationSolutionAnalyzer.cs

@@ -337 +337 @@
           while (originalEnumerator.MoveNext() & estimatedEnumerator.MoveNext()) {
             accuracyEvaluator.Add(originalEnumerator.Current, estimatedEnumerator.Current);
+          }
+          originalEnumerator = trainingValues.GetEnumerator();
+          estimatedEnumerator = solution.EstimatedTrainingValues.GetEnumerator();
+          while (originalEnumerator.MoveNext() & estimatedEnumerator.MoveNext()) {
             mseEvaluator.Add(originalEnumerator.Current, estimatedEnumerator.Current);
             r2Evaluator.Add(originalEnumerator.Current, estimatedEnumerator.Current);
@@ -357 +361 @@
           while (originalEnumerator.MoveNext() & estimatedEnumerator.MoveNext()) {
             accuracyEvaluator.Add(originalEnumerator.Current, estimatedEnumerator.Current);
+          }
+          originalEnumerator = testValues.GetEnumerator();
+          estimatedEnumerator = solution.EstimatedTestValues.GetEnumerator();
+          while (originalEnumerator.MoveNext() & estimatedEnumerator.MoveNext()) {
             mseEvaluator.Add(originalEnumerator.Current, estimatedEnumerator.Current);
             r2Evaluator.Add(originalEnumerator.Current, estimatedEnumerator.Current);