Changeset 10560

Timestamp:

03/06/14 11:12:10 (11 years ago)

Author:

mkommend

Message:

#1998: Fixed bugs in classification solution comparison view.

File:

• branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionComparisonView.cs (modified) (3 diffs)

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionComparisonView.cs

@@ -93 +93 @@
           if (problemData.Classes == 2) {
             dataGridView.ColumnCount = 6;
-            dataGridView.Columns[4].HeaderText = "F1 Score Trainin";
+            dataGridView.Columns[4].HeaderText = "F1 Score Training";
             dataGridView.Columns[5].HeaderText = "F1 Score Test";
           }
@@ -108 +108 @@
             var estimatedTrainingValues = solution.Model.GetEstimatedClassValues(dataset, trainingIndizes);
 
-            var testIndices = problemData.TrainingIndices;
+            var testIndices = problemData.TestIndices;
             var originalTestValues = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, testIndices);
             var estimatedTestValues = solution.Model.GetEstimatedClassValues(dataset, testIndices);
 
             OnlineCalculatorError errorState;
-
             dataGridView[2, row].Value = MatthewsCorrelationCoefficientCalculator.Calculate(originalTrainingValues, estimatedTrainingValues, out errorState);
             dataGridView[3, row].Value = MatthewsCorrelationCoefficientCalculator.Calculate(originalTestValues, estimatedTestValues, out errorState);
@@ -129 +128 @@
 
     private IEnumerable<IClassificationSolution> GenerateClassificationSolutions(IClassificationProblemData problemData) {
-      var solutions = new List<IClassificationSolution>();
+      var newSolutions = new List<IClassificationSolution>();
       var zeroR = ZeroR.CreateZeroRSolution(problemData);
       zeroR.Name = "0R Classification Solution";
-      solutions.Add(zeroR);
+      newSolutions.Add(zeroR);
       var oneR = OneR.CreateOneRSolution(problemData, 6, new FastRandom());
       oneR.Name = "1R Classification Solution";
-      solutions.Add(oneR);
+      newSolutions.Add(oneR);
       try {
         var lda = LinearDiscriminantAnalysis.CreateLinearDiscriminantAnalysisSolution(problemData);
         lda.Name = "Linear Discriminant Analysis Solution";
-        solutions.Add(lda);
+        newSolutions.Add(lda);
       }
       catch (NotSupportedException) { }
       catch (ArgumentException) { }
-      return solutions;
+      return newSolutions;
     }