Changeset 13722 for branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views

Timestamp:

03/23/16 22:51:27 (8 years ago)

Author:

abeham

Message:

#2457:

• Renamed remaining files from ExpertSystem to KnowledgeCenter
• Added ability to scatter plot to display a regression line
• Allowed to execute multiple instances at once and displaying either only final result or tracking result
• Split runs in seeded runs and instance runs

Location:

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views

Files:

• KnowledgeBaseView.Designer.cs (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/KnowledgeBaseView.Designer.cs)
• KnowledgeBaseView.cs (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/KnowledgeBaseView.cs) (1 diff)
• KnowledgeBaseView.resx (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/KnowledgeBaseView.resx)
• KnowledgeCenterAllinOneView.Designer.cs (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystemView.Designer.cs) (1 diff)
• KnowledgeCenterAllinOneView.cs (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystemView.cs) (9 diffs)
• KnowledgeCenterAllinOneView.resx (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystemView.resx)
• KnowledgeCenterViewBase.Designer.cs (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views/ExpertSystemViewBase.Designer.cs) (1 diff)
• KnowledgeCenterViewBase.cs (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views/ExpertSystemViewBase.cs) (6 diffs)
• KnowledgeCenterViewBase.resx (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views/ExpertSystemViewBase.resx)
• SolverView.Designer.cs (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/SolverView.Designer.cs) (12 diffs)
• SolverView.cs (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/SolverView.cs) (5 diffs)
• SolverView.resx (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/SolverView.resx)
• UnderstandingProblemInstanceView.Designer.cs (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/UnderstandingProblemInstanceView.Designer.cs)
• UnderstandingProblemInstanceView.cs (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/UnderstandingProblemInstanceView.cs) (1 diff)
• UnderstandingProblemInstanceView.resx (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/UnderstandingProblemInstanceView.resx)
• UnderstandingSolutionsView.Designer.cs (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/UnderstandingSolutionsView.Designer.cs) (5 diffs)
• UnderstandingSolutionsView.cs (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/UnderstandingSolutionsView.cs) (3 diffs)
• UnderstandingSolutionsView.resx (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/UnderstandingSolutionsView.resx)

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views/KnowledgeBaseView.cs

