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

Timestamp:

03/06/12 15:08:13 (13 years ago)

Author:

sforsten

Message:

#1776:

• bug fix in NeighbourhoodWeightCalculator
• added GetConfidence method to IClassificationEnsembleSolutionWeightCalculator
• adjusted the confidence column in ClassificationEnsembleSolutionEstimatedClassValuesView

File:

• branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/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;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
@@ -96 +97 @@
       }
 
+      IEnumerable<IClassificationSolution> solutions = Content.ClassificationSolutions.CheckedItems;
       int classValuesCount = Content.ProblemData.ClassValues.Count;
-      int solutionsCount = Content.ClassificationSolutions.Count();
+      int solutionsCount = solutions.Count();
       string[,] values = new string[indizes.Length, 5 + classValuesCount + solutionsCount];
       double[] target = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable).ToArray();
       List<List<double?>> estimatedValuesVector = GetEstimatedValues(SamplesComboBox.SelectedItem.ToString(), indizes,
-                                                            Content.ClassificationSolutions);
-      //List<double> weights = Content.Weights.ToList();
-      //double weightSum = weights.Sum();
+                                                            solutions);
+
+      IClassificationEnsembleSolutionWeightCalculator weightCalc = Content.WeightCalculator;
 
       for (int i = 0; i < indizes.Length; i++) {
@@ -113 +115 @@
           values[i, 2] = estimatedClassValues[i].ToString();
           values[i, 3] = (target[i].IsAlmost(estimatedClassValues[i])).ToString();
-
-          //currently disabled for test purpose
-
-          //IEnumerable<int> indices = FindAllIndices(estimatedValuesVector[i], estimatedClassValues[i]);
-          //double confidence = 0.0;
-          //foreach (var index in indices) {
-          //  confidence += weights[index];
-          //}
-          //values[i, 4] = (confidence / weightSum).ToString();
-          //var estimationCount = groups.Where(g => g.Key != null).Select(g => g.Count).Sum();
-          //values[i, 4] =
-          //  (((double)groups.Where(g => g.Key == estimatedClassValues[i]).Single().Count) / estimationCount).ToString();
-          values[i, 4] = "1.0";
+          values[i, 4] = weightCalc.GetConfidence(solutions, indizes[i], estimatedClassValues[i]).ToString();
 
           var groups =
@@ -145 +135 @@
       List<string> columnNames = new List<string>() { "Id", TargetClassValuesColumnName, EstimatedClassValuesColumnName, CorrectClassificationColumnName, ConfidenceColumnName };
       columnNames.AddRange(Content.ProblemData.ClassNames);
-      columnNames.AddRange(Content.Model.Models.Select(m => m.Name));
+      columnNames.AddRange(Content.ClassificationSolutions.CheckedItems.Select(s => s.Model.Name));//.Model.Models.Select(m => m.Name));
       matrix.ColumnNames = columnNames;
       matrix.SortableView = true;