Changeset 3442 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3

Timestamp:

04/20/10 15:49:22 (14 years ago)

Author:

gkronber

Message:

Implemented views for DataAnalysisProblems and DataAnalysisSolutions. #938 (Data types and operators for regression problems)

Location:

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

Files:

• DataAnalysisProblemDataView.Designer.cs (modified) (6 diffs)
• DataAnalysisProblemDataView.cs (modified) (2 diffs)
• DataAnalysisProblemDataView.resx (added)
• DataAnalysisProblemView.Designer.cs (deleted)
• DataAnalysisProblemView.cs (deleted)
• EstimatedValuesView.Designer.cs (added)
• EstimatedValuesView.cs (added)
• EstimatedValuesView.resx (added)
• HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj (modified) (5 diffs)
• LineChartView.Designer.cs (modified) (3 diffs)
• LineChartView.cs (modified) (2 diffs)
• ScatterPlotView.Designer.cs (modified) (1 diff)
• ScatterPlotView.cs (modified) (6 diffs)
• Symbolic (added)
• Symbolic/SimplifiedSymbolicExpressionModelView.cs (added)
• Symbolic/SimplifiedSymbolicExpressionModelView.designer.cs (added)
• Symbolic/SimplifiedSymbolicExpressionModelView.resx (added)
• Symbolic/SymbolicExpressionModelView.cs (added)
• Symbolic/SymbolicExpressionModelView.designer.cs (added)
• Symbolic/SymbolicExpressionModelView.resx (added)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemDataView.Designer.cs

@@ -1 @@
-#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-namespace HeuristicLab.Problems.DataAnalysis {
+namespace HeuristicLab.Problems.DataAnalysis.Views {
   partial class DataAnalysisProblemDataView {
     /// <summary> 
@@ -32 +11 @@
     /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
     protected override void Dispose(bool disposing) {
-      if (disposing) {
-        if (openFileDialog != null) openFileDialog.Dispose();
-        if (components != null) components.Dispose();
+      if (disposing && (components != null)) {
+        components.Dispose();
       }
       base.Dispose(disposing);
@@ -46 +24 @@
     /// </summary>
     private void InitializeComponent() {
+      this.variableCollectionView = new HeuristicLab.Core.Views.VariableCollectionView();
       this.importButton = new System.Windows.Forms.Button();
-      this.datasetView = new HeuristicLab.Data.Views.StringConvertibleMatrixView();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
@@ -55 +33 @@
       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
-      this.nameTextBox.Size = new System.Drawing.Size(457, 20);
       // 
-      // descriptionTextBox
+      // variableCollectionView
       // 
-      this.descriptionTextBox.Size = new System.Drawing.Size(457, 20);
+      this.variableCollectionView.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.variableCollectionView.Caption = "VariableCollection";
+      this.variableCollectionView.Content = null;
+      this.variableCollectionView.Location = new System.Drawing.Point(0, 52);
+      this.variableCollectionView.Name = "variableCollectionView";
+      this.variableCollectionView.ReadOnly = false;
+      this.variableCollectionView.Size = new System.Drawing.Size(588, 366);
+      this.variableCollectionView.TabIndex = 0;
       // 
       // importButton
@@ -65 +51 @@
       this.importButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.importButton.Location = new System.Drawing.Point(0, 399);
+      this.importButton.Location = new System.Drawing.Point(6, 424);
       this.importButton.Name = "importButton";
-      this.importButton.Size = new System.Drawing.Size(529, 23);
-      this.importButton.TabIndex = 5;
-      this.importButton.Text = "&Import from CSV file";
+      this.importButton.Size = new System.Drawing.Size(579, 23);
+      this.importButton.TabIndex = 4;
+      this.importButton.Text = "Import from CSV file";
       this.importButton.UseVisualStyleBackColor = true;
       this.importButton.Click += new System.EventHandler(this.importButton_Click);
       // 
-      // datasetView
-      // 
-      this.datasetView.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.datasetView.Caption = "StringConvertibleMatrix View";
-      this.datasetView.Content = null;
-      this.datasetView.Location = new System.Drawing.Point(0, 52);
-      this.datasetView.Name = "datasetView";
-      this.datasetView.Size = new System.Drawing.Size(526, 341);
-      this.datasetView.TabIndex = 6;
-      // 
-      // RegressionProblemDataView
+      // ProblemDataView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.variableCollectionView);
       this.Controls.Add(this.importButton);
-      this.Controls.Add(this.datasetView);
-      this.Name = "RegressionProblemDataView";
-      this.Size = new System.Drawing.Size(529, 422);
-      this.Controls.SetChildIndex(this.datasetView, 0);
+      this.Name = "ProblemDataView";
+      this.Size = new System.Drawing.Size(588, 450);
       this.Controls.SetChildIndex(this.importButton, 0);
+      this.Controls.SetChildIndex(this.variableCollectionView, 0);
       this.Controls.SetChildIndex(this.nameLabel, 0);
       this.Controls.SetChildIndex(this.descriptionLabel, 0);
@@ -107 +81 @@
     #endregion
 
+    private HeuristicLab.Core.Views.VariableCollectionView variableCollectionView;
     private System.Windows.Forms.Button importButton;
-    private HeuristicLab.Data.Views.StringConvertibleMatrixView datasetView;
-
   }
 }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemDataView.cs

@@ -1 @@
-#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
 using System.Windows.Forms;
-using HeuristicLab.Common;
-using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 
-namespace HeuristicLab.Problems.DataAnalysis {
-  [View("Data-Analysis Data View")]
-  [Content(typeof(DataAnalysisProblemData), true)]
+namespace HeuristicLab.Problems.DataAnalysis.Views {
+  [View("Data-Analysis Problem View")]
+  [Content(typeof(DataAnalysisProblemData))]
   public partial class DataAnalysisProblemDataView : NamedItemView {
     private OpenFileDialog openFileDialog;
-
     public new DataAnalysisProblemData Content {
       get { return (DataAnalysisProblemData)base.Content; }
-      set { base.Content = value; }
+      set {
+        base.Content = value;
+      }
     }
 
@@ -45 +29 @@
       : this() {
       Content = content;
+      variableCollectionView.Content = content.Variables.AsReadOnly();
     }
 
-    protected override void RegisterContentEvents() {
-      base.RegisterContentEvents();
-      if (Content != null)
-        Content.DatasetChanged += new EventHandler(Content_DatasetChanged);
-    }
-
-    protected override void DeregisterContentEvents() {
-      base.DeregisterContentEvents();
-      if(Content != null)
-        Content.DatasetChanged -= new EventHandler(Content_DatasetChanged);
-    }
-
-    private void Content_DatasetChanged(object sender, EventArgs e) {
-      this.datasetView.Content = this.Content.Dataset;
-    }
-
-    protected override void OnContentChanged() {
-      base.OnContentChanged();
-      if (Content == null) {
-        importButton.Enabled = false;
-      } else {
-        importButton.Enabled = true;
-        this.datasetView.Content = this.Content.Dataset;
-      }
-    }
-
-    private void importButton_Click(object sender, System.EventArgs e) {
+    private void importButton_Click(object sender, EventArgs e) {
       if (openFileDialog == null) openFileDialog = new OpenFileDialog();
 

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

@@ -72 +72 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Windows.Forms.DataVisualization, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -84 +85 @@
     <None Include="HeuristicLab.snk" />
     <None Include="Properties\AssemblyInfo.frame" />
+    <Compile Include="EstimatedValuesView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="EstimatedValuesView.Designer.cs">
+      <DependentUpon>EstimatedValuesView.cs</DependentUpon>
+    </Compile>
     <Compile Include="DataAnalysisProblemDataView.cs">
       <SubType>UserControl</SubType>
@@ -91 +98 @@
     </Compile>
     <Compile Include="HeuristicLabProblemsDataAnalysisViewsPlugin.cs" />
+    <Compile Include="LineChartView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="LineChartView.Designer.cs">
+      <DependentUpon>LineChartView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ScatterPlotView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ScatterPlotView.Designer.cs">
+      <DependentUpon>ScatterPlotView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Symbolic\SimplifiedSymbolicExpressionModelView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Symbolic\SimplifiedSymbolicExpressionModelView.designer.cs">
+      <DependentUpon>SimplifiedSymbolicExpressionModelView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Symbolic\SymbolicExpressionModelView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Symbolic\SymbolicExpressionModelView.designer.cs">
+      <DependentUpon>SymbolicExpressionModelView.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -118 +149 @@
       <Name>HeuristicLab.Data-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.csproj">
+      <Project>{6F42C5F8-16CD-43EE-8208-FD4573A69D85}</Project>
+      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
       <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
@@ -146 +181 @@
       <Name>HeuristicLab.PluginInfrastructure</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Regression\3.3\HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj">
+      <Project>{BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}</Project>
+      <Name>HeuristicLab.Problems.DataAnalysis.Regression-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj">
       <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
       <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
     </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="EstimatedValuesView.resx">
+      <DependentUpon>EstimatedValuesView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DataAnalysisProblemDataView.resx">
+      <DependentUpon>DataAnalysisProblemDataView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="LineChartView.resx">
+      <DependentUpon>LineChartView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ScatterPlotView.resx">
+      <DependentUpon>ScatterPlotView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Symbolic\SimplifiedSymbolicExpressionModelView.resx">
+      <DependentUpon>SimplifiedSymbolicExpressionModelView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Symbolic\SymbolicExpressionModelView.resx">
+      <DependentUpon>SymbolicExpressionModelView.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/LineChartView.Designer.cs

@@ -19 +19 @@
  */
 #endregion
-namespace HeuristicLab.Problem.DataAnalysis.Views {
+namespace HeuristicLab.Problems.DataAnalysis.Views {
   partial class LineChartView {
     /// <summary> 
@@ -63 +63 @@
       this.chart.Size = new System.Drawing.Size(358, 225);
       this.chart.TabIndex = 0;
-      this.chart.MouseMove += new System.Windows.Forms.MouseEventHandler(this.chart_MouseMove);
-      this.chart.MouseDown += new System.Windows.Forms.MouseEventHandler(this.chart_MouseDown);
       // 
       // QualityLineChart
@@ -74 +72 @@
       this.Name = "QualityLineChart";
       this.Size = new System.Drawing.Size(358, 225);
-      this.DragDrop += new System.Windows.Forms.DragEventHandler(this.ModelLineChart_DragDrop);
-      this.DragEnter += new System.Windows.Forms.DragEventHandler(this.ModelLineChart_DragEnter);
       ((System.ComponentModel.ISupportInitialize)(this.chart)).EndInit();
       this.ResumeLayout(false);

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/LineChartView.cs

@@ -32 +32 @@
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.MainForm.WindowsForms;
+using System.Windows.Forms.DataVisualization.Charting;
 
-namespace HeuristicLab.Problems.DataAnalysis {
+namespace HeuristicLab.Problems.DataAnalysis.Views {
   [View("Line Chart View")]
   [Content(typeof(DataAnalysisSolution))]
-  public partial class LineChartView : ContentView {
-    
+  public partial class LineChartView : AsynchronousContentView {
+    private const string TARGETVARIABLE_SERIES_NAME = "TargetVariable";
+    private const string ESTIMATEDVALUES_SERIES_NAME = "EstimatedValues";
+
+    public new DataAnalysisSolution Content {
+      get { return (DataAnalysisSolution)base.Content; }
+      set {
+        base.Content = value;
+      }
+    }
+
     public LineChartView()
       : base() {
@@ -49 +59 @@
       this.chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = true;
       this.chart.ChartAreas[0].AxisY.ScaleView.Zoomable = true;
-      this.chart.ChartAreas[0].CursorY.Interval = 0;      
+      this.chart.ChartAreas[0].CursorY.Interval = 0;
     }
 
     public LineChartView(DataAnalysisSolution dataAnalysisSolution)
       : this() {
-      
+      Content = dataAnalysisSolution;
+      DrawTargetVariableValues();
+      DrawEstimatedValues();
     }
 
-    private void model_Changed(object sender, EventArgs e) {
-      if (InvokeRequired) {
-        Action<object, EventArgs> action = new Action<object, EventArgs>(model_Changed);
-        this.Invoke(action, sender, e);
-      } else {
-        IVisualModel model = (IVisualModel)sender;
-        Series s = this.chart.Series.Single(x => x.Tag == model);
-        s.Points.DataBindY(model.PredictedValues.ToArray());
-        s.LegendText = model.ModelName;
-        this.UpdateStripLines();
-      }
+    private void DrawEstimatedValues() {
+      this.chart.Series.Add(ESTIMATEDVALUES_SERIES_NAME);
+      this.chart.Series[ESTIMATEDVALUES_SERIES_NAME].LegendText = Content.ItemName;
+      this.chart.Series[ESTIMATEDVALUES_SERIES_NAME].ChartType = SeriesChartType.FastLine;
+      this.chart.Series[ESTIMATEDVALUES_SERIES_NAME].Points.DataBindY(Content.EstimatedValues.ToArray());
+      this.chart.Series[ESTIMATEDVALUES_SERIES_NAME].Tag = Content;
     }
 
-    protected override void ModelsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e) {
-      base.ModelsCollectionChanged(sender, e);
-      if (InvokeRequired) {
-        Action<object, NotifyCollectionChangedEventArgs> action = new Action<object, NotifyCollectionChangedEventArgs>(ModelsCollectionChanged);
-        this.Invoke(action, sender, e);
-      } else {
-        if (e.Action == NotifyCollectionChangedAction.Remove) {
-          foreach (IVisualModel model in e.OldItems) {
-            if (this.chart.Series.Any(x => x.Tag == model))
-              this.RemoveModel(model);
-          }
-          this.UpdateStripLines();
-        } else if (e.Action == NotifyCollectionChangedAction.Reset)
-          this.RemoveAllModels();
-      }
-    }
-
-    private void AddModel(IVisualModel model) {
-      if (this.targetVariableName != model.TargetVariableName) {
-        this.RemoveAllModels();
-        this.chart.Series.Clear();
-        this.chart.Series.Add(TARGETVARIABLE);
-        this.chart.Series[TARGETVARIABLE].LegendText = model.TargetVariableName;
-        this.chart.Series[TARGETVARIABLE].ChartType = SeriesChartType.FastLine;
-        this.chart.Series[TARGETVARIABLE].Points.DataBindY(model.Dataset.GetVariableValues(model.TargetVariableName));
-        this.targetVariableName = model.TargetVariableName;
-        this.Caption = this.targetVariableName + " Model Line Chart";
-      }
-      string seriesName = model.GetHashCode().ToString();
-      this.chart.Series.Add(seriesName);
-      this.chart.Series[seriesName].Tag = model;
-      this.chart.Series[seriesName].LegendText = model.ModelName;
-      this.chart.Series[seriesName].ChartType = SeriesChartType.FastLine;
-      this.chart.Series[seriesName].Points.DataBindY(model.PredictedValues.ToArray());
-      model.Changed += new EventHandler(model_Changed);
+    private void DrawTargetVariableValues() {
+      this.chart.Series.Clear();
+      this.chart.Series.Add(TARGETVARIABLE_SERIES_NAME);
+      this.chart.Series[TARGETVARIABLE_SERIES_NAME].LegendText = Content.ProblemData.TargetVariable.Value;
+      this.chart.Series[TARGETVARIABLE_SERIES_NAME].ChartType = SeriesChartType.FastLine;
+      this.chart.Series[TARGETVARIABLE_SERIES_NAME].Points.DataBindY(Content.ProblemData.Dataset[Content.ProblemData.TargetVariable.Value]);
       this.UpdateStripLines();
     }
 
-    private void RemoveModel(IVisualModel model) {
-      Series s = this.chart.Series.Single(x => x.Tag == model);
-      this.chart.Series.Remove(s);
-      model.Changed -= new EventHandler(model_Changed);
+    #region events
+    protected override void RegisterContentEvents() {
+      base.RegisterContentEvents();
+      Content.ModelChanged += new EventHandler(Content_ModelChanged);
+      Content.ProblemDataChanged += new EventHandler(Content_ProblemDataChanged);
     }
 
-    private void RemoveAllModels() {
-      var models = (from s in chart.Series
-                    let m = s.Tag as IVisualModel
-                    where m != null
-                    select m).ToArray(); // select and copy currently displayed models
-      foreach (var m in models) {
-        this.RemoveModel(m);
-      }
-      this.UpdateStripLines();
+    protected override void DeregisterContentEvents() {
+      base.DeregisterContentEvents();
+      Content.ModelChanged -= new EventHandler(Content_ModelChanged);
+      Content.ProblemDataChanged -= new EventHandler(Content_ProblemDataChanged);
     }
 
-    private void chart_MouseDown(object sender, MouseEventArgs e) {
-      HitTestResult result = this.chart.HitTest(e.X, e.Y);
-      if (result.ChartElementType == ChartElementType.LegendItem) {
-        if (result.Series.Name != TARGETVARIABLE) {
-          this.RemoveModel(result.Series.Tag as IVisualModel);
-          this.UpdateStripLines();
+    void Content_ProblemDataChanged(object sender, EventArgs e) {
+      OnContentChanged();
+    }
+
+    void Content_ModelChanged(object sender, EventArgs e) {
+      OnContentChanged();
+    }
+
+    protected override void OnContentChanged() {
+      base.OnContentChanged();
+      UpdateEstimatedValuesLineChart();
+    }
+
+    private void UpdateEstimatedValuesLineChart() {
+      if (InvokeRequired) Invoke((Action)UpdateEstimatedValuesLineChart);
+      else {
+        if (this.chart.Series.Count > 0) {
+          Series s = this.chart.Series.SingleOrDefault(x => x.Tag == Content);
+          if (s != null) {
+            s.Points.DataBindY(Content.EstimatedValues.ToArray());
+            s.LegendText = Content.ItemName;
+            this.UpdateStripLines();
+          }
         }
       }
     }
-
-    private void chart_MouseMove(object sender, MouseEventArgs e) {
-      HitTestResult result = this.chart.HitTest(e.X, e.Y);
-      if (result.ChartElementType == ChartElementType.LegendItem) {
-        if (result.Series.Name != TARGETVARIABLE)
-          this.Cursor = Cursors.Hand;
-      } else
-        this.Cursor = Cursors.Default;
-    }
+    #endregion
 
     private void UpdateStripLines() {
       this.chart.ChartAreas[0].AxisX.StripLines.Clear();
-      IEnumerable<IVisualModel> visualModels = from Series s in this.chart.Series
-                                               where s.Tag is IVisualModel
-                                               select (IVisualModel)s.Tag;
-      if (visualModels.Count() > 0) {
-        IVisualModel model = visualModels.ElementAt(0);
-        if (visualModels.All(x => x.TrainingSamplesStart == model.TrainingSamplesStart && x.TrainingSamplesEnd == model.TrainingSamplesEnd))
-          this.CreateAndAddStripLine("Training", Color.FromArgb(20, Color.Green), model.TrainingSamplesStart, model.TrainingSamplesEnd);
-        if (visualModels.All(x => x.ValidationSamplesStart == model.ValidationSamplesStart && x.ValidationSamplesEnd == model.ValidationSamplesEnd))
-          this.CreateAndAddStripLine("Validation", Color.FromArgb(20, Color.Yellow), model.ValidationSamplesStart, model.ValidationSamplesEnd);
-        if (visualModels.All(x => x.TestSamplesStart == model.TestSamplesStart && x.TestSamplesEnd == model.TestSamplesEnd))
-          this.CreateAndAddStripLine("Test", Color.FromArgb(20, Color.Red), model.TestSamplesStart, model.TestSamplesEnd);
-      }
+      this.CreateAndAddStripLine("Training", Color.FromArgb(20, Color.Green),
+        Content.ProblemData.TrainingSamplesStart.Value,
+        Content.ProblemData.TrainingSamplesEnd.Value);
+      this.CreateAndAddStripLine("Test", Color.FromArgb(20, Color.Red),
+        Content.ProblemData.TestSamplesStart.Value,
+        Content.ProblemData.TestSamplesEnd.Value);
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/ScatterPlotView.Designer.cs

@@ -75 +75 @@
       this.AllowDrop = true;
       this.Size = new System.Drawing.Size(527, 392);
-      this.DragDrop += new System.Windows.Forms.DragEventHandler(this.ScatterPlotView_DragDrop);
-      this.DragEnter += new System.Windows.Forms.DragEventHandler(this.ScatterPlotView_DragEnter);
       ((System.ComponentModel.ISupportInitialize)(this.chart)).EndInit();
       this.ResumeLayout(false);

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/ScatterPlotView.cs

@@ -32 +32 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.Problems.DataAnalysis;
-
-namespace HeuristicLab.Problems.DataAnalyis.Views {
+using HeuristicLab.MainForm.WindowsForms;
+
+namespace HeuristicLab.Problems.DataAnalysis.Views {
   [View("Scatter Plot View")]
   [Content(typeof(DataAnalysisSolution))]
-  public partial class ScatterPlotView : ContentView {
+  public partial class ScatterPlotView : AsynchronousContentView {
     private const string DEFAULT_CAPTION = "Scatter Plot";
     private const string ALL_SERIES = "All Samples";
     private const string TRAINING_SERIES = "Training Samples";
-    private const string validationSeries = "Validation Samples";
     private const string TEST_SERIES = "Test Samples";
+
+    public new DataAnalysisSolution Content {
+      get { return (DataAnalysisSolution)base.Content; }
+      set { base.Content = value; }
+    }
 
     public ScatterPlotView()
@@ -55 +60 @@
       this.chart.Series[TRAINING_SERIES].LegendText = TRAINING_SERIES;
       this.chart.Series[TRAINING_SERIES].ChartType = SeriesChartType.FastPoint;
-
-      this.chart.Series.Add(validationSeries);
-      this.chart.Series[validationSeries].LegendText = validationSeries;
-      this.chart.Series[validationSeries].ChartType = SeriesChartType.FastPoint;
 
       this.chart.Series.Add(TEST_SERIES);
@@ -80 +81 @@
     }
 
-    public ScatterPlotView(IVisualModel visualModel)
+    public ScatterPlotView(DataAnalysisSolution dataAnalysisSolution)
       : this() {
-      this.VisualModel = visualModel;
-    }
-
-    private IVisualModel visualModel;
-    public IVisualModel VisualModel {
-      get { return this.visualModel; }
-      private set {
-        if (this.visualModel != null) {
-          this.visualModel.Changed -= new EventHandler(model_Changed);                 
-        }
-        this.visualModel = value;
-        if (this.visualModel != null) {
-          this.Caption = this.visualModel.ModelName + " " + DEFAULT_CAPTION;
-          this.visualModel.Changed += new EventHandler(model_Changed);
+      Content = dataAnalysisSolution;
+    }
+
+    protected override void RegisterContentEvents() {
+      base.RegisterContentEvents();
+      Content.ModelChanged += new EventHandler(Content_ModelChanged);
+      Content.ProblemDataChanged += new EventHandler(Content_ProblemDataChanged);
+    }
+    protected override void DeregisterContentEvents() {
+      base.DeregisterContentEvents();
+      Content.ModelChanged -= new EventHandler(Content_ModelChanged);
+      Content.ProblemDataChanged -= new EventHandler(Content_ProblemDataChanged);
+    }
+
+
+    void Content_ProblemDataChanged(object sender, EventArgs e) {
+      OnContentChanged();
+    }
+
+    void Content_ModelChanged(object sender, EventArgs e) {
+      OnContentChanged();
+    }
+
+    protected override void OnContentChanged() {
+      base.OnContentChanged();
+      UpdateChart();
+    }
+
+    private void UpdateChart() {
+      if (InvokeRequired) Invoke((Action)UpdateChart);
+      else {
+        if (Content != null) {
+          this.Caption = Content.ItemName + " " + DEFAULT_CAPTION;
           this.UpdateSeries();
           if (!this.chart.Series.Any(s => s.Points.Count > 0))
@@ -107 +127 @@
 
     private void UpdateSeries() {
+      string targetVariableName = Content.ProblemData.TargetVariable.Value;
+      Dataset dataset = Content.ProblemData.Dataset;
+      int trainingStart = Content.ProblemData.TrainingSamplesStart.Value;
+      int trainingEnd = Content.ProblemData.TrainingSamplesEnd.Value;
+      int testStart = Content.ProblemData.TestSamplesStart.Value;
+      int testEnd = Content.ProblemData.TestSamplesEnd.Value;
       if (this.chart.Series[ALL_SERIES].Points.Count > 0)
-        this.chart.Series[ALL_SERIES].Points.DataBindXY(this.visualModel.PredictedValues.ToArray(), "",
-          this.visualModel.Dataset.GetVariableValues(this.visualModel.TargetVariableName), "");
+        this.chart.Series[ALL_SERIES].Points.DataBindXY(Content.EstimatedValues.ToArray(), "",
+          dataset[targetVariableName], "");
       if (this.chart.Series[TRAINING_SERIES].Points.Count > 0)
-        this.chart.Series[TRAINING_SERIES].Points.DataBindXY(this.visualModel.PredictedTrainingValues.ToArray(), "",
-          this.visualModel.Dataset.GetVariableValues(this.visualModel.TargetVariableName, this.visualModel.TrainingSamplesStart, this.visualModel.TrainingSamplesEnd), "");
-      if (this.chart.Series[validationSeries].Points.Count > 0)
-        this.chart.Series[validationSeries].Points.DataBindXY(this.visualModel.PredictedValidationValues.ToArray(), "",
-          this.visualModel.Dataset.GetVariableValues(this.visualModel.TargetVariableName, this.visualModel.ValidationSamplesStart, this.visualModel.ValidationSamplesEnd), "");
+        this.chart.Series[TRAINING_SERIES].Points.DataBindXY(Content.EstimatedTrainingValues.ToArray(), "",
+          dataset.GetVariableValues(targetVariableName, trainingStart, trainingEnd), "");
       if (this.chart.Series[TEST_SERIES].Points.Count > 0)
-        this.chart.Series[TEST_SERIES].Points.DataBindXY(this.visualModel.PredictedTestValues.ToArray(), "",
-          this.visualModel.Dataset.GetVariableValues(this.visualModel.TargetVariableName, this.visualModel.TestSamplesStart, this.visualModel.TestSamplesEnd), "");
-
-      double x = this.visualModel.PredictedValues.Max();
-      double y = this.visualModel.Dataset.GetMaximum(this.visualModel.TargetVariableName);
-      double max = x > y ? x : y;
-      x = this.visualModel.PredictedValues.Min();
-      y = this.visualModel.Dataset.GetMinimum(this.visualModel.TargetVariableName);
-      double min = x < y ? x : y;
+        this.chart.Series[TEST_SERIES].Points.DataBindXY(Content.EstimatedTestValues.ToArray(), "",
+          dataset.GetVariableValues(targetVariableName, testStart, testEnd), "");
+
+      double max = Math.Max(Content.EstimatedValues.Max(), dataset.GetMax(targetVariableName));
+      double min = Math.Min(Content.EstimatedValues.Min(), dataset.GetMin(targetVariableName));
 
       max = Math.Ceiling(max) * 1.2;
@@ -139 +158 @@
       this.chart.Series[ALL_SERIES].Points.Clear();
       this.chart.Series[TRAINING_SERIES].Points.Clear();
-      this.chart.Series[validationSeries].Points.Clear();
       this.chart.Series[TEST_SERIES].Points.Clear();
     }
-
-
-    private void model_Changed(object sender, EventArgs e) {
-      if (InvokeRequired) {
-        Action<object, EventArgs> action = new Action<object, EventArgs>(model_Changed);
-        this.Invoke(action, sender, e);
-      } else {
-        this.Caption = this.visualModel.ModelName + " " + DEFAULT_CAPTION;
-        this.UpdateSeries();
-      }
-    }
-
-    protected override void OnClosed(FormClosedEventArgs e) {
-      base.OnClosed( e);
-      this.VisualModel = null;
-    }
-
-    protected override void ModelsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e) {
-      if (InvokeRequired) {
-        Action<object, NotifyCollectionChangedEventArgs> action = new Action<object, NotifyCollectionChangedEventArgs>(ModelsCollectionChanged);
-        this.Invoke(action, sender, e);
-      } else {
-        if (e.Action == NotifyCollectionChangedAction.Remove) {
-          if (e.OldItems.Contains(this.visualModel))
-            this.VisualModel = null;
-        }
-        if(e.Action == NotifyCollectionChangedAction.Reset)
-          this.VisualModel = null;
-      }
-    }  
 
     private void ToggleSeriesData(Series series) {
       if (series.Points.Count > 0) {  //checks if series is shown
         if (this.chart.Series.Any(s => s != series && s.Points.Count > 0)) {
-          series.Points.Clear();    
+          series.Points.Clear();
         }
-      } else if (this.visualModel != null) {
+      } else if (Content != null) {
+        string targetVariableName = Content.ProblemData.TargetVariable.Value;
+        Dataset dataset = Content.ProblemData.Dataset;
+        int trainingStart = Content.ProblemData.TrainingSamplesStart.Value;
+        int trainingEnd = Content.ProblemData.TrainingSamplesEnd.Value;
+        int testStart = Content.ProblemData.TestSamplesStart.Value;
+        int testEnd = Content.ProblemData.TestSamplesEnd.Value;
+
         IEnumerable<double> predictedValues = null;
         IEnumerable<double> targetValues = null;
         switch (series.Name) {
           case ALL_SERIES:
-            predictedValues = this.visualModel.PredictedValues;
-            targetValues = this.visualModel.Dataset.GetVariableValues(this.visualModel.TargetVariableName);
+            predictedValues = Content.EstimatedValues;
+            targetValues = dataset[targetVariableName];
             break;
           case TRAINING_SERIES:
-            predictedValues = this.visualModel.PredictedTrainingValues;
-            targetValues = this.visualModel.Dataset.GetVariableValues(this.visualModel.TargetVariableName, this.visualModel.TrainingSamplesStart, this.visualModel.TrainingSamplesEnd);
-            break;
-          case validationSeries:
-            predictedValues = this.visualModel.PredictedValidationValues;
-            targetValues = this.visualModel.Dataset.GetVariableValues(this.visualModel.TargetVariableName, this.visualModel.ValidationSamplesStart, this.visualModel.ValidationSamplesEnd);
+            predictedValues = Content.EstimatedTrainingValues;
+            targetValues = dataset.GetVariableValues(targetVariableName, trainingStart, trainingEnd);
             break;
           case TEST_SERIES:
-            predictedValues = this.visualModel.PredictedTestValues;
-            targetValues = this.visualModel.Dataset.GetVariableValues(this.visualModel.TargetVariableName, this.visualModel.TestSamplesStart, this.visualModel.TestSamplesEnd);
+            predictedValues = Content.EstimatedTestValues;
+            targetValues = dataset.GetVariableValues(targetVariableName, testStart, testEnd);
             break;
         }
-        series.Points.DataBindXY(predictedValues.ToArray(), "", targetValues, "");
+        series.Points.DataBindXY(predictedValues, "", targetValues, "");
         this.chart.Legends[series.Legend].ForeColor = Color.Black;
       }
@@ -227 +218 @@
       e.LegendItems[0].Cells[1].ForeColor = this.chart.Series[ALL_SERIES].Points.Count == 0 ? Color.Gray : Color.Black;
       e.LegendItems[1].Cells[1].ForeColor = this.chart.Series[TRAINING_SERIES].Points.Count == 0 ? Color.Gray : Color.Black;
-      e.LegendItems[2].Cells[1].ForeColor = this.chart.Series[validationSeries].Points.Count == 0 ? Color.Gray : Color.Black;
-      e.LegendItems[3].Cells[1].ForeColor = this.chart.Series[TEST_SERIES].Points.Count == 0 ? Color.Gray : Color.Black;
-    }
-
-
-    private void ScatterPlotView_DragDrop(object sender, DragEventArgs e) {
-      IVisualModel model = this.ExtractModel(e.Data);
-      if (model != null) {
-        this.VisualModel = model;
-      }
-    }
-
-    private void ScatterPlotView_DragEnter(object sender, DragEventArgs e) {
-      IVisualModel model = this.ExtractModel(e.Data);
-      if (model != null)
-        e.Effect = DragDropEffects.Link;
-      else
-        e.Effect = DragDropEffects.None;
+      e.LegendItems[2].Cells[1].ForeColor = this.chart.Series[TEST_SERIES].Points.Count == 0 ? Color.Gray : Color.Black;
     }
   }