Changeset 8297 for branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification

Timestamp:

07/17/12 15:30:04 (12 years ago)

Author:

sforsten

Message:

#1776:

• Corrected namespace of IClassificationEnsembleSolutionWeightCalculator interface
• Corrected calculation of confidence for test and training samples in ClassificationEnsembleSolutionEstimatedClassValuesView
• Added overload method GetConfidence to IClassificationEnsembleSolutionWeightCalculator to calculate more than one point at a time (maybe additional methods for training and test confidence could improve the performance remarkably)
• Added ClassificationEnsembleSolutionConfidenceAccuracyDependence to see how accuracy would behave, if only samples with high confidence would be classified

Location:

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification

Files:

• ClassificationEnsembleSolutionConfidenceAccuracyDependence.Designer.cs (added)
• ClassificationEnsembleSolutionConfidenceAccuracyDependence.cs (added)
• ClassificationEnsembleSolutionEstimatedClassValuesView.cs (modified) (4 diffs)

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationEnsembleSolutionEstimatedClassValuesView.cs

@@ -28 +28 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
-using HeuristicLab.Problems.DataAnalysis.Interfaces.Classification;
+using HeuristicLab.Problems.DataAnalysis.Interfaces;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
@@ -111 +111 @@
       double curConfidence;
 
+      double[] confidences = null;
+      if (SamplesComboBox.SelectedItem.ToString() == SamplesComboBoxAllSamples) {
+        confidences = weightCalc.GetConfidence(solutions, indizes, estimatedClassValues).ToArray();
+      }
+
       for (int i = 0; i < indizes.Length; i++) {
         int row = indizes[i];
@@ -120 +125 @@
           correctClassified = target[i].IsAlmost(estimatedClassValues[i]);
           values[i, 3] = correctClassified.ToString();
-          curConfidence = weightCalc.GetConfidence(solutions, indizes[i], estimatedClassValues[i]);
+          if (SamplesComboBox.SelectedItem.ToString() == SamplesComboBoxAllSamples) {
+            curConfidence = confidences[i];
+          } else {
+            curConfidence = weightCalc.GetConfidence(GetRelevantSolutions(SamplesComboBox.SelectedItem.ToString(), solutions, row),
+                                                     indizes[i], estimatedClassValues[i]);
+          }
           if (correctClassified) {
             confidence[0] += curConfidence;
@@ -156 +166 @@
       matrix.SortableView = true;
       matrixView.Content = matrix;
+    }
+
+    protected IEnumerable<IClassificationSolution> GetRelevantSolutions(string samplesSelection, IEnumerable<IClassificationSolution> solutions, int curRow) {
+      if (samplesSelection == SamplesComboBoxAllSamples)
+        return solutions;
+      else if (samplesSelection == SamplesComboBoxTrainingSamples)
+        return solutions.Where(s => s.ProblemData.IsTrainingSample(curRow));
+      else if (samplesSelection == SamplesComboBoxTestSamples)
+        return solutions.Where(s => s.ProblemData.IsTestSample(curRow));
+      else
+        return new List<IClassificationSolution>();
     }