Changeset 5829 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Views

Timestamp:

03/24/11 23:56:39 (13 years ago)

Author:

mkommend

Message:

#1313: Implemented new views for data analysis solutions.

Location:

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

Files:

• Classification/ClassificationSolutionConfusionMatrixView.Designer.cs (modified) (1 diff)
• Classification/ClassificationSolutionConfusionMatrixView.cs (modified) (1 diff)
• Classification/ClassificationSolutionEstimatedClassValuesView.cs (modified) (2 diffs)
• Classification/DiscriminantFunctionClassificationRocCurvesView.Designer.cs (modified) (1 diff)
• Classification/DiscriminantFunctionClassificationRocCurvesView.cs (modified) (1 diff)
• Classification/DiscriminantFunctionClassificationSolutionEstimatedClassValuesView.cs (modified) (2 diffs)
• Classification/DiscriminantFunctionClassificationSolutionThresholdView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionView.Designer.cs) (1 diff)
• Classification/DiscriminantFunctionClassificationSolutionThresholdView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionView.cs) (2 diffs)
• ClassificationSolutionView.Designer.cs (added)
• ClassificationSolutionView.cs (added)
• DataAnalysisSolutionView.Designer.cs (modified) (3 diffs)
• DataAnalysisSolutionView.cs (modified) (1 diff)
• DiscriminantFunctionClassificationSolutionView.Designer.cs (added)
• DiscriminantFunctionClassificationSolutionView.cs (added)
• HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (4 diffs)
• HeuristicLabProblemsDataAnalysisViewsPlugin.cs.frame (modified) (1 diff)
• Interfaces (added)
• Interfaces/IClassificationSolutionEvaluationView.cs (added)
• Interfaces/IClusteringSolutionEvaluationView.cs (added)
• Interfaces/IDataAnalysisSolutionEvaluationView.cs (added)
• Interfaces/IDiscriminantFunctionClassificationSolutionEvaluationView.cs (added)
• Interfaces/IRegressionSolutionEvaluationView.cs (added)
• Regression/RegressionSolutionEstimatedValuesView.cs (modified) (2 diffs)
• Regression/RegressionSolutionLineChartView.cs (modified) (2 diffs)
• Regression/RegressionSolutionScatterPlotView.cs (modified) (2 diffs)
• RegressionSolutionView.Designer.cs (added)
• RegressionSolutionView.cs (added)

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

