Changeset 6520 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Views
- Timestamp:
- 07/06/11 21:13:34 (13 years ago)
- Location:
- trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionConfusionMatrixView.cs
r6239 r6520 78 78 dataGridView.ColumnCount = 1; 79 79 } else { 80 dataGridView.ColumnCount = Content.ProblemData.Classes ;81 dataGridView.RowCount = Content.ProblemData.Classes ;80 dataGridView.ColumnCount = Content.ProblemData.Classes + 1; 81 dataGridView.RowCount = Content.ProblemData.Classes + 1; 82 82 83 83 int i = 0; … … 87 87 i++; 88 88 } 89 dataGridView.Columns[i].HeaderText = "Actual not classified"; 90 dataGridView.Rows[i].HeaderCell.Value = "Predicted not classified"; 91 89 92 dataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.ColumnHeader); 90 93 dataGridView.AutoResizeRowHeadersWidth(DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders); … … 100 103 if (Content == null) return; 101 104 102 double[,] confusionMatrix = new double[Content.ProblemData.Classes , Content.ProblemData.Classes];105 double[,] confusionMatrix = new double[Content.ProblemData.Classes + 1, Content.ProblemData.Classes + 1]; 103 106 IEnumerable<int> rows; 104 107 … … 109 112 } else if (cmbSamples.SelectedItem.ToString() == TestSamples) { 110 113 rows = Content.ProblemData.TestIndizes; 111 predictedValues = Content.EstimatedTestClassValues.ToArray(); 114 predictedValues = Content.EstimatedTestClassValues.ToArray(); 112 115 } else throw new InvalidOperationException(); 113 116 … … 124 127 double targetValue = targetValues[i]; 125 128 double predictedValue = predictedValues[i]; 126 int targetIndex = classValueIndexMapping[targetValue]; 127 int predictedIndex = classValueIndexMapping[predictedValue]; 129 int targetIndex; 130 int predictedIndex; 131 if (!classValueIndexMapping.TryGetValue(targetValue, out targetIndex)) { 132 targetIndex = Content.ProblemData.Classes; 133 } 134 if (!classValueIndexMapping.TryGetValue(predictedValue, out predictedIndex)) { 135 predictedIndex = Content.ProblemData.Classes; 136 } 128 137 129 138 confusionMatrix[predictedIndex, targetIndex] += 1; -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj
r6238 r6520 181 181 </Compile> 182 182 <Compile Include="Interfaces\IRegressionSolutionEvaluationView.cs" /> 183 <Compile Include="MenuItems\CreateEnsembleMenuItem.cs" /> 183 184 <Compile Include="RegressionSolutionView.cs"> 184 185 <SubType>UserControl</SubType> … … 269 270 <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project> 270 271 <Name>HeuristicLab.Optimization-3.3</Name> 272 </ProjectReference> 273 <ProjectReference Include="..\..\HeuristicLab.Optimizer\3.3\HeuristicLab.Optimizer-3.3.csproj"> 274 <Project>{C664305E-497C-4533-A140-967DEDB05C19}</Project> 275 <Name>HeuristicLab.Optimizer-3.3</Name> 271 276 </ProjectReference> 272 277 <ProjectReference Include="..\..\HeuristicLab.Parameters.Views\3.3\HeuristicLab.Parameters.Views-3.3.csproj"> -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLabProblemsDataAnalysisViewsPlugin.cs.frame
r5869 r6520 39 39 [PluginDependency("HeuristicLab.Optimization","3.3")] 40 40 [PluginDependency("HeuristicLab.Optimization.Views","3.3")] 41 [PluginDependency("HeuristicLab.Optimizer", "3.3")] 41 42 [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")] 42 43 [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")] -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.cs
r6302 r6520 198 198 // strip range is [start .. end] inclusive, but we evaluate [start..end[ (end is exclusive) 199 199 // the strip should be by one longer (starting at start - 0.5 and ending at end + 0.5) 200 stripLine.StripWidth = end - start; 200 stripLine.StripWidth = end - start; 201 201 stripLine.IntervalOffset = start - 0.5; // start slightly to the left of the first point to clearly indicate the first point in the partition 202 202 this.chart.ChartAreas[0].AxisX.StripLines.Add(stripLine);
Note: See TracChangeset
for help on using the changeset viewer.