@@ -25 +25 @@
 namespace HeuristicLab.OptimizationExpertSystem {
   [View("Knowledge Base View")]
-  [Content(typeof(ExpertSystem), IsDefaultView = false)]
-  public partial class KnowledgeBaseView : ExpertSystemViewBase {
+  [Content(typeof(KnowledgeCenter), IsDefaultView = false)]
+  public partial class KnowledgeBaseView : KnowledgeCenterViewBase {
     public KnowledgeBaseView() {
       InitializeComponent();

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views/KnowledgeCenterAllinOneView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.OptimizationExpertSystem {
-  partial class ExpertSystemView {
+  partial class KnowledgeCenterAllinOneView {
     /// <summary> 
     /// Required designer variable.

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views/KnowledgeCenterAllinOneView.cs

@@ -30 +30 @@
 using HeuristicLab.Data.Views;
 using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.Optimization;
 using HeuristicLab.Optimization.Views;
@@ -43 +44 @@
 namespace HeuristicLab.OptimizationExpertSystem {
   [View("Knowledge Center (all-in-one view)")]
-  [Content(typeof(ExpertSystem), IsDefaultView = true)]
-  public partial class ExpertSystemView : ItemView {
+  [Content(typeof(KnowledgeCenter), IsDefaultView = true)]
+  public partial class KnowledgeCenterAllinOneView : AsynchronousContentView {
     private EnumValueView<SeedingStrategyTypes> seedingStrategyView;
     private CheckedItemListView<IScope> seedingSolutionsView;
@@ -50 +51 @@
     private bool okbDownloadInProgress;
 
-    public new ExpertSystem Content {
-      get { return (ExpertSystem)base.Content; }
+    public new KnowledgeCenter Content {
+      get { return (KnowledgeCenter)base.Content; }
       set { base.Content = value; }
     }
 
-    public ExpertSystemView() {
+    public KnowledgeCenterAllinOneView() {
       InitializeComponent();
       // brings progress panel to front (it is not visible by default, but obstructs other elements in designer)
@@ -77 +78 @@
     #region Event Registration
     protected override void DeregisterContentEvents() {
-      Content.PropertyChanged -= ContentOnPropertyChanged;
       Content.SuggestedInstances.CollectionReset -= SuggestedInstancesOnChanged;
       Content.SuggestedInstances.ItemsAdded -= SuggestedInstancesOnChanged;
@@ -94 +94 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      Content.PropertyChanged += ContentOnPropertyChanged;
       Content.SuggestedInstances.CollectionReset += SuggestedInstancesOnChanged;
       Content.SuggestedInstances.ItemsAdded += SuggestedInstancesOnChanged;
@@ -145 +144 @@
           maxEvaluationsTextBox.Text = Content.MaximumEvaluations.ToString();
           problemViewHost.Content = Content.Problem;
-          runsView.Content = Content.Runs;
+          runsView.Content = Content.InstanceRuns;
           kbViewHost.ViewType = typeof(RunCollectionRLDView);
           kbViewHost.Content = Content.KnowledgeBase;
           problemInstancesView.Content = Content.ProblemInstances;
-          solverResultsView.Content = Content.CurrentResult;
+          solverResultsView.Content = null;
           seedingStrategyView.Content = Content.SeedingStrategy;
           seedingSolutionsView.Content = Content.SolutionSeedingPool;
@@ -181 +180 @@
     }
 
-    private void ContentOnPropertyChanged(object sender, PropertyChangedEventArgs e) {
-      if (InvokeRequired) {
-        Invoke((Action<object, PropertyChangedEventArgs>)ContentOnPropertyChanged, sender, e);
-        return;
-      }
-      SuppressEvents = true;
-      try {
-        switch (e.PropertyName) {
-          case "KnowledgeBase": kbViewHost.Content = Content.KnowledgeBase; break;
-          case "MaximumEvaluations": maxEvaluationsTextBox.Text = Content.MaximumEvaluations.ToString(); break;
-          case "Problem":
-            DeregisterProblemEvents(problemViewHost.Content as OKBProblem);
-            problemViewHost.Content = Content.Problem;
-            RegisterProblemEvents(Content.Problem);
-            UpdateNamesComboboxes();
-            break;
-          case "ProblemInstances": problemInstancesView.Content = Content.ProblemInstances; break;
-          case "CurrentResult": solverResultsView.Content = Content.CurrentResult; break;
-        }
-      } finally { SuppressEvents = false; }
-      SetEnabledStateOfControls();
-    }
-
     private void SuggestedInstancesOnChanged(object sender, EventArgs e) {
       UpdateSuggestedInstancesCombobox();
@@ -230 +206 @@
         //errorProvider.SetError(maxEvaluationsTextBox, "Please enter a valid integer number.");
       } else {
-        Content.MaximumEvaluations = value;
+        Content.MaximumEvaluations.Value = value;
         e.Cancel = false;
         //errorProvider.SetError(maxEvaluationsTextBox, null);
@@ -264 +240 @@
     }
 
-    private void AlgorithmStartButtonOnClick(object sender, EventArgs e) {
-      if (suggestedInstancesComboBox.SelectedIndex >= 0)
-        Content.StartAlgorithmAsync(suggestedInstancesComboBox.SelectedIndex);
+    private async void AlgorithmStartButtonOnClick(object sender, EventArgs e) {
+      if (suggestedInstancesComboBox.SelectedIndex >= 0) {
+        solverResultsView.Content = await Content.StartAlgorithmAsync(suggestedInstancesComboBox.SelectedIndex);
+      }
     }
 

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views/KnowledgeCenterViewBase.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.OptimizationExpertSystem {
-  partial class ExpertSystemViewBase {
+  partial class KnowledgeCenterViewBase {
     /// <summary> 
     /// Required designer variable.

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views/KnowledgeCenterViewBase.cs

@@ -21 +21 @@
 
 using HeuristicLab.Common;
-using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
+using HeuristicLab.Optimization;
 using HeuristicLab.OptimizationExpertSystem.Common;
 using System;
-using System.ComponentModel;
 
 namespace HeuristicLab.OptimizationExpertSystem {
   [View("Expert-System View")]
-  public partial class ExpertSystemViewBase : ItemView {
-    public OptimizationExpertSystem MainForm {
-      get { return (OptimizationExpertSystem)HeuristicLab.MainForm.MainFormManager.MainForm; }
+  public partial class KnowledgeCenterViewBase : AsynchronousContentView {
+    public OptimizationKnowledgeCenter MainForm {
+      get { return (OptimizationKnowledgeCenter)HeuristicLab.MainForm.MainFormManager.MainForm; }
     }
 
-    public new ExpertSystem Content {
-      get { return (ExpertSystem)base.Content; }
+    public new KnowledgeCenter Content {
+      get { return (KnowledgeCenter)base.Content; }
       set { base.Content = value; }
     }
 
-    protected ExpertSystemViewBase() {
+    protected KnowledgeCenterViewBase() {
       InitializeComponent();
     }
@@ -46 +46 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      Content.PropertyChanged += ContentOnPropertyChanged;
       Content.DownloadStarted += ContentOnDownloadStarted;
+      Content.AlgorithmInstanceStarted += ContentOnAlgorithmInstanceStarted;
       RegisterContentProblemEvents();
       RegisterContentProblemInstancesEvents();
@@ -88 +88 @@
     protected override void DeregisterContentEvents() {
       base.DeregisterContentEvents();
-      Content.PropertyChanged -= ContentOnPropertyChanged;
       Content.DownloadStarted -= ContentOnDownloadStarted;
+      Content.AlgorithmInstanceStarted -= ContentOnAlgorithmInstanceStarted;
       DeregisterContentProblemEvents();
       DeregisterContentProblemInstancesEvents();
@@ -129 +129 @@
     #endregion
 
-    private void ContentOnPropertyChanged(object sender, PropertyChangedEventArgs e) {
-      if (InvokeRequired) Invoke((Action<string>)OnPropertyChanged, e.PropertyName);
-      else {
-        switch (e.PropertyName) {
-          case "Problem": RegisterContentProblemEvents(); break;
-          case "ProblemInstances": RegisterContentProblemInstancesEvents(); break;
-          case "SolutionSeedingPool": RegisterContentSolutionSeedingPoolEvents(); break;
-          case "SuggestedInstances": RegisterContentSuggestedInstancesEvents(); break;
-        }
-        OnPropertyChanged(e.PropertyName);
-      }
-    }
-
     protected virtual void OnDownloadStarted(IProgress progress) { }
     protected virtual void OnDownloadEnded() { }
+    protected virtual void OnAlgorithmInstanceStarted(IAlgorithm algorithm) { }
     protected virtual void OnPropertyChanged(string propertyName) { }
     protected virtual void OnProblemChanged() { }
@@ -150 +138 @@
     protected virtual void OnSolutionSeedingPoolChanged() { }
     protected virtual void OnSuggestedInstancesChanged() { }
+    protected virtual void OnKnowledgeBaseChanged() { }
 
     #region Content Event Handlers
@@ -157 +146 @@
       e.Value.ProgressStateChanged += ProgressOnStateChanged;
       OnDownloadStarted(e.Value);
+    }
+
+    private void ContentOnAlgorithmInstanceStarted(object sender, EventArgs<IAlgorithm> e) {
+      if (InvokeRequired) { Invoke((Action<object, EventArgs<IAlgorithm>>)ContentOnAlgorithmInstanceStarted, sender, e); return; }
+      OnAlgorithmInstanceStarted(e.Value);
     }
 

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views/SolverView.Designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
+      WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin();
+      WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin();
+      WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
+      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient1 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+      WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin();
+      WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient();
+      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient2 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+      WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
+      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient3 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+      WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient();
+      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient4 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient5 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+      WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
+      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient6 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient7 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
       this.seedingStrategyPanel = new System.Windows.Forms.Panel();
       this.solverTabControl = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl();
       this.resultsTabPage = new System.Windows.Forms.TabPage();
-      this.solverResultsView = new HeuristicLab.Optimization.Views.ResultCollectionView();
+      this.showOnlyFinalResultCheckBox = new System.Windows.Forms.CheckBox();
+      this.resultsDockPanel = new WeifenLuo.WinFormsUI.Docking.DockPanel();
+      this.runsTabPage = new System.Windows.Forms.TabPage();
+      this.runsView = new HeuristicLab.Optimization.Views.RunCollectionView();
       this.solutionSeedingTabPage = new System.Windows.Forms.TabPage();
       this.parametersTabPage = new System.Windows.Forms.TabPage();
@@ -58 +76 @@
       this.evaluationsLimitabel = new System.Windows.Forms.Label();
       this.algorithmSuggestionLabel = new System.Windows.Forms.Label();
-      this.maxEvaluationsTextBox = new System.Windows.Forms.TextBox();
       this.suggestedInstancesComboBox = new System.Windows.Forms.ComboBox();
       this.algorithmCloneButton = new System.Windows.Forms.Button();
-      this.runsTabPage = new System.Windows.Forms.TabPage();
-      this.runsView = new HeuristicLab.Optimization.Views.RunCollectionView();
+      this.maxEvaluationsView = new HeuristicLab.Data.Views.StringConvertibleValueView();
+      this.seededRunsTabPage = new System.Windows.Forms.TabPage();
+      this.seededRunsView = new HeuristicLab.Optimization.Views.RunCollectionView();
       this.solverTabControl.SuspendLayout();
       this.resultsTabPage.SuspendLayout();
+      this.runsTabPage.SuspendLayout();
       this.parametersTabPage.SuspendLayout();
       this.operatorGraphTabPage.SuspendLayout();
-      this.runsTabPage.SuspendLayout();
+      this.seededRunsTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -87 +106 @@
       this.solverTabControl.Controls.Add(this.resultsTabPage);
       this.solverTabControl.Controls.Add(this.runsTabPage);
+      this.solverTabControl.Controls.Add(this.seededRunsTabPage);
       this.solverTabControl.Controls.Add(this.solutionSeedingTabPage);
       this.solverTabControl.Controls.Add(this.parametersTabPage);
@@ -98 +118 @@
       // resultsTabPage
       // 
-      this.resultsTabPage.Controls.Add(this.solverResultsView);
+      this.resultsTabPage.Controls.Add(this.showOnlyFinalResultCheckBox);
+      this.resultsTabPage.Controls.Add(this.resultsDockPanel);
       this.resultsTabPage.Location = new System.Drawing.Point(4, 22);
       this.resultsTabPage.Name = "resultsTabPage";
@@ -107 +128 @@
       this.resultsTabPage.UseVisualStyleBackColor = true;
       // 
-      // solverResultsView
-      // 
-      this.solverResultsView.Caption = "ResultCollection View";
-      this.solverResultsView.Content = null;
-      this.solverResultsView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.solverResultsView.Location = new System.Drawing.Point(3, 3);
-      this.solverResultsView.Name = "solverResultsView";
-      this.solverResultsView.ReadOnly = true;
-      this.solverResultsView.ShowDetails = true;
-      this.solverResultsView.Size = new System.Drawing.Size(835, 448);
-      this.solverResultsView.TabIndex = 1;
+      // showOnlyFinalResultCheckBox
+      // 
+      this.showOnlyFinalResultCheckBox.AutoSize = true;
+      this.showOnlyFinalResultCheckBox.Location = new System.Drawing.Point(6, 6);
+      this.showOnlyFinalResultCheckBox.Name = "showOnlyFinalResultCheckBox";
+      this.showOnlyFinalResultCheckBox.Size = new System.Drawing.Size(158, 17);
+      this.showOnlyFinalResultCheckBox.TabIndex = 1;
+      this.showOnlyFinalResultCheckBox.Text = "show only final result (faster)";
+      this.showOnlyFinalResultCheckBox.UseVisualStyleBackColor = true;
+      // 
+      // resultsDockPanel
+      // 
+      this.resultsDockPanel.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.resultsDockPanel.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingWindow;
+      this.resultsDockPanel.Location = new System.Drawing.Point(3, 29);
+      this.resultsDockPanel.Name = "resultsDockPanel";
+      this.resultsDockPanel.Size = new System.Drawing.Size(835, 422);
+      dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight;
+      dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight;
+      autoHideStripSkin1.DockStripGradient = dockPanelGradient1;
+      tabGradient1.EndColor = System.Drawing.SystemColors.Control;
+      tabGradient1.StartColor = System.Drawing.SystemColors.Control;
+      tabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark;
+      autoHideStripSkin1.TabGradient = tabGradient1;
+      autoHideStripSkin1.TextFont = new System.Drawing.Font("Segoe UI", 9F);
+      dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1;
+      tabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight;
+      tabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight;
+      tabGradient2.TextColor = System.Drawing.SystemColors.ControlText;
+      dockPaneStripGradient1.ActiveTabGradient = tabGradient2;
+      dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control;
+      dockPanelGradient2.StartColor = System.Drawing.SystemColors.Control;
+      dockPaneStripGradient1.DockStripGradient = dockPanelGradient2;
+      tabGradient3.EndColor = System.Drawing.SystemColors.ControlLight;
+      tabGradient3.StartColor = System.Drawing.SystemColors.ControlLight;
+      tabGradient3.TextColor = System.Drawing.SystemColors.ControlText;
+      dockPaneStripGradient1.InactiveTabGradient = tabGradient3;
+      dockPaneStripSkin1.DocumentGradient = dockPaneStripGradient1;
+      dockPaneStripSkin1.TextFont = new System.Drawing.Font("Segoe UI", 9F);
+      tabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption;
+      tabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
+      tabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption;
+      tabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText;
+      dockPaneStripToolWindowGradient1.ActiveCaptionGradient = tabGradient4;
+      tabGradient5.EndColor = System.Drawing.SystemColors.Control;
+      tabGradient5.StartColor = System.Drawing.SystemColors.Control;
+      tabGradient5.TextColor = System.Drawing.SystemColors.ControlText;
+      dockPaneStripToolWindowGradient1.ActiveTabGradient = tabGradient5;
+      dockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight;
+      dockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight;
+      dockPaneStripToolWindowGradient1.DockStripGradient = dockPanelGradient3;
+      tabGradient6.EndColor = System.Drawing.SystemColors.InactiveCaption;
+      tabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
+      tabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption;
+      tabGradient6.TextColor = System.Drawing.SystemColors.InactiveCaptionText;
+      dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6;
+      tabGradient7.EndColor = System.Drawing.Color.Transparent;
+      tabGradient7.StartColor = System.Drawing.Color.Transparent;
+      tabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark;
+      dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7;
+      dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1;
+      dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1;
+      this.resultsDockPanel.Skin = dockPanelSkin1;
+      this.resultsDockPanel.TabIndex = 0;
+      // 
+      // runsTabPage
+      // 
+      this.runsTabPage.Controls.Add(this.runsView);
+      this.runsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.runsTabPage.Name = "runsTabPage";
+      this.runsTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.runsTabPage.Size = new System.Drawing.Size(841, 454);
+      this.runsTabPage.TabIndex = 4;
+      this.runsTabPage.Text = "Runs";
+      this.runsTabPage.UseVisualStyleBackColor = true;
+      // 
+      // runsView
+      // 
+      this.runsView.Caption = "RunCollection View";
+      this.runsView.Content = null;
+      this.runsView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.runsView.Location = new System.Drawing.Point(3, 3);
+      this.runsView.Name = "runsView";
+      this.runsView.ReadOnly = false;
+      this.runsView.Size = new System.Drawing.Size(835, 448);
+      this.runsView.TabIndex = 0;
       // 
       // solutionSeedingTabPage
@@ -216 +314 @@
       this.algorithmSuggestionLabel.Text = "Suggested Solvers:";
       // 
-      // maxEvaluationsTextBox
-      // 
-      this.maxEvaluationsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.maxEvaluationsTextBox.Location = new System.Drawing.Point(108, 3);
-      this.maxEvaluationsTextBox.Name = "maxEvaluationsTextBox";
-      this.maxEvaluationsTextBox.Size = new System.Drawing.Size(741, 20);
-      this.maxEvaluationsTextBox.TabIndex = 14;
-      this.maxEvaluationsTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.MaxEvaluationsTextBoxOnValidating);
-      // 
       // suggestedInstancesComboBox
       // 
@@ -249 +337 @@
       this.algorithmCloneButton.Click += new System.EventHandler(this.AlgorithmCloneButtonOnClick);
       // 
-      // runsTabPage
-      // 
-      this.runsTabPage.Controls.Add(this.runsView);
-      this.runsTabPage.Location = new System.Drawing.Point(4, 22);
-      this.runsTabPage.Name = "runsTabPage";
-      this.runsTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.runsTabPage.Size = new System.Drawing.Size(841, 454);
-      this.runsTabPage.TabIndex = 4;
-      this.runsTabPage.Text = "Runs";
-      this.runsTabPage.UseVisualStyleBackColor = true;
-      // 
-      // runsView
-      // 
-      this.runsView.Caption = "RunCollection View";
-      this.runsView.Content = null;
-      this.runsView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.runsView.Location = new System.Drawing.Point(3, 3);
-      this.runsView.Name = "runsView";
-      this.runsView.ReadOnly = false;
-      this.runsView.Size = new System.Drawing.Size(835, 448);
-      this.runsView.TabIndex = 0;
+      // maxEvaluationsView
+      // 
+      this.maxEvaluationsView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.maxEvaluationsView.Caption = "StringConvertibleValue View";
+      this.maxEvaluationsView.Content = null;
+      this.maxEvaluationsView.LabelVisible = false;
+      this.maxEvaluationsView.Location = new System.Drawing.Point(91, 3);
+      this.maxEvaluationsView.Name = "maxEvaluationsView";
+      this.maxEvaluationsView.ReadOnly = false;
+      this.maxEvaluationsView.Size = new System.Drawing.Size(758, 21);
+      this.maxEvaluationsView.TabIndex = 16;
+      // 
+      // seededRunsTabPage
+      // 
+      this.seededRunsTabPage.Controls.Add(this.seededRunsView);
+      this.seededRunsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.seededRunsTabPage.Name = "seededRunsTabPage";
+      this.seededRunsTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.seededRunsTabPage.Size = new System.Drawing.Size(841, 454);
+      this.seededRunsTabPage.TabIndex = 5;
+      this.seededRunsTabPage.Text = "Seeded Runs";
+      this.seededRunsTabPage.UseVisualStyleBackColor = true;
+      // 
+      // seededRunsView
+      // 
+      this.seededRunsView.Caption = "RunCollection View";
+      this.seededRunsView.Content = null;
+      this.seededRunsView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.seededRunsView.Location = new System.Drawing.Point(3, 3);
+      this.seededRunsView.Name = "seededRunsView";
+      this.seededRunsView.ReadOnly = false;
+      this.seededRunsView.Size = new System.Drawing.Size(835, 448);
+      this.seededRunsView.TabIndex = 1;
       // 
       // SolverView
@@ -275 +376 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.maxEvaluationsView);
       this.Controls.Add(this.algorithmCloneButton);
       this.Controls.Add(this.seedingStrategyPanel);
@@ -282 +384 @@
       this.Controls.Add(this.evaluationsLimitabel);
       this.Controls.Add(this.algorithmSuggestionLabel);
-      this.Controls.Add(this.maxEvaluationsTextBox);
       this.Controls.Add(this.suggestedInstancesComboBox);
       this.Name = "SolverView";
@@ -288 +389 @@
       this.solverTabControl.ResumeLayout(false);
       this.resultsTabPage.ResumeLayout(false);
+      this.resultsTabPage.PerformLayout();
+      this.runsTabPage.ResumeLayout(false);
       this.parametersTabPage.ResumeLayout(false);
       this.operatorGraphTabPage.ResumeLayout(false);
-      this.runsTabPage.ResumeLayout(false);
+      this.seededRunsTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -301 +404 @@
     private MainForm.WindowsForms.DragOverTabControl solverTabControl;
     private System.Windows.Forms.TabPage resultsTabPage;
-    private Optimization.Views.ResultCollectionView solverResultsView;
     private System.Windows.Forms.TabPage solutionSeedingTabPage;
     private System.Windows.Forms.TabPage parametersTabPage;
@@ -311 +413 @@
     private System.Windows.Forms.Label evaluationsLimitabel;
     private System.Windows.Forms.Label algorithmSuggestionLabel;
-    private System.Windows.Forms.TextBox maxEvaluationsTextBox;
     private System.Windows.Forms.ComboBox suggestedInstancesComboBox;
     private System.Windows.Forms.Button algorithmCloneButton;
     private System.Windows.Forms.TabPage runsTabPage;
     private Optimization.Views.RunCollectionView runsView;
+    private Data.Views.StringConvertibleValueView maxEvaluationsView;
+    private WeifenLuo.WinFormsUI.Docking.DockPanel resultsDockPanel;
+    private System.Windows.Forms.CheckBox showOnlyFinalResultCheckBox;
+    private System.Windows.Forms.TabPage seededRunsTabPage;
+    private Optimization.Views.RunCollectionView seededRunsView;
   }
 }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views/SolverView.cs

@@ -28 +28 @@
 using HeuristicLab.OptimizationExpertSystem.Common;
 using System;
-using System.ComponentModel;
 using System.Windows.Forms;
 
 namespace HeuristicLab.OptimizationExpertSystem {
   [View("Solver View")]
-  [Content(typeof(ExpertSystem), IsDefaultView = false)]
-  public partial class SolverView : ExpertSystemViewBase {
+  [Content(typeof(KnowledgeCenter), IsDefaultView = false)]
+  public partial class SolverView : KnowledgeCenterViewBase {
     private EnumValueView<SeedingStrategyTypes> seedingStrategyView;
     private CheckedItemListView<IScope> seedingSolutionsView;
@@ -60 +59 @@
       try {
         if (Content == null) {
-          maxEvaluationsTextBox.Text = string.Empty;
+          maxEvaluationsView.Content = null;
           solverParametersView.Content = null;
-          solverResultsView.Content = null;
           runsView.Content = null;
+          seededRunsView.Content = null;
           seedingStrategyView.Content = null;
           seedingSolutionsView.Content = null;
         } else {
-          maxEvaluationsTextBox.Text = Content.MaximumEvaluations.ToString();
-          runsView.Content = Content.Runs;
-          solverResultsView.Content = Content.CurrentResult;
+          maxEvaluationsView.Content = Content.MaximumEvaluations;
+          runsView.Content = Content.InstanceRuns;
+          seededRunsView.Content = Content.SeededRuns;
           seedingStrategyView.Content = Content.SeedingStrategy;
           seedingSolutionsView.Content = Content.SolutionSeedingPool;
@@ -79 +78 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      maxEvaluationsTextBox.Enabled = Content != null && !ReadOnly && !Locked;
       suggestedInstancesComboBox.Enabled = Content != null && !ReadOnly && !Locked;
       algorithmStartButton.Enabled = Content != null && !ReadOnly && !Locked && suggestedInstancesComboBox.SelectedIndex >= 0;
@@ -86 +84 @@
     }
 
-    protected override void OnPropertyChanged(string propertyName) {
-      base.OnPropertyChanged(propertyName);
-      SuppressEvents = true;
-      try {
-        switch (propertyName) {
-          case "MaximumEvaluations": maxEvaluationsTextBox.Text = Content.MaximumEvaluations.ToString(); break;
-          case "CurrentResult": solverResultsView.Content = Content.CurrentResult; break;
-        }
-      } finally { SuppressEvents = false; }
-      SetEnabledStateOfControls();
+    protected override void OnAlgorithmInstanceStarted(IAlgorithm algorithm) {
+      base.OnAlgorithmInstanceStarted(algorithm);
+      var form = new AlgorithmControlForm(algorithm, showOnlyFinalResultCheckBox.Checked);
+      form.Show(resultsDockPanel);
     }
 
@@ -116 +108 @@
       if (prevNewIndex >= 0) {
         suggestedInstancesComboBox.SelectedIndex = prevNewIndex;
-      }
-    }
-
-    private void MaxEvaluationsTextBoxOnValidating(object sender, CancelEventArgs e) {
-      if (SuppressEvents) return;
-      if (InvokeRequired) {
-        Invoke((Action<object, CancelEventArgs>)MaxEvaluationsTextBoxOnValidating, sender, e);
-        return;
-      }
-      int value;
-      if (!int.TryParse(maxEvaluationsTextBox.Text, out value)) {
-        e.Cancel = !maxEvaluationsTextBox.ReadOnly && maxEvaluationsTextBox.Enabled;
-        //errorProvider.SetError(maxEvaluationsTextBox, "Please enter a valid integer number.");
-      } else {
-        Content.MaximumEvaluations = value;
-        e.Cancel = false;
-        //errorProvider.SetError(maxEvaluationsTextBox, null);
       }
     }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views/UnderstandingProblemInstanceView.cs

@@ -30 +30 @@
 namespace HeuristicLab.OptimizationExpertSystem {
   [View("Understanding Problem Instance")]
-  [Content(typeof(ExpertSystem), IsDefaultView = false)]
-  public partial class UnderstandingProblemInstanceView : ExpertSystemViewBase {
+  [Content(typeof(KnowledgeCenter), IsDefaultView = false)]
+  public partial class UnderstandingProblemInstanceView : KnowledgeCenterViewBase {
     public UnderstandingProblemInstanceView() {
       InitializeComponent();

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views/UnderstandingSolutionsView.Designer.cs

@@ -66 +66 @@
       this.solutionsNetworkTabPage = new System.Windows.Forms.TabPage();
       this.solutionsNetworkChart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
+      this.pearsonsRSquaredLabel = new System.Windows.Forms.Label();
+      this.fdcPearsonLabel = new System.Windows.Forms.Label();
+      this.spearmansRankLabel = new System.Windows.Forms.Label();
+      this.fdcSpearmanLabel = new System.Windows.Forms.Label();
       this.solutionsTabControl.SuspendLayout();
       this.solutionsQualityTabPage.SuspendLayout();
@@ -209 +213 @@
       // solutionsFdcTabPage
       // 
+      this.solutionsFdcTabPage.Controls.Add(this.fdcSpearmanLabel);
+      this.solutionsFdcTabPage.Controls.Add(this.fdcPearsonLabel);
+      this.solutionsFdcTabPage.Controls.Add(this.spearmansRankLabel);
+      this.solutionsFdcTabPage.Controls.Add(this.pearsonsRSquaredLabel);
       this.solutionsFdcTabPage.Controls.Add(this.fdcBetweenBestCheckBox);
       this.solutionsFdcTabPage.Controls.Add(this.solutionsFdcViewHost);
@@ -301 +309 @@
       this.solutionsNetworkChart.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.SolutionsNetworkChartOnMouseDoubleClick);
       // 
-      // UnderstandingSolutions
+      // pearsonsRSquaredLabel
+      // 
+      this.pearsonsRSquaredLabel.AutoSize = true;
+      this.pearsonsRSquaredLabel.Location = new System.Drawing.Point(436, 7);
+      this.pearsonsRSquaredLabel.Name = "pearsonsRSquaredLabel";
+      this.pearsonsRSquaredLabel.Size = new System.Drawing.Size(65, 13);
+      this.pearsonsRSquaredLabel.TabIndex = 3;
+      this.pearsonsRSquaredLabel.Text = "Pearson\'s r²:";
+      // 
+      // fdcPearsonLabel
+      // 
+      this.fdcPearsonLabel.AutoSize = true;
+      this.fdcPearsonLabel.Location = new System.Drawing.Point(512, 7);
+      this.fdcPearsonLabel.Name = "fdcPearsonLabel";
+      this.fdcPearsonLabel.Size = new System.Drawing.Size(10, 13);
+      this.fdcPearsonLabel.TabIndex = 4;
+      this.fdcPearsonLabel.Text = "-";
+      // 
+      // spearmansRankLabel
+      // 
+      this.spearmansRankLabel.AutoSize = true;
+      this.spearmansRankLabel.Location = new System.Drawing.Point(281, 7);
+      this.spearmansRankLabel.Name = "spearmansRankLabel";
+      this.spearmansRankLabel.Size = new System.Drawing.Size(74, 13);
+      this.spearmansRankLabel.TabIndex = 3;
+      this.spearmansRankLabel.Text = "Spearman\'s ρ:";
+      // 
+      // fdcSpearmanLabel
+      // 
+      this.fdcSpearmanLabel.AutoSize = true;
+      this.fdcSpearmanLabel.Location = new System.Drawing.Point(357, 7);
+      this.fdcSpearmanLabel.Name = "fdcSpearmanLabel";
+      this.fdcSpearmanLabel.Size = new System.Drawing.Size(10, 13);
+      this.fdcSpearmanLabel.TabIndex = 4;
+      this.fdcSpearmanLabel.Text = "-";
+      // 
+      // UnderstandingSolutionsView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -310 +354 @@
       this.Controls.Add(this.similarityComboBox);
       this.Controls.Add(this.solutionsTabControl);
-      this.Name = "UnderstandingSolutions";
+      this.Name = "UnderstandingSolutionsView";
       this.Size = new System.Drawing.Size(732, 505);
       this.solutionsTabControl.ResumeLayout(false);
@@ -343 +387 @@
     private System.Windows.Forms.TabPage solutionsNetworkTabPage;
     private Visualization.ChartControlsExtensions.EnhancedChart solutionsNetworkChart;
+    private System.Windows.Forms.Label fdcPearsonLabel;
+    private System.Windows.Forms.Label pearsonsRSquaredLabel;
+    private System.Windows.Forms.Label fdcSpearmanLabel;
+    private System.Windows.Forms.Label spearmansRankLabel;
   }
 }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views/UnderstandingSolutionsView.cs

@@ -36 +36 @@
 namespace HeuristicLab.OptimizationExpertSystem {
   [View("Understanding Solutions")]
-  [Content(typeof(ExpertSystem), IsDefaultView = false)]
-  public partial class UnderstandingSolutionsView : ExpertSystemViewBase {
+  [Content(typeof(KnowledgeCenter), IsDefaultView = false)]
+  public partial class UnderstandingSolutionsView : KnowledgeCenterViewBase {
     protected virtual bool SuppressEvents { get; set; }
 
@@ -143 +143 @@
       try {
         solutionsFdcViewHost.Content = null;
+        fdcSpearmanLabel.Text = "-";
+        fdcPearsonLabel.Text = "-";
         var solutionScopes = GetSolutionScopes();
         var points = new List<Point2D<double>>();
@@ -166 +168 @@
           }
         }
+        var xs = points.Select(p => p.X).ToArray();
+        var ys = points.Select(p => p.Y).ToArray();
+        var scorr = alglib.spearmancorr2(xs, ys);
+        var pcorr = alglib.pearsoncorr2(xs, ys);
+        pcorr = pcorr * pcorr;
+        fdcSpearmanLabel.Text = scorr.ToString("F2");
+        fdcPearsonLabel.Text = pcorr.ToString("F2");
+
         var splot = new ScatterPlot("Fitness-Distance", "");
         splot.VisualProperties.XAxisTitle = "Absolute Fitness Difference";
+        splot.VisualProperties.XAxisMinimumAuto = false;
         splot.VisualProperties.XAxisMinimumFixedValue = 0.0;
-        splot.VisualProperties.XAxisMinimumAuto = false;
         splot.VisualProperties.YAxisTitle = "Solution Distance";
+        splot.VisualProperties.YAxisMinimumAuto = false;
         splot.VisualProperties.YAxisMinimumFixedValue = 0.0;
-        splot.VisualProperties.YAxisMinimumAuto = false;
+        splot.VisualProperties.YAxisMaximumAuto = false;
         splot.VisualProperties.YAxisMaximumFixedValue = 1.0;
-        splot.VisualProperties.YAxisMaximumAuto = false;
         var row = new ScatterPlotDataRow("Fdc", "", points);
-        row.VisualProperties.PointSize = 7;
+        row.VisualProperties.PointSize = 10;
+        row.VisualProperties.ShowRegressionLine = true;
         splot.Rows.Add(row);
         solutionsFdcViewHost.Content = splot;