@@ -1 @@
-namespace HeuristicLab.Problems.DataAnalysis.Classification.Views {
+namespace HeuristicLab.Problems.DataAnalysis.Views {
   partial class ClassificationSolutionConfusionMatrixView {
     /// <summary> 

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

@@ -24 +24 @@
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Problems.DataAnalysis.Classification.Views {
+namespace HeuristicLab.Problems.DataAnalysis.Views {
   [View("Classification solution confusion matrix view")]
   [Content(typeof(IClassificationSolution))]
-  public partial class ClassificationSolutionConfusionMatrixView : AsynchronousContentView {
+  public partial class ClassificationSolutionConfusionMatrixView : ItemView, IClassificationSolutionEvaluationView {
     private const string TrainingSamples = "Training";
     private const string TestSamples = "Test";

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

@@ -22 +22 @@
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Core.Views;
 using HeuristicLab.Data;
 using HeuristicLab.Data.Views;
@@ -30 +31 @@
   [View("Classification solution estimated class values view")]
   [Content(typeof(IClassificationSolution))]
-  public partial class ClassificationSolutionEstimatedClassValuesView : AsynchronousContentView {
+  public partial class ClassificationSolutionEstimatedClassValuesView : ItemView, IClassificationSolutionEvaluationView {
     private const string TARGETVARIABLE_SERIES_NAME = "TargetVariable";
     private const string ESTIMATEDVALUES_SERIES_NAME = "EstimatedClassValues";

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

@@ -1 @@
-namespace HeuristicLab.Problems.DataAnalysis.Classification.Views {
+namespace HeuristicLab.Problems.DataAnalysis.Views {
   partial class DiscriminantFunctionClassificationRocCurvesView {
     /// <summary> 

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

@@ -28 +28 @@
 using System.Windows.Forms.DataVisualization.Charting;
 using HeuristicLab.Common;
+using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
-namespace HeuristicLab.Problems.DataAnalysis.Classification.Views {
+namespace HeuristicLab.Problems.DataAnalysis.Views {
   [View("Discriminant function classification solution ROC curves view")]
   [Content(typeof(IDiscriminantFunctionClassificationSolution))]
-  public partial class DiscriminantFunctionClassificationRocCurvesView : AsynchronousContentView {
+  public partial class DiscriminantFunctionClassificationRocCurvesView : ItemView, IDiscriminantFunctionClassificationSolutionEvaluationView {
     private const string xAxisTitle = "False Positive Rate";
     private const string yAxisTitle = "True Positive Rate";

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

@@ -22 +22 @@
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Core.Views;
 using HeuristicLab.Data;
 using HeuristicLab.Data.Views;
@@ -30 +31 @@
   [View("Discriminant function classification solution estimated class values view")]
   [Content(typeof(IDiscriminantFunctionClassificationSolution))]
-  public partial class DiscriminantFunctionClassificationSolutionEstimatedClassValuesView : AsynchronousContentView {
+  public partial class DiscriminantFunctionClassificationSolutionEstimatedClassValuesView : ItemView, IDiscriminantFunctionClassificationSolutionEvaluationView {
     private const string TargetClassValuesSeriesname = "TargetVariable";
     private const string EstimatedClassValuesSeriesName = "EstimatedClassValues";

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

@@ -1 @@
-namespace HeuristicLab.Problems.DataAnalysis.Classification.Views {
-  partial class DiscriminantFunctionClassificationSolutionView {
+namespace HeuristicLab.Problems.DataAnalysis.Views {
+  partial class DiscriminantFunctionClassificationSolutionThresholdView {
     /// <summary> 
     /// Required designer variable.

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

@@ -27 +27 @@
 using System.Windows.Forms.DataVisualization.Charting;
 using HeuristicLab.Common;
+using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Problems.DataAnalysis.Classification.Views {
-  [View("Discriminant function classification solution view")]
+namespace HeuristicLab.Problems.DataAnalysis.Views {
+  [View("DsicriminantFunctionClassificationSolutino ThresholdView")]
   [Content(typeof(IDiscriminantFunctionClassificationSolution), true)]
-  public sealed partial class DiscriminantFunctionClassificationSolutionView : AsynchronousContentView {
+  public sealed partial class DiscriminantFunctionClassificationSolutionThresholdView : ItemView, IDiscriminantFunctionClassificationSolutionEvaluationView {
     private const double TrainingAxisValue = 0.0;
     private const double TestAxisValue = 10.0;
@@ -49 +50 @@
     private bool updateInProgress;
 
-    public DiscriminantFunctionClassificationSolutionView()
+    public DiscriminantFunctionClassificationSolutionThresholdView()
       : base() {
       InitializeComponent();

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisSolutionView.Designer.cs

@@ -44 +44 @@
     /// </summary>
     private void InitializeComponent() {
-      this.dataTabPage = new System.Windows.Forms.TabPage();
-      this.dataViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
-      this.modelTabPage = new System.Windows.Forms.TabPage();
-      this.modelViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
-      this.tabControl = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl();
-      this.dataTabPage.SuspendLayout();
-      this.modelTabPage.SuspendLayout();
-      this.tabControl.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
+      this.splitContainer.Panel1.SuspendLayout();
+      this.splitContainer.Panel2.SuspendLayout();
+      this.splitContainer.SuspendLayout();
+      this.itemsGroupBox.SuspendLayout();
+      this.detailsGroupBox.SuspendLayout();
       this.SuspendLayout();
       // 
-      // dataTabPage
+      // splitContainer
       // 
-      this.dataTabPage.Controls.Add(this.dataViewHost);
-      this.dataTabPage.Location = new System.Drawing.Point(4, 22);
-      this.dataTabPage.Name = "dataTabPage";
-      this.dataTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.dataTabPage.Size = new System.Drawing.Size(372, 236);
-      this.dataTabPage.TabIndex = 1;
-      this.dataTabPage.Text = "Data";
-      this.dataTabPage.UseVisualStyleBackColor = true;
       // 
-      // dataViewHost
+      // itemsGroupBox
       // 
-      this.dataViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.dataViewHost.Caption = "DataAnalysisSolution Data View";
-      this.dataViewHost.Content = null;
-      this.dataViewHost.Enabled = false;
-      this.dataViewHost.Location = new System.Drawing.Point(6, 6);
-      this.dataViewHost.Name = "dataViewHost";
-      this.dataViewHost.ReadOnly = false;
-      this.dataViewHost.Size = new System.Drawing.Size(360, 224);
-      this.dataViewHost.TabIndex = 2;
-      this.dataViewHost.ViewType = null;
+      this.itemsGroupBox.Text = "Data Analysis Solution";
       // 
-      // modelTabPage
+      // addButton
       // 
-      this.modelTabPage.Controls.Add(this.modelViewHost);
-      this.modelTabPage.Location = new System.Drawing.Point(4, 22);
-      this.modelTabPage.Name = "modelTabPage";
-      this.modelTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.modelTabPage.Size = new System.Drawing.Size(372, 236);
-      this.modelTabPage.TabIndex = 0;
-      this.modelTabPage.Text = "Model";
-      this.modelTabPage.UseVisualStyleBackColor = true;
+      this.toolTip.SetToolTip(this.addButton, "Add");
       // 
-      // modelViewHost
+      // removeButton
       // 
-      this.modelViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.modelViewHost.Caption = "DataAnalysisSolution Model View";
-      this.modelViewHost.Content = null;
-      this.modelViewHost.Enabled = false;
-      this.modelViewHost.Location = new System.Drawing.Point(6, 6);
-      this.modelViewHost.Name = "modelViewHost";
-      this.modelViewHost.ReadOnly = false;
-      this.modelViewHost.Size = new System.Drawing.Size(360, 224);
-      this.modelViewHost.TabIndex = 1;
-      this.modelViewHost.ViewType = null;
-      // 
-      // tabControl
-      // 
-      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.tabControl.Controls.Add(this.modelTabPage);
-      this.tabControl.Controls.Add(this.dataTabPage);
-      this.tabControl.Location = new System.Drawing.Point(3, 3);
-      this.tabControl.Name = "tabControl";
-      this.tabControl.SelectedIndex = 0;
-      this.tabControl.Size = new System.Drawing.Size(380, 262);
-      this.tabControl.TabIndex = 1;
+      this.toolTip.SetToolTip(this.removeButton, "Remove");
       // 
       // DataAnalysisSolutionView
@@ -123 +71 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.tabControl);
       this.Name = "DataAnalysisSolutionView";
-      this.Size = new System.Drawing.Size(386, 268);
-      this.dataTabPage.ResumeLayout(false);
-      this.modelTabPage.ResumeLayout(false);
-      this.tabControl.ResumeLayout(false);
+      this.splitContainer.Panel1.ResumeLayout(false);
+      this.splitContainer.Panel2.ResumeLayout(false);
+      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
+      this.splitContainer.ResumeLayout(false);
+      this.itemsGroupBox.ResumeLayout(false);
+      this.detailsGroupBox.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -135 +84 @@
     #endregion
 
-    protected HeuristicLab.MainForm.WindowsForms.DragOverTabControl tabControl;
-    protected System.Windows.Forms.TabPage dataTabPage;
-    protected System.Windows.Forms.TabPage modelTabPage;
-    protected HeuristicLab.MainForm.WindowsForms.ViewHost dataViewHost;
-    protected HeuristicLab.MainForm.WindowsForms.ViewHost modelViewHost;
   }
 }

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

@@ -19 +19 @@
  */
 #endregion
+
 using System;
+using System.Collections.Generic;
 using System.Windows.Forms;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.MainForm;
-using HeuristicLab.MainForm.WindowsForms;
+using HeuristicLab.Optimization.Views;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
   [View("Data analysis solution view")]
-  [Content(typeof(IDataAnalysisSolution))]
-  public partial class DataAnalysisSolutionView : AsynchronousContentView {
+  [Content(typeof(DataAnalysisSolution), true)]
+  public partial class DataAnalysisSolutionView : ResultCollectionView {
     public DataAnalysisSolutionView() {
       InitializeComponent();
     }
 
-    public new IDataAnalysisSolution Content {
-      get { return (IDataAnalysisSolution)base.Content; }
+    public new DataAnalysisSolution Content {
+      get { return (DataAnalysisSolution)base.Content; }
       set { base.Content = value; }
     }
 
     protected override void OnContentChanged() {
+      string selectedName = null;
+      if ((itemsListView.SelectedItems.Count == 1) && (itemsListView.SelectedItems[0].Tag != null && itemsListView.SelectedItems[0].Tag is Type))
+        selectedName = itemsListView.SelectedItems[0].Text;
+
+      //cache old viewTypes;
+      var viewTypes = new List<Type>();
+      foreach (ListViewItem item in ItemsListView.Items) {
+        var viewType = item.Tag as Type;
+        if (viewType != null) viewTypes.Add(viewType);
+      }
+
       base.OnContentChanged();
-      if (Content != null) {
-        modelViewHost.Content = Content.Model;
-        dataViewHost.Content = Content.ProblemData;
-      } else {
-        modelViewHost.Content = null;
-        dataViewHost.Content = null;
+
+      //readd viewTypes
+      foreach (Type viewType in viewTypes)
+        AddViewListViewItem(viewType);
+
+      //recover selection
+      if (selectedName != null) {
+        foreach (ListViewItem item in itemsListView.Items) {
+          if (item.Tag != null && item.Tag is Type && item.Text == selectedName)
+            item.Selected = true;
+        }
       }
     }
 
-    protected override void RegisterContentEvents() {
-      base.RegisterContentEvents();
-      Content.ModelChanged += new EventHandler(Content_ModelChanged);
-      Content.ProblemDataChanged += new EventHandler(Content_ProblemDataChanged);
+    protected override void itemsListView_DoubleClick(object sender, EventArgs e) {
+      if (itemsListView.SelectedItems.Count == 1 && itemsListView.SelectedItems[0].Tag is Type) {
+        Type viewType = (Type)itemsListView.SelectedItems[0].Tag;
+        MainFormManager.MainForm.ShowContent(Content, viewType);
+      } else
+        base.itemsListView_DoubleClick(sender, e);
     }
 
-    protected override void DeregisterContentEvents() {
-      base.DeregisterContentEvents();
-      Content.ModelChanged -= new EventHandler(Content_ModelChanged);
-      Content.ProblemDataChanged -= new EventHandler(Content_ProblemDataChanged);
+    protected override void itemsListView_SelectedIndexChanged(object sender, EventArgs e) {
+      if (itemsListView.SelectedItems.Count == 1 && itemsListView.SelectedItems[0].Tag is Type) {
+        detailsGroupBox.Enabled = true;
+        Type viewType = (Type)itemsListView.SelectedItems[0].Tag;
+        viewHost.ViewType = viewType;
+        viewHost.Content = Content;
+      } else
+        base.itemsListView_SelectedIndexChanged(sender, e);
     }
 
-    private void Content_ModelChanged(object sender, EventArgs e) {
-      modelViewHost.Content = Content.Model;
+    protected void AddViewListViewItem(Type viewType) {
+      if (!typeof(IDataAnalysisSolutionEvaluationView).IsAssignableFrom(viewType))
+        throw new ArgumentException("Given type " + viewType + " is not a IDataAnalysisSolutionEvaluationView.");
+
+      ListViewItem listViewItem = new ListViewItem();
+      listViewItem.Text = ViewAttribute.GetViewName(viewType);
+      itemsListView.SmallImageList.Images.Add(VSImageLibrary.Graph);
+      listViewItem.ImageIndex = itemsListView.SmallImageList.Images.Count - 1;
+      listViewItem.Tag = viewType;
+      itemsListView.Items.Add(listViewItem);
+
+      AdjustListViewColumnSizes();
     }
-    private void Content_ProblemDataChanged(object sender, EventArgs e) {
-      dataViewHost.Content = Content.ProblemData;
+
+    protected void RemoveViewListViewItem(Type viewType) {
+      List<ListViewItem> itemsToRemove = new List<ListViewItem>(); ;
+      foreach (ListViewItem item in itemsListView.Items)
+        if (item.Tag as Type == typeof(ClassificationSolutionEstimatedClassValuesView))
+          itemsToRemove.Add(item);
+
+      foreach (ListViewItem item in itemsToRemove)
+        itemsListView.Items.Remove(item);
     }
   }

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

@@ -110 +110 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ClassificationSolutionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ClassificationSolutionView.Designer.cs">
+      <DependentUpon>ClassificationSolutionView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Classification\ClassificationSolutionConfusionMatrixView.cs">
       <SubType>UserControl</SubType>
@@ -134 +140 @@
       <DependentUpon>DiscriminantFunctionClassificationRocCurvesView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Classification\DiscriminantFunctionClassificationSolutionView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Classification\DiscriminantFunctionClassificationSolutionView.Designer.cs">
+    <Compile Include="Classification\DiscriminantFunctionClassificationSolutionThresholdView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Classification\DiscriminantFunctionClassificationSolutionThresholdView.Designer.cs">
+      <DependentUpon>DiscriminantFunctionClassificationSolutionThresholdView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DiscriminantFunctionClassificationSolutionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="DiscriminantFunctionClassificationSolutionView.Designer.cs">
       <DependentUpon>DiscriminantFunctionClassificationSolutionView.cs</DependentUpon>
     </Compile>
+    <Compile Include="Interfaces\IDataAnalysisSolutionEvaluationView.cs" />
+    <Compile Include="Interfaces\IDiscriminantFunctionClassificationSolutionEvaluationView.cs" />
+    <Compile Include="Interfaces\IClusteringSolutionEvaluationView.cs" />
+    <Compile Include="Interfaces\IClassificationSolutionEvaluationView.cs" />
     <Compile Include="DataAnalysisSolutionView.cs">
       <SubType>UserControl</SubType>
@@ -151 +167 @@
     <Compile Include="DoubleLimitView.Designer.cs">
       <DependentUpon>DoubleLimitView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interfaces\IRegressionSolutionEvaluationView.cs" />
+    <Compile Include="RegressionSolutionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RegressionSolutionView.Designer.cs">
+      <DependentUpon>RegressionSolutionView.cs</DependentUpon>
     </Compile>
     <Compile Include="Regression\RegressionSolutionEstimatedValuesView.cs">
@@ -183 +206 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
+      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
+      <Name>HeuristicLab.Collections-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
+      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
+      <Name>HeuristicLab.Common.Resources-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>

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

@@ -29 +29 @@
   [PluginFile("HeuristicLab.Problems.DataAnalysis.Views-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.ALGLIB","3.1.0.0")]
-  [PluginDependency("HeuristicLab.Common", "3.3.3.0")]
-  [PluginDependency("HeuristicLab.Core", "3.3.3.0")]
-  [PluginDependency("HeuristicLab.Core.Views", "3.3.3.0")]
-  [PluginDependency("HeuristicLab.Data", "3.3.3.0")]
-  [PluginDependency("HeuristicLab.Data.Views", "3.3.3.0")]
-  [PluginDependency("HeuristicLab.MainForm", "3.3.3.0")]
-  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3.3.0")]
-  [PluginDependency("HeuristicLab.Optimization","3.3.3.0")]
-  [PluginDependency("HeuristicLab.Optimization.Views","3.3.3.0")]
-  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4.0.0")]
+  [PluginDependency("HeuristicLab.Collections", "3.3")]
+  [PluginDependency("HeuristicLab.Common", "3.3")]
+  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
+  [PluginDependency("HeuristicLab.Data", "3.3")]
+  [PluginDependency("HeuristicLab.Data.Views", "3.3")]
+  [PluginDependency("HeuristicLab.MainForm", "3.3")]
+  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization","3.3")]
+  [PluginDependency("HeuristicLab.Optimization.Views","3.3")]
+  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
   [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")]
   public class HeuristicLabProblemsDataAnalysisViewsPlugin : PluginBase {

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

@@ -22 +22 @@
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Core.Views;
 using HeuristicLab.Data;
 using HeuristicLab.Data.Views;
@@ -30 +31 @@
   [View("Regression solution estimated values view")]
   [Content(typeof(IRegressionSolution))]
-  public partial class RegressionSolutionEstimatedValuesView : AsynchronousContentView {
+  public partial class RegressionSolutionEstimatedValuesView : ItemView, IRegressionSolutionEvaluationView {
     private const string TARGETVARIABLE_SERIES_NAME = "TargetVariable";
     private const string ESTIMATEDVALUES_SERIES_NAME = "EstimatedValues";

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

@@ -24 +24 @@
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
+using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
@@ -30 +31 @@
   [View("Regression solution line chart")]
   [Content(typeof(IRegressionSolution))]
-  public partial class RegressionSolutionLineChartView : AsynchronousContentView {
+  public partial class RegressionSolutionLineChartView : ItemView, IRegressionSolutionEvaluationView {
     private const string TARGETVARIABLE_SERIES_NAME = "TargetVariable";
     private const string ESTIMATEDVALUES_SERIES_NAME = "EstimatedValues";

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

@@ -25 +25 @@
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
+using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
@@ -31 +32 @@
   [View("Regression solution scatter plot")]
   [Content(typeof(IRegressionSolution))]
-  public partial class RegressionSolutionScatterPlotView : AsynchronousContentView {
+  public partial class RegressionSolutionScatterPlotView : ItemView, IRegressionSolutionEvaluationView {
     private const string ALL_SERIES = "All samples";
     private const string TRAINING_SERIES = "Training samples";