Changeset 4011

Timestamp:

07/07/10 14:36:22 (14 years ago)

Author:

mkommend

Message:

• refactored ViewHost and various views to use fewer nested controls
• added UnitTests for ContentViews to ensure proper using of the ContentAttribute
• fixed some views which could not handle null as Content

(ticket #972)

Location:

trunk/sources

Files:

• HeuristicLab 3.3.sln (modified) (3 diffs)
• HeuristicLab.Data.Views/3.3/BoolValueView.cs (modified) (1 diff)
• HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLabMainFormWindowsFormsPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Tests (added)
• HeuristicLab.MainForm.WindowsForms/3.3/Tests/AuthoringTests.txt (added)
• HeuristicLab.MainForm.WindowsForms/3.3/Tests/ContentViewTests.cs (added)
• HeuristicLab.MainForm.WindowsForms/3.3/Tests/HeuristicLab.MainForm.WindowsForms-3.3.Tests.csproj (added)
• HeuristicLab.MainForm.WindowsForms/3.3/Tests/Properties (added)
• HeuristicLab.MainForm.WindowsForms/3.3/Tests/Properties/AssemblyInfo.cs (added)
• HeuristicLab.MainForm.WindowsForms/3.3/Tests/Test References (added)
• HeuristicLab.MainForm.WindowsForms/3.3/Tests/Test References/HeuristicLab.MainForm.WindowsForms-3.3.accessor (added)
• HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.Designer.cs (modified) (5 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs (modified) (5 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/ViewHostPanel.Designer.cs (deleted)
• HeuristicLab.MainForm.WindowsForms/3.3/ViewHostPanel.cs (deleted)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphView.cs (modified) (3 diffs)
• HeuristicLab.Optimization.Views/3.3/AlgorithmView.Designer.cs (modified) (6 diffs)
• HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/BatchRunView.Designer.cs (modified) (6 diffs)
• HeuristicLab.Optimization.Views/3.3/BatchRunView.cs (modified) (3 diffs)
• HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.Designer.cs (modified) (3 diffs)
• HeuristicLab.Optimization.Views/3.3/RunView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Parameters.Views/3.3/ValueLookupParameterView.Designer.cs (modified) (6 diffs)
• HeuristicLab.Parameters.Views/3.3/ValueLookupParameterView.cs (modified) (4 diffs)
• HeuristicLab.Parameters.Views/3.3/ValueParameterView.Designer.cs (modified) (5 diffs)
• HeuristicLab.Parameters.Views/3.3/ValueParameterView.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.3/EstimatedValuesView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.3/LineChartView.cs (modified) (1 diff)

trunk/sources/HeuristicLab 3.3.sln

@@ -6 +6 @@
     ConfigMerger.exe = ConfigMerger.exe
     ..\documentation\License\gpl-3.0.txt = ..\documentation\License\gpl-3.0.txt
+    HeuristicLab 3.31.vsmdi = HeuristicLab 3.31.vsmdi
     LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
     PreBuildEvent.cmd = PreBuildEvent.cmd
@@ -307 +308 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.VehicleRouting.Views-3.3", "HeuristicLab.Problems.VehicleRouting.Views\3.3\HeuristicLab.Problems.VehicleRouting.Views-3.3.csproj", "{D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.MainForm.WindowsForms-3.3.Tests", "HeuristicLab.MainForm.WindowsForms\3.3\Tests\HeuristicLab.MainForm.WindowsForms-3.3.Tests.csproj", "{9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}"
+EndProject
 Global
+  GlobalSection(TestCaseManagementSettings) = postSolution
+    CategoryFile = HeuristicLab 3.31.vsmdi
+  EndGlobalSection
   GlobalSection(SolutionConfigurationPlatforms) = preSolution
     Debug|Any CPU = Debug|Any CPU
@@ -2049 +2055 @@
     {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}.Silverlight2|x64.Build.0 = Release|x64
     {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}.Silverlight2|x86.ActiveCfg = Release|x64
+    {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Debug|x64.ActiveCfg = Debug|x64
+    {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Debug|x86.ActiveCfg = Debug|x86
+    {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Release|Any CPU.Build.0 = Release|Any CPU
+    {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Release|x64.ActiveCfg = Release|x64
+    {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Release|x64.Build.0 = Release|x64
+    {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Release|x86.ActiveCfg = Release|x86
+    {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Services|Any CPU.ActiveCfg = Release|Any CPU
+    {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Services|Any CPU.Build.0 = Release|Any CPU
+    {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Services|x64.ActiveCfg = Release|Any CPU
+    {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Services|x86.ActiveCfg = Release|Any CPU
+    {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Silverlight2|Any CPU.ActiveCfg = Release|Any CPU
+    {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Silverlight2|Any CPU.Build.0 = Release|Any CPU
+    {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Silverlight2|x64.ActiveCfg = Release|Any CPU
+    {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Silverlight2|x86.ActiveCfg = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

trunk/sources/HeuristicLab.Data.Views/3.3/BoolValueView.cs

@@ -78 +78 @@
 
     private void valueCheckBox_CheckedChanged(object sender, EventArgs e) {
-      if (!Content.ReadOnly) Content.Value = valueCheckBox.Checked;
+      if (Content != null && !Content.ReadOnly) Content.Value = valueCheckBox.Checked;
     }
   }

trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

@@ -135 +135 @@
     private void UpdateRowHeaders() {
       int firstDisplayedRowIndex = dataGridView.FirstDisplayedScrollingRowIndex;
-      if(firstDisplayedRowIndex == -1)
+      if (firstDisplayedRowIndex == -1)
         firstDisplayedRowIndex = 0;
       int lastDisplaydRowIndex = firstDisplayedRowIndex + dataGridView.DisplayedRowCount(true);
@@ -241 +241 @@
     }
     private void dataGridView_CellValueNeeded(object sender, DataGridViewCellValueEventArgs e) {
-      if (e.RowIndex < Content.Rows && e.ColumnIndex < Content.Columns) {
+      if (Content != null && e.RowIndex < Content.Rows && e.ColumnIndex < Content.Columns) {
         int rowIndex = virtualRowIndizes[e.RowIndex];
         e.Value = Content.GetValue(rowIndex, e.ColumnIndex);

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj

@@ -164 +164 @@
       <DependentUpon>ViewHost.cs</DependentUpon>
     </Compile>
-    <Compile Include="ViewHostPanel.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ViewHostPanel.Designer.cs">
-      <DependentUpon>ViewHostPanel.cs</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLabMainFormWindowsFormsPlugin.cs.frame

@@ -32 +32 @@
   [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.WinFormsUI", "2.3.1")]
-  public class HeuristicLabMainFormTestPlugin : PluginBase {
+  public class HeuristicLabMainFormPlugin : PluginBase {
   }
 }

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      this.viewPanel = new HeuristicLab.MainForm.WindowsForms.ViewHostPanel();
       this.messageLabel = new System.Windows.Forms.Label();
       this.viewsLabel = new System.Windows.Forms.Label();
@@ -52 +51 @@
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.SuspendLayout();
-      // 
-      // viewPanel
-      // 
-      this.viewPanel.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.viewPanel.Location = new System.Drawing.Point(0, 0);
-      this.viewPanel.Name = "viewPanel";
-      this.viewPanel.Size = new System.Drawing.Size(205, 184);
-      this.viewPanel.TabIndex = 1;
-      this.viewPanel.Resize += new System.EventHandler(this.viewPanel_Resize);
       // 
       // messageLabel
@@ -80 +68 @@
       this.viewsLabel.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Windows;
       this.viewsLabel.Location = new System.Drawing.Point(211, 0);
+      this.viewsLabel.Margin = new System.Windows.Forms.Padding(3);
       this.viewsLabel.Name = "viewsLabel";
       this.viewsLabel.Size = new System.Drawing.Size(16, 16);
@@ -100 +89 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.viewPanel);
       this.Controls.Add(this.viewsLabel);
       this.Controls.Add(this.messageLabel);
@@ -106 +94 @@
       this.Size = new System.Drawing.Size(227, 184);
       this.ResumeLayout(false);
-
     }
 
     #endregion
-
-    private ViewHostPanel viewPanel;
     private System.Windows.Forms.Label viewsLabel;
     private System.Windows.Forms.Label messageLabel;

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs

@@ -33 +33 @@
       InitializeComponent();
       cachedViews = new Dictionary<Type, IContentView>();
-      viewType = null;
       startDragAndDrop = false;
       viewContextMenuStrip.IgnoredViewTypes = new List<Type>() { typeof(ViewHost) };
+
+      viewType = null;
       activeView = null;
       Content = null;
-      OnContentChanged();
-    }
-
-    private bool viewShown;
+      messageLabel.Visible = false;
+      viewsLabel.Visible = false;
+    }
+
     private Dictionary<Type, IContentView> cachedViews;
     public IEnumerable<IContentView> Views {
@@ -57 +58 @@
             if (view != null)
               view.OnHidden(EventArgs.Empty);
+            if (ActiveViewControl != null)
+              ActiveViewControl.Visible = false;
           }
           activeView = value;
           if (activeView != null) {
-            ViewType = activeView.GetType();
+            viewType = activeView.GetType();
             RegisterActiveViewEvents();
             View view = activeView as View;
             if (view != null)
               view.OnShown(new ViewShownEventArgs(view, false));
+            if (ActiveViewControl != null) {
+              ActiveViewControl.Visible = true;
+              ActiveViewControl.BringToFront();
+            }
           }
-          ActiveViewChanged();
-        }
-      }
-    }
+          OnActiveViewChanged();
+        }
+      }
+    }
+
+    private Control ActiveViewControl {
+      get { return ActiveView as Control; }
+    }
+
     private Type viewType;
     public Type ViewType {
@@ -75 +87 @@
       set {
         if (viewType != value) {
-          if (value != null && !ViewCanShowContent(value, Content))
+          if (value != null && Content != null && !ViewCanShowContent(value, Content))
             throw new ArgumentException(string.Format("View \"{0}\" cannot display content \"{1}\".",
                                                       value, Content.GetType()));
@@ -96 +108 @@
     protected override void OnContentChanged() {
       viewContextMenuStrip.Item = Content;
-
-      if (Content != null) {
-        if (viewContextMenuStrip.Items.Count == 0) {
-          messageLabel.Visible = true;
-          viewsLabel.Visible = false;
-          viewPanel.Visible = false;
-        } else {
-          messageLabel.Visible = false;
-          viewsLabel.Visible = true;
-          viewPanel.Visible = true;
-        }
-
+      //remove cached views which cannot show the content
+      foreach (Type type in cachedViews.Keys.ToList()) {
+        if (!ViewCanShowContent(type, Content)) {
+          Control c = cachedViews[type] as Control;
+          if (c != null) {
+            this.Controls.Remove(c);
+            c.Dispose();
+          }
+          cachedViews.Remove(type);
+        }
+      }
+
+      //change ViewType if view of ViewType can not show content or is null
+      if (Content != null && !ViewCanShowContent(viewType, Content)) {
         Type defaultViewType = MainFormManager.GetDefaultViewType(Content.GetType());
-        if (ViewType == null || !ViewCanShowContent(viewType, Content)) {
-          cachedViews.Clear();
-          if (defaultViewType == null) {
-            if (viewContextMenuStrip.Items.Count > 0)  // create first available view if default view is not available
-              ViewType = (Type)viewContextMenuStrip.Items[0].Tag;
-          } else ViewType = defaultViewType;
-        } else {
-          foreach (Type type in cachedViews.Keys.ToList()) {
-            if (!ViewCanShowContent(type, Content)) {
-              Control c = cachedViews[type] as Control;
-              if (c != null)
-                c.Dispose();
-              cachedViews.Remove(type);
-            }
-          }
-        }
-        UpdateActiveMenuItem();
-        foreach (IContentView view in cachedViews.Values)
-          view.Content = this.Content;
+        if (defaultViewType != null)
+          ViewType = defaultViewType;
+        else if (viewContextMenuStrip.Items.Count > 0)  // create first available view if no default view is available
+          ViewType = (Type)viewContextMenuStrip.Items[0].Tag;
+        else
+          ViewType = null;
+      }
+
+      foreach (IContentView view in cachedViews.Values)
+        view.Content = this.Content;
+
+      if (Content != null && viewType != null)
+        ActiveView = cachedViews[viewType];
+      else
+        ActiveView = null;
+
+      if (Content != null && viewContextMenuStrip.Items.Count > 0) {
+        messageLabel.Visible = false;
+        viewsLabel.Visible = true;
+      } else if (Content != null) {
+        messageLabel.Visible = true;
+        viewsLabel.Visible = false;
       } else {
         messageLabel.Visible = false;
         viewsLabel.Visible = false;
-        viewPanel.Visible = false;
       }
     }
 
     private void OnViewTypeChanged() {
-      for (int i = viewPanel.Controls.Count - 1; i > 0; i--)
-        viewPanel.Controls[i].Dispose();
-      viewPanel.Controls.Clear();
-
-      if (viewType == null || Content == null)
-        return;
-      if (!ViewCanShowContent(viewType, Content))
-        throw new InvalidOperationException(string.Format("View \"{0}\" cannot display content \"{1}\".",
-                                                          viewType, Content.GetType()));
-      if (viewPanel.Height <= 10 || viewPanel.Width <= 10) {
-        viewShown = false;
-        return;
-      }
-
-      viewShown = true;
-      UpdateActiveMenuItem();
-      IContentView view;
-      if (cachedViews.ContainsKey(ViewType))
-        view = cachedViews[ViewType];
-      else {
-        view = MainFormManager.CreateView(viewType);
-        view.ReadOnly = this.ReadOnly;
-        view.Locked = this.Locked;
-        view.Content = Content;
-        cachedViews.Add(viewType, view);
-      }
-      this.ActiveView = view;
-      Control control = (Control)view;
-      control.Dock = DockStyle.Fill;
-      viewPanel.Controls.Add(control);
-      viewPanel.Visible = true;
-    }
-
-    private void viewPanel_Resize(object sender, EventArgs e) {
-      if (!viewShown)
-        this.OnViewTypeChanged();
+      if (viewType != null) {
+        if (!ViewCanShowContent(viewType, Content))
+          throw new InvalidOperationException(string.Format("View \"{0}\" cannot display content \"{1}\".",
+                                                            viewType, Content.GetType()));
+        IContentView view;
+        if (!cachedViews.ContainsKey(ViewType)) {
+          view = MainFormManager.CreateView(viewType);
+          view.ReadOnly = this.ReadOnly;
+          view.Locked = this.Locked;
+          view.Content = Content;
+          cachedViews.Add(viewType, view);
+          Control c = view as Control;
+          if (c != null)
+            this.Controls.Add(c);
+        }
+        UpdateActiveMenuItem();
+        ActiveView = cachedViews[viewType];
+      }
+    }
+
+    private void OnActiveViewChanged() {
+      this.SuspendRepaint();
+      if (activeView != null) {
+        UpdateActiveMenuItem();
+        this.ActiveViewControl.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right;
+        this.ActiveViewControl.Size = new System.Drawing.Size(this.Width - this.viewsLabel.Width - this.viewsLabel.Margin.Left - this.viewsLabel.Margin.Right, this.Height);
+        this.ActiveViewChanged();
+      }
+      this.ResumeRepaint(true);
+    }
+
+    protected override void OnSizeChanged(EventArgs e) {
+      //mkommend: solution to resizing issues. taken from http://support.microsoft.com/kb/953934
+      //not implemented with a panel to reduce the number of nested controls
+      if (this.Handle != null)
+        this.BeginInvoke((Action<EventArgs>)OnSizeChangedHelper, e);
+    }
+    private void OnSizeChangedHelper(EventArgs e) {
+      base.OnSizeChanged(e);
+      this.viewsLabel.Location = new System.Drawing.Point(this.Width - this.viewsLabel.Margin.Right - this.viewsLabel.Width, this.viewsLabel.Margin.Top);
     }
 
@@ -194 +214 @@
       }
     }
+
     #region forwarding of view events
     protected override void OnReadOnlyChanged() {

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphView.cs

@@ -42 +42 @@
     public OperatorGraphView() {
       InitializeComponent();
- 
+
       this.graphVisualizationInfoView.Controller.OnShowContextMenu += new EventHandler<EntityMenuEventArgs>(Controller_OnShowContextMenu);
       this.graphVisualizationInfoView.Controller.Model.Selection.OnNewSelection += new EventHandler(Controller_SelectionChanged);
@@ -58 +58 @@
 
     protected override void OnContentChanged() {
-      bool createdVisualizationInfo = false;
-      if (this.VisualizationInfo == null) {
-        this.VisualizationInfo = new OperatorGraphVisualizationInfo(this.Content);
-        createdVisualizationInfo = true;
-      }
-      this.graphVisualizationInfoView.Content = this.VisualizationInfo;
-      if (createdVisualizationInfo)
-        this.graphVisualizationInfoView.RelayoutGraph();
+      if (Content != null) {
+        bool createdVisualizationInfo = false;
+        if (this.VisualizationInfo == null) {
+          this.VisualizationInfo = new OperatorGraphVisualizationInfo(this.Content);
+          createdVisualizationInfo = true;
+        }
+        this.graphVisualizationInfoView.Content = this.VisualizationInfo;
+        if (createdVisualizationInfo)
+          this.graphVisualizationInfoView.RelayoutGraph();
+      } else {
+        this.graphVisualizationInfoView.Content = null;
+      }
     }
 
@@ -188 +192 @@
 
     private void initialOperatorToolStripMenuItem_Click(object sender, EventArgs e) {
-        IOperatorShapeInfo shapeInfo = this.shapeContextMenu.Tag as IOperatorShapeInfo;
-        if (this.VisualizationInfo.InitialShape == shapeInfo)
-          this.VisualizationInfo.InitialShape = null;
-        else
-          this.VisualizationInfo.InitialShape = shapeInfo;
+      IOperatorShapeInfo shapeInfo = this.shapeContextMenu.Tag as IOperatorShapeInfo;
+      if (this.VisualizationInfo.InitialShape == shapeInfo)
+        this.VisualizationInfo.InitialShape = null;
+      else
+        this.VisualizationInfo.InitialShape = shapeInfo;
     }
 
     private void breakPointToolStripMenuItem_Click(object sender, EventArgs e) {
-        IOperatorShapeInfo shapeInfo = this.shapeContextMenu.Tag as IOperatorShapeInfo;
-        if (shapeInfo != null) {
-          IOperator op = this.VisualizationInfo.GetOperatorForShapeInfo(shapeInfo);
-          op.Breakpoint = !op.Breakpoint;
-        }
+      IOperatorShapeInfo shapeInfo = this.shapeContextMenu.Tag as IOperatorShapeInfo;
+      if (shapeInfo != null) {
+        IOperator op = this.VisualizationInfo.GetOperatorForShapeInfo(shapeInfo);
+        op.Breakpoint = !op.Breakpoint;
+      }
     }
     #endregion

trunk/sources/HeuristicLab.Optimization.Views/3.3/AlgorithmView.Designer.cs

@@ -50 +50 @@
       this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
       this.problemTabPage = new System.Windows.Forms.TabPage();
-      this.problemPanel = new System.Windows.Forms.Panel();
       this.problemViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.openProblemButton = new System.Windows.Forms.Button();
@@ -69 +68 @@
       this.parametersTabPage.SuspendLayout();
       this.problemTabPage.SuspendLayout();
-      this.problemPanel.SuspendLayout();
       this.resultsTabPage.SuspendLayout();
       this.runsTabPage.SuspendLayout();
@@ -123 +121 @@
       // problemTabPage
       // 
-      this.problemTabPage.Controls.Add(this.problemPanel);
+      this.problemTabPage.Controls.Add(this.problemViewHost);
       this.problemTabPage.Controls.Add(this.openProblemButton);
       this.problemTabPage.Controls.Add(this.newProblemButton);
@@ -134 +132 @@
       this.problemTabPage.UseVisualStyleBackColor = true;
       // 
-      // problemPanel
-      // 
-      this.problemPanel.AllowDrop = true;
-      this.problemPanel.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.problemPanel.Controls.Add(this.problemViewHost);
-      this.problemPanel.Location = new System.Drawing.Point(6, 36);
-      this.problemPanel.Name = "problemPanel";
-      this.problemPanel.Size = new System.Drawing.Size(659, 332);
-      this.problemPanel.TabIndex = 3;
-      this.problemPanel.DragOver += new System.Windows.Forms.DragEventHandler(this.problemPanel_DragEnterOver);
-      this.problemPanel.DragDrop += new System.Windows.Forms.DragEventHandler(this.problemPanel_DragDrop);
-      this.problemPanel.DragEnter += new System.Windows.Forms.DragEventHandler(this.problemPanel_DragEnterOver);
-      // 
       // problemViewHost
       // 
+      this.problemViewHost.AllowDrop = true;
       this.problemViewHost.Content = null;
-      this.problemViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.problemViewHost.Location = new System.Drawing.Point(0, 0);
+      this.problemViewHost.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.problemViewHost.Location = new System.Drawing.Point(6, 36);
       this.problemViewHost.Name = "problemViewHost";
       this.problemViewHost.Size = new System.Drawing.Size(659, 332);
-      this.problemViewHost.TabIndex = 0;
+      this.problemViewHost.TabIndex = 3;
       this.problemViewHost.ViewType = null;
+      this.problemViewHost.DragOver += new System.Windows.Forms.DragEventHandler(this.problemViewHost_DragEnterOver);
+      this.problemViewHost.DragDrop += new System.Windows.Forms.DragEventHandler(this.problemViewHost_DragDrop);
+      this.problemViewHost.DragEnter += new System.Windows.Forms.DragEventHandler(this.problemViewHost_DragEnterOver);
       // 
       // openProblemButton
@@ -327 +316 @@
       this.parametersTabPage.ResumeLayout(false);
       this.problemTabPage.ResumeLayout(false);
-      this.problemPanel.ResumeLayout(false);
       this.resultsTabPage.ResumeLayout(false);
       this.runsTabPage.ResumeLayout(false);
@@ -355 +343 @@
     protected System.Windows.Forms.TabPage runsTabPage;
     protected RunCollectionView runsView;
-    protected System.Windows.Forms.Panel problemPanel;
-
   }
 }

trunk/sources/HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs

@@ -216 +216 @@
       Content.Prepare(false);
     }
-    protected virtual void problemPanel_DragEnterOver(object sender, DragEventArgs e) {
+    protected virtual void problemViewHost_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
       Type type = e.Data.GetData("Type") as Type;
@@ -227 +227 @@
       }
     }
-    protected virtual void problemPanel_DragDrop(object sender, DragEventArgs e) {
+    protected virtual void problemViewHost_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
         IProblem problem = e.Data.GetData("Value") as IProblem;

trunk/sources/HeuristicLab.Optimization.Views/3.3/BatchRunView.Designer.cs

@@ -48 +48 @@
       this.tabControl = new System.Windows.Forms.TabControl();
       this.algorithmTabPage = new System.Windows.Forms.TabPage();
-      this.algorithmPanel = new System.Windows.Forms.Panel();
       this.algorithmViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.openAlgorithmButton = new System.Windows.Forms.Button();
@@ -66 +65 @@
       this.tabControl.SuspendLayout();
       this.algorithmTabPage.SuspendLayout();
-      this.algorithmPanel.SuspendLayout();
       this.runsTabPage.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.repetitionsNumericUpDown)).BeginInit();
@@ -96 +94 @@
       // algorithmTabPage
       // 
-      this.algorithmTabPage.Controls.Add(this.algorithmPanel);
+      this.algorithmTabPage.Controls.Add(this.algorithmViewHost);
       this.algorithmTabPage.Controls.Add(this.openAlgorithmButton);
       this.algorithmTabPage.Controls.Add(this.newAlgorithmButton);
@@ -107 +105 @@
       this.algorithmTabPage.UseVisualStyleBackColor = true;
       // 
-      // algorithmPanel
-      // 
-      this.algorithmPanel.AllowDrop = true;
-      this.algorithmPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+      // algorithmViewHost
+      // 
+      this.algorithmViewHost.Content = null;
+      this.algorithmViewHost.AllowDrop = true;
+      this.algorithmViewHost.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.algorithmPanel.Controls.Add(this.algorithmViewHost);
-      this.algorithmPanel.Location = new System.Drawing.Point(6, 36);
-      this.algorithmPanel.Name = "algorithmPanel";
-      this.algorithmPanel.Size = new System.Drawing.Size(659, 306);
-      this.algorithmPanel.TabIndex = 3;
-      this.algorithmPanel.DragOver += new System.Windows.Forms.DragEventHandler(this.algorithmPanel_DragEnterOver);
-      this.algorithmPanel.DragDrop += new System.Windows.Forms.DragEventHandler(this.algorithmPanel_DragDrop);
-      this.algorithmPanel.DragEnter += new System.Windows.Forms.DragEventHandler(this.algorithmPanel_DragEnterOver);
-      // 
-      // algorithmViewHost
-      // 
-      this.algorithmViewHost.Content = null;
-      this.algorithmViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.algorithmViewHost.Location = new System.Drawing.Point(0, 0);
+      this.algorithmViewHost.Location = new System.Drawing.Point(6, 36);
       this.algorithmViewHost.Name = "algorithmViewHost";
       this.algorithmViewHost.Size = new System.Drawing.Size(659, 306);
-      this.algorithmViewHost.TabIndex = 0;
+      this.algorithmViewHost.TabIndex = 3;
       this.algorithmViewHost.ViewType = null;
+      this.algorithmViewHost.DragOver += new System.Windows.Forms.DragEventHandler(this.algorithmViewHost_DragEnterOver);
+      this.algorithmViewHost.DragDrop += new System.Windows.Forms.DragEventHandler(this.algorithmViewHost_DragDrop);
+      this.algorithmViewHost.DragEnter += new System.Windows.Forms.DragEventHandler(this.algorithmViewHost_DragEnterOver);
       // 
       // openAlgorithmButton
@@ -317 +306 @@
       this.tabControl.ResumeLayout(false);
       this.algorithmTabPage.ResumeLayout(false);
-      this.algorithmPanel.ResumeLayout(false);
       this.runsTabPage.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.repetitionsNumericUpDown)).EndInit();
@@ -342 +330 @@
     private RunCollectionView runsView;
     private System.Windows.Forms.Button pauseButton;
-    private System.Windows.Forms.Panel algorithmPanel;
-
   }
 }

trunk/sources/HeuristicLab.Optimization.Views/3.3/BatchRunView.cs

@@ -140 +140 @@
     }
     private void repetitionsNumericUpDown_ValueChanged(object sender, EventArgs e) {
-      Content.Repetitions = (int)repetitionsNumericUpDown.Value;
+      if (Content != null)
+        Content.Repetitions = (int)repetitionsNumericUpDown.Value;
     }
     private void newAlgorithmButton_Click(object sender, EventArgs e) {
@@ -197 +198 @@
       Content.Prepare(false);
     }
-    private void algorithmPanel_DragEnterOver(object sender, DragEventArgs e) {
+    private void algorithmViewHost_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
       if (ReadOnly)
@@ -210 +211 @@
       }
     }
-    private void algorithmPanel_DragDrop(object sender, DragEventArgs e) {
+    private void algorithmViewHost_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
         IAlgorithm algorithm = e.Data.GetData("Value") as IAlgorithm;

trunk/sources/HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.Designer.cs

@@ -58 +58 @@
       this.resultsTabPage.SuspendLayout();
       this.runsTabPage.SuspendLayout();
-      this.problemPanel.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.engineTabPage.SuspendLayout();
@@ -148 +147 @@
       // problemPanel
       // 
-      this.problemPanel.Size = new System.Drawing.Size(693, 399);
+      this.problemViewHost.Size = new System.Drawing.Size(693, 399);
       // 
       // nameTextBox
@@ -276 +275 @@
       this.resultsTabPage.ResumeLayout(false);
       this.runsTabPage.ResumeLayout(false);
-      this.problemPanel.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.engineTabPage.ResumeLayout(false);

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunView.cs

@@ -103 +103 @@
     }
 
+    private string selectedName;
     private void FillListView() {
-      string selectedName = null;
       if (listView.SelectedItems.Count == 1) selectedName = listView.SelectedItems[0].SubItems[0].Text;
 
@@ -117 +117 @@
           for (int i = 0; i < listView.Columns.Count; i++)
             listView.Columns[i].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+          selectedName = null;
         }
       }

trunk/sources/HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.Designer.cs

@@ -54 +54 @@
       this.resultsTabPage.SuspendLayout();
       this.runsTabPage.SuspendLayout();
-      this.problemPanel.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.globalScopeTabPage.SuspendLayout();
@@ -152 +151 @@
       this.resultsTabPage.ResumeLayout(false);
       this.runsTabPage.ResumeLayout(false);
-      this.problemPanel.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.globalScopeTabPage.ResumeLayout(false);

trunk/sources/HeuristicLab.Parameters.Views/3.3/ValueLookupParameterView.Designer.cs

@@ -47 +47 @@
     private void InitializeComponent() {
       this.valueGroupBox = new System.Windows.Forms.GroupBox();
-      this.valuePanel = new System.Windows.Forms.Panel();
-      this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.valueViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.clearValueButton = new System.Windows.Forms.Button();
       this.setValueButton = new System.Windows.Forms.Button();
@@ -55 +54 @@
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.valueGroupBox.SuspendLayout();
-      this.valuePanel.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -92 +90 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.valueGroupBox.Controls.Add(this.valuePanel);
+      this.valueGroupBox.Controls.Add(this.valueViewHost);
       this.valueGroupBox.Controls.Add(this.clearValueButton);
       this.valueGroupBox.Controls.Add(this.setValueButton);
@@ -102 +100 @@
       this.valueGroupBox.Text = "Value";
       // 
-      // valuePanel
+      // viewHost
       // 
-      this.valuePanel.AllowDrop = true;
-      this.valuePanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+      this.valueViewHost.AllowDrop = true;
+      this.valueViewHost.Content = null;
+      this.valueViewHost.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.valuePanel.Controls.Add(this.viewHost);
-      this.valuePanel.Location = new System.Drawing.Point(6, 49);
-      this.valuePanel.Name = "valuePanel";
-      this.valuePanel.Size = new System.Drawing.Size(374, 156);
-      this.valuePanel.TabIndex = 0;
-      this.valuePanel.DragOver += new System.Windows.Forms.DragEventHandler(this.valuePanel_DragEnterOver);
-      this.valuePanel.DragDrop += new System.Windows.Forms.DragEventHandler(this.valuePanel_DragDrop);
-      this.valuePanel.DragEnter += new System.Windows.Forms.DragEventHandler(this.valuePanel_DragEnterOver);
-      // 
-      // viewHost
-      // 
-      this.viewHost.Content = null;
-      this.viewHost.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.viewHost.Location = new System.Drawing.Point(0, 0);
-      this.viewHost.Name = "viewHost";
-      this.viewHost.Size = new System.Drawing.Size(374, 156);
-      this.viewHost.TabIndex = 0;
-      this.viewHost.ViewType = null;
+      this.valueViewHost.Location = new System.Drawing.Point(6, 49);
+      this.valueViewHost.Name = "valueViewHost";
+      this.valueViewHost.Size = new System.Drawing.Size(374, 156);
+      this.valueViewHost.TabIndex = 0;
+      this.valueViewHost.ViewType = null;
+      this.valueViewHost.DragOver += new System.Windows.Forms.DragEventHandler(this.valueViewHostPanel_DragEnterOver);
+      this.valueViewHost.DragDrop += new System.Windows.Forms.DragEventHandler(this.valueViewHost_DragDrop);
+      this.valueViewHost.DragEnter += new System.Windows.Forms.DragEventHandler(this.valueViewHostPanel_DragEnterOver);
       // 
       // clearValueButton
@@ -189 +178 @@
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.valueGroupBox.ResumeLayout(false);
-      this.valuePanel.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -198 +186 @@
 
     protected System.Windows.Forms.GroupBox valueGroupBox;
-    protected System.Windows.Forms.Panel valuePanel;
-    protected HeuristicLab.MainForm.WindowsForms.ViewHost viewHost;
+    protected HeuristicLab.MainForm.WindowsForms.ViewHost valueViewHost;
     protected System.Windows.Forms.Button setValueButton;
     protected System.Windows.Forms.Button clearValueButton;

trunk/sources/HeuristicLab.Parameters.Views/3.3/ValueLookupParameterView.cs

@@ -79 +79 @@
       if (Content == null) {
         actualNameTextBox.Text = "-";
-        viewHost.Content = null;
+        valueViewHost.Content = null;
       } else {
         actualNameTextBox.Text = Content.ActualName;
-        viewHost.ViewType = null;
-        viewHost.Content = Content.Value;
+        valueViewHost.ViewType = null;
+        valueViewHost.Content = Content.Value;
       }
     }
@@ -107 +107 @@
       else {
         clearValueButton.Enabled = Content.Value != null && !ReadOnly;
-        viewHost.ViewType = null;
-        viewHost.Content = Content.Value;
+        valueViewHost.ViewType = null;
+        valueViewHost.Content = Content.Value;
       }
     }
@@ -133 +133 @@
       Content.Value = null;
     }
-    protected virtual void valuePanel_DragEnterOver(object sender, DragEventArgs e) {
+    protected virtual void valueViewHostPanel_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
       Type type = e.Data.GetData("Type") as Type;
@@ -144 +144 @@
       }
     }
-    protected virtual void valuePanel_DragDrop(object sender, DragEventArgs e) {
+    protected virtual void valueViewHost_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
         T value = e.Data.GetData("Value") as T;

trunk/sources/HeuristicLab.Parameters.Views/3.3/ValueParameterView.Designer.cs

@@ -47 +47 @@
     private void InitializeComponent() {
       this.valueGroupBox = new System.Windows.Forms.GroupBox();
-      this.valuePanel = new System.Windows.Forms.Panel();
-      this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.valueViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.clearValueButton = new System.Windows.Forms.Button();
       this.setValueButton = new System.Windows.Forms.Button();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.valueGroupBox.SuspendLayout();
-      this.valuePanel.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -78 +76 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.valueGroupBox.Controls.Add(this.valuePanel);
+      this.valueGroupBox.Controls.Add(this.valueViewHost);
       this.valueGroupBox.Controls.Add(this.clearValueButton);
       this.valueGroupBox.Controls.Add(this.setValueButton);
@@ -88 +86 @@
       this.valueGroupBox.Text = "Value";
       // 
-      // valuePanel
+      // viewHost
       // 
-      this.valuePanel.AllowDrop = true;
-      this.valuePanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+      this.valueViewHost.AllowDrop = true;
+      this.valueViewHost.Content = null;
+      this.valueViewHost.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.valuePanel.Controls.Add(this.viewHost);
-      this.valuePanel.Location = new System.Drawing.Point(6, 49);
-      this.valuePanel.Name = "valuePanel";
-      this.valuePanel.Size = new System.Drawing.Size(374, 182);
-      this.valuePanel.TabIndex = 0;
-      this.valuePanel.DragOver += new System.Windows.Forms.DragEventHandler(this.valuePanel_DragEnterOver);
-      this.valuePanel.DragDrop += new System.Windows.Forms.DragEventHandler(this.valuePanel_DragDrop);
-      this.valuePanel.DragEnter += new System.Windows.Forms.DragEventHandler(this.valuePanel_DragEnterOver);
-      // 
-      // viewHost
-      // 
-      this.viewHost.Content = null;
-      this.viewHost.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.viewHost.Location = new System.Drawing.Point(0, 0);
-      this.viewHost.Name = "viewHost";
-      this.viewHost.Size = new System.Drawing.Size(374, 182);
-      this.viewHost.TabIndex = 0;
-      this.viewHost.ViewType = null;
+      this.valueViewHost.Location = new System.Drawing.Point(6, 49);
+      this.valueViewHost.Name = "viewHost";
+      this.valueViewHost.Size = new System.Drawing.Size(374, 182);
+      this.valueViewHost.TabIndex = 0;
+      this.valueViewHost.ViewType = null;
+      this.valueViewHost.DragOver += new System.Windows.Forms.DragEventHandler(this.valueViewHost_DragEnterOver);
+      this.valueViewHost.DragDrop += new System.Windows.Forms.DragEventHandler(this.valueViewHost_DragDrop);
+      this.valueViewHost.DragEnter += new System.Windows.Forms.DragEventHandler(this.valueViewHost_DragEnterOver);
       // 
       // clearValueButton
@@ -152 +141 @@
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.valueGroupBox.ResumeLayout(false);
-      this.valuePanel.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -161 +149 @@
 
     protected System.Windows.Forms.GroupBox valueGroupBox;
-    protected System.Windows.Forms.Panel valuePanel;
-    protected HeuristicLab.MainForm.WindowsForms.ViewHost viewHost;
+    protected HeuristicLab.MainForm.WindowsForms.ViewHost valueViewHost;
     protected System.Windows.Forms.Button setValueButton;
     protected System.Windows.Forms.Button clearValueButton;

trunk/sources/HeuristicLab.Parameters.Views/3.3/ValueParameterView.cs

@@ -78 +78 @@
       if (Content == null) {
         clearValueButton.Visible = true;
-        viewHost.Content = null;
+        valueViewHost.Content = null;
       } else {
         clearValueButton.Visible = !(Content is ValueParameter<T>);
-        viewHost.ViewType = null;
-        viewHost.Content = Content.Value;
+        valueViewHost.ViewType = null;
+        valueViewHost.Content = Content.Value;
       }
     }
@@ -98 +98 @@
       else {
         clearValueButton.Enabled = Content.Value != null && !ReadOnly;
-        viewHost.ViewType = null;
-        viewHost.Content = Content.Value;
+        valueViewHost.ViewType = null;
+        valueViewHost.Content = Content.Value;
       }
     }
@@ -121 +121 @@
       Content.Value = null;
     }
-    protected virtual void valuePanel_DragEnterOver(object sender, DragEventArgs e) {
+    protected virtual void valueViewHost_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
       Type type = e.Data.GetData("Type") as Type;
@@ -132 +132 @@
       }
     }
-    protected virtual void valuePanel_DragDrop(object sender, DragEventArgs e) {
+    protected virtual void valueViewHost_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
         T value = e.Data.GetData("Value") as T;

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

@@ -89 +89 @@
       if (InvokeRequired) Invoke((Action)UpdateEstimatedValues);
       else {
-        double[,] values =
-        MatrixExtensions<double>.Create(
-          Content.ProblemData.Dataset.GetVariableValues(Content.ProblemData.TargetVariable.Value),
-          Content.EstimatedValues.ToArray());
-        var content = new DoubleMatrix(values);
-        content.ColumnNames = new string[] { "Original", "Estimated" };
-        matrixView.Content = content;
+        DoubleMatrix matrix = null;
+        if (Content != null) {
+          double[,] values =
+          MatrixExtensions<double>.Create(
+            Content.ProblemData.Dataset.GetVariableValues(Content.ProblemData.TargetVariable.Value),
+            Content.EstimatedValues.ToArray());
+          matrix = new DoubleMatrix(values);
+          matrix.ColumnNames = new string[] { "Original", "Estimated" };
+        }
+        matrixView.Content = matrix;
       }
     }

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

@@ -61 +61 @@
     private void RedrawChart() {
       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.GetVariableValues(Content.ProblemData.TargetVariable.Value));
-      this.UpdateStripLines();
+      if (Content != null) {
+        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.GetVariableValues(Content.ProblemData.TargetVariable.Value));
+        this.UpdateStripLines();
 
-      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;
-      UpdateCursorInterval();
+        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;
+        UpdateCursorInterval();
+      }
     }