Changeset 6520 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4

Timestamp:

07/06/11 21:13:34 (13 years ago)

Author:

gkronber

Message:

#1450 implemented menu item to merge all data analysis solutions in a run collection into ensemble solutions and fixed a few bugs related to ensemble solutions.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4

Files:

• Classification/ClassificationSolutionConfusionMatrixView.cs (modified) (5 diffs)
• HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (2 diffs)
• HeuristicLabProblemsDataAnalysisViewsPlugin.cs.frame (modified) (1 diff)
• MenuItems (added)
• MenuItems/CreateEnsembleMenuItem.cs (added)
• Regression/RegressionSolutionLineChartView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionConfusionMatrixView.cs

@@ -78 +78 @@
           dataGridView.ColumnCount = 1;
         } else {
-          dataGridView.ColumnCount = Content.ProblemData.Classes;
-          dataGridView.RowCount = Content.ProblemData.Classes;
+          dataGridView.ColumnCount = Content.ProblemData.Classes + 1;
+          dataGridView.RowCount = Content.ProblemData.Classes + 1;
 
           int i = 0;
@@ -87 +87 @@
             i++;
           }
+          dataGridView.Columns[i].HeaderText = "Actual not classified";
+          dataGridView.Rows[i].HeaderCell.Value = "Predicted not classified";
+
           dataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.ColumnHeader);
           dataGridView.AutoResizeRowHeadersWidth(DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders);
@@ -100 +103 @@
         if (Content == null) return;
 
-        double[,] confusionMatrix = new double[Content.ProblemData.Classes, Content.ProblemData.Classes];
+        double[,] confusionMatrix = new double[Content.ProblemData.Classes + 1, Content.ProblemData.Classes + 1];
         IEnumerable<int> rows;
 
@@ -109 +112 @@
         } else if (cmbSamples.SelectedItem.ToString() == TestSamples) {
           rows = Content.ProblemData.TestIndizes;
-          predictedValues = Content.EstimatedTestClassValues.ToArray();          
+          predictedValues = Content.EstimatedTestClassValues.ToArray();
         } else throw new InvalidOperationException();
 
@@ -124 +127 @@
           double targetValue = targetValues[i];
           double predictedValue = predictedValues[i];
-          int targetIndex = classValueIndexMapping[targetValue];
-          int predictedIndex = classValueIndexMapping[predictedValue];
+          int targetIndex;
+          int predictedIndex;
+          if (!classValueIndexMapping.TryGetValue(targetValue, out targetIndex)) {
+            targetIndex = Content.ProblemData.Classes;
+          }
+          if (!classValueIndexMapping.TryGetValue(predictedValue, out predictedIndex)) {
+            predictedIndex = Content.ProblemData.Classes;
+          }
 
           confusionMatrix[predictedIndex, targetIndex] += 1;

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

@@ -181 +181 @@
     </Compile>
     <Compile Include="Interfaces\IRegressionSolutionEvaluationView.cs" />
+    <Compile Include="MenuItems\CreateEnsembleMenuItem.cs" />
     <Compile Include="RegressionSolutionView.cs">
       <SubType>UserControl</SubType>
@@ -269 +270 @@
       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
       <Name>HeuristicLab.Optimization-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimizer\3.3\HeuristicLab.Optimizer-3.3.csproj">
+      <Project>{C664305E-497C-4533-A140-967DEDB05C19}</Project>
+      <Name>HeuristicLab.Optimizer-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Parameters.Views\3.3\HeuristicLab.Parameters.Views-3.3.csproj">

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLabProblemsDataAnalysisViewsPlugin.cs.frame

@@ -39 +39 @@
   [PluginDependency("HeuristicLab.Optimization","3.3")]
   [PluginDependency("HeuristicLab.Optimization.Views","3.3")]
+  [PluginDependency("HeuristicLab.Optimizer", "3.3")]
   [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
   [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")]

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.cs

@@ -198 +198 @@
       // strip range is [start .. end] inclusive, but we evaluate [start..end[ (end is exclusive)
       // the strip should be by one longer (starting at start - 0.5 and ending at end + 0.5)
-      stripLine.StripWidth = end - start; 
+      stripLine.StripWidth = end - start;
       stripLine.IntervalOffset = start - 0.5; // start slightly to the left of the first point to clearly indicate the first point in the partition
       this.chart.ChartAreas[0].AxisX.StripLines.Add(stripLine);