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

Timestamp:

07/29/11 14:14:27 (13 years ago)

Author:

mkommend

Message:

#1592: Implemented view for classification solutions contained in a ClassificationEnsembleSolution.

Location:

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

Files:

• Classification/ClassificationEnsembleSolutionModelView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionEnsembleSolutionModelView.Designer.cs) (1 diff)
• Classification/ClassificationEnsembleSolutionModelView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionEnsembleSolutionModelView.cs) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (2 diffs)
• MenuItems/CreateEnsembleMenuItem.cs (modified) (2 diffs)
• Solution Views/ClassificationEnsembleSolutionView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionEnsembleSolutionView.Designer.cs) (1 diff)
• Solution Views/ClassificationEnsembleSolutionView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionEnsembleSolutionView.cs) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationEnsembleSolutionModelView.Designer.cs

@@ -20 +20 @@
 #endregion
 namespace HeuristicLab.Problems.DataAnalysis.Views {
-  partial class RegressionEnsembleSolutionModelView {
+  partial class ClassificationEnsembleSolutionModelView {
     /// <summary> 
     /// Required designer variable.

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

@@ -49 +49 @@
 
   [View("Ensemble Solutions")]
-  [Content(typeof(IItemCollection<IRegressionSolution>), false)]
-  internal sealed partial class RegressionEnsembleSolutionModelView : ItemCollectionView<IRegressionSolution> {
-    public RegressionEnsembleSolutionModelView() {
+  [Content(typeof(IItemCollection<IClassificationSolution>), false)]
+  internal sealed partial class ClassificationEnsembleSolutionModelView : ItemCollectionView<IClassificationSolution> {
+    public ClassificationEnsembleSolutionModelView() {
       InitializeComponent();
     }

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

@@ -110 +110 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Classification\ClassificationEnsembleSolutionModelView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Classification\ClassificationEnsembleSolutionModelView.Designer.cs">
+      <DependentUpon>ClassificationEnsembleSolutionModelView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Regression\RegressionEnsembleSolutionModelView.cs">
       <SubType>UserControl</SubType>
@@ -163 +169 @@
     <Compile Include="Solution Views\ClusteringSolutionView.Designer.cs">
       <DependentUpon>ClusteringSolutionView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Solution Views\ClassificationEnsembleSolutionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Solution Views\ClassificationEnsembleSolutionView.Designer.cs">
+      <DependentUpon>ClassificationEnsembleSolutionView.cs</DependentUpon>
     </Compile>
     <Compile Include="Solution Views\DiscriminantFunctionClassificationSolutionView.cs">

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/CreateEnsembleMenuItem.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Collections.Generic;
 using System.Windows.Forms;
+using HeuristicLab.Core;
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimization;
 using HeuristicLab.Optimizer;
-using HeuristicLab.Core;
 
 namespace HeuristicLab.Problems.DataAnalysis.MenuItems {
@@ -85 +85 @@
             var ensemble = new ClassificationEnsembleSolution(Enumerable.Empty<IClassificationModel>(), problemData);
             ensemble.Name = group.Key + " ensemble";
-            ensemble.AddModelsAndPartitions(group.OfType<IClassificationSolution>());
+            ensemble.AddClassificationSolutions(group.OfType<IClassificationSolution>());
             MainFormManager.MainForm.ShowContent(ensemble);
           }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/ClassificationEnsembleSolutionView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
-  partial class RegressionEnsembleSolutionView {
+  partial class ClassificationEnsembleSolutionView {
     /// <summary> 
     /// Required designer variable.

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/ClassificationEnsembleSolutionView.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
-  [View("RegressionEnsembleSolution View")]
-  [Content(typeof(RegressionEnsembleSolution), true)]
-  public partial class RegressionEnsembleSolutionView : RegressionSolutionView {
-    public RegressionEnsembleSolutionView() {
+  [View("ClassificationEnsembleSolution View")]
+  [Content(typeof(ClassificationEnsembleSolution), true)]
+  public partial class ClassificationEnsembleSolutionView : ClassificationSolutionView {
+    public ClassificationEnsembleSolutionView() {
       InitializeComponent();
-      AddViewListViewItem(typeof(RegressionEnsembleSolutionModelView), HeuristicLab.Common.Resources.VSImageLibrary.Function);
+      AddViewListViewItem(typeof(ClassificationEnsembleSolutionModelView), HeuristicLab.Common.Resources.VSImageLibrary.Function);
     }
 
-    public new RegressionEnsembleSolution Content {
-      get { return (RegressionEnsembleSolution)base.Content; }
+    public new ClassificationEnsembleSolution Content {
+      get { return (ClassificationEnsembleSolution)base.Content; }
       set { base.Content = value; }
     }
 
     protected override void itemsListView_DoubleClick(object sender, EventArgs e) {
-      if (Content != null && itemsListView.SelectedItems.Count == 1 && itemsListView.SelectedItems[0].Tag == typeof(RegressionEnsembleSolutionModelView)) {
+      if (Content != null && itemsListView.SelectedItems.Count == 1 && itemsListView.SelectedItems[0].Tag == typeof(ClassificationEnsembleSolutionModelView)) {
         Type viewType = (Type)itemsListView.SelectedItems[0].Tag;
-        var view = MainFormManager.MainForm.ShowContent(Content.RegressionSolutions, viewType);
+        var view = MainFormManager.MainForm.ShowContent(Content.ClassificationSolutions, viewType);
         view.ReadOnly = false;
         view.Locked = Locked;
@@ -50 +50 @@
 
     protected override void itemsListView_SelectedIndexChanged(object sender, EventArgs e) {
-      if (Content != null && itemsListView.SelectedItems.Count == 1 && itemsListView.SelectedItems[0].Tag == typeof(RegressionEnsembleSolutionModelView)) {
+      if (Content != null && itemsListView.SelectedItems.Count == 1 && itemsListView.SelectedItems[0].Tag == typeof(ClassificationEnsembleSolutionModelView)) {
         detailsGroupBox.Enabled = true;
         Type viewType = (Type)itemsListView.SelectedItems[0].Tag;
         viewHost.ViewType = viewType;
-        viewHost.Content = Content.RegressionSolutions;
+        viewHost.Content = Content.ClassificationSolutions;
         viewHost.ReadOnly = false;
         viewHost.Locked = Locked;