Changeset 13787 for branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3

Timestamp:

04/24/16 10:03:52 (8 years ago)

Author:

abeham

Message:

#2457: worked on performance modeling

Location:

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3

Files:

• HeuristicLab.OptimizationExpertSystem-3.3.csproj (modified) (4 diffs)
• Menu/200_Solving/210_PerformanceModelingMenuItem.cs (copied) (copied from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Menu/200_Solving/210_SolverMenuItem.cs) (2 diffs)
• Menu/200_Solving/220_SolverMenuItem.cs (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Menu/200_Solving/210_SolverMenuItem.cs) (1 diff)
• Views/KnowledgeCenterViewBase.cs (modified) (10 diffs)
• Views/PerformanceModelingView.Designer.cs (added)
• Views/PerformanceModelingView.cs (added)
• Views/PerformanceModelingView.resx (added)
• Views/SolverView.Designer.cs (modified) (20 diffs)
• Views/SolverView.cs (modified) (8 diffs)
• Views/UnderstandingProblemInstanceView.cs (modified) (10 diffs)
• Views/UnderstandingSolutionsView.cs (modified) (3 diffs)

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/HeuristicLab.OptimizationExpertSystem-3.3.csproj

@@ -191 +191 @@
       <DependentUpon>AlgorithmControlForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="Menu\200_Solving\210_PerformanceModelingMenuItem.cs" />
     <Compile Include="Toolbar\DownloadFromOKBToolbarItem.cs" />
     <Compile Include="Toolbar\ToolbarItemBase.cs" />
@@ -209 +210 @@
     <Compile Include="Menu\0_Config\30_DownloadFromOkbMenuItem.cs" />
     <Compile Include="Menu\0_Config\10_SetCredentialsMenuItem.cs" />
-    <Compile Include="Menu\200_Solving\210_SolverMenuItem.cs" />
+    <Compile Include="Menu\200_Solving\220_SolverMenuItem.cs" />
     <Compile Include="Menu\300_Learning\310_KnowledgeBaseMenuItem.cs" />
     <Compile Include="Menu\900_Tools\900_CSharpScriptMenuItem.cs" />
@@ -227 +228 @@
     </Compile>
     <Compile Include="Plugin.cs" />
+    <Compile Include="Views\PerformanceModelingView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\PerformanceModelingView.Designer.cs">
+      <DependentUpon>PerformanceModelingView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Views\SolverView.cs">
       <SubType>UserControl</SubType>
@@ -297 +304 @@
     <EmbeddedResource Include="OptimizationKnowledgeCenter.resx">
       <DependentUpon>OptimizationKnowledgeCenter.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Views\PerformanceModelingView.resx">
+      <DependentUpon>PerformanceModelingView.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\SolverView.resx">

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Menu/200_Solving/210_PerformanceModelingMenuItem.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.OptimizationExpertSystem.Menu {
-  internal class SolverMenuItem : MenuItemBase {
+  internal class PerformanceModelingMenuItem : MenuItemBase {
     public override Image Image { get { return VSImageLibrary.Event; } }
 
     public override string Name {
-      get { return "Solver"; }
+      get { return "Performance Modeling"; }
     }
 
@@ -42 +42 @@
     }
 
-    public override string ToolTipText { get { return "Solve the problem instance."; } }
+    public override string ToolTipText { get { return "Modeling algorithm performance to suggest well-suited instances."; } }
 
     public override void Execute() {
-      var viewType = typeof(SolverView);
+      var viewType = typeof(PerformanceModelingView);
       var view = MainForm.Views.FirstOrDefault(x => viewType == ((x is ViewHost) ? ((ViewHost)x).ActiveView : x).GetType());
       if (view != null) view.Show();

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Menu/200_Solving/220_SolverMenuItem.cs

@@ -39 +39 @@
 
     public override int Position {
-      get { return 210; }
+      get { return 220; }
     }
 

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

@@ -48 +48 @@
       Content.DownloadStarted += ContentOnDownloadStarted;
       Content.AlgorithmInstanceStarted += ContentOnAlgorithmInstanceStarted;
+      Content.RecommendationModelChanged += ContentOnRecommendationModelChanged;
       RegisterContentProblemEvents();
       RegisterContentProblemInstancesEvents();
-      RegisterContentProblemCharacteristicsEvents();
       RegisterContentSolutionSeedingPoolEvents();
       RegisterContentSuggestedInstancesEvents();
@@ -71 +71 @@
     }
 
-    private void RegisterContentProblemCharacteristicsEvents() {
-      Content.ProblemCharacteristics.ItemsAdded += ContentOnProblemCharacteristicsChanged;
-      Content.ProblemCharacteristics.ItemsReplaced += ContentOnProblemCharacteristicsChanged;
-      Content.ProblemCharacteristics.ItemsRemoved += ContentOnProblemCharacteristicsChanged;
-      Content.ProblemCharacteristics.CheckedItemsChanged += ContentOnProblemCharacteristicsChanged;
-      Content.ProblemCharacteristics.CollectionReset += ContentOnProblemCharacteristicsChanged;
-    }
-
     private void RegisterContentSolutionSeedingPoolEvents() {
       Content.SolutionSeedingPool.CheckedItemsChanged += ContentOnSolutionSeedingPoolChanged;
@@ -88 +80 @@
 
     private void RegisterContentSuggestedInstancesEvents() {
-      Content.AlgorithmInstances.CollectionReset += ContentOnSuggestedInstancesChanged;
-      Content.AlgorithmInstances.ItemsAdded += ContentOnSuggestedInstancesChanged;
-      Content.AlgorithmInstances.ItemsMoved += ContentOnSuggestedInstancesChanged;
-      Content.AlgorithmInstances.ItemsRemoved += ContentOnSuggestedInstancesChanged;
-      Content.AlgorithmInstances.ItemsReplaced += ContentOnSuggestedInstancesChanged;
+      Content.AlgorithmInstances.CollectionReset += ContentOnAlgorithmInstancesChanged;
+      Content.AlgorithmInstances.ItemsAdded += ContentOnAlgorithmInstancesChanged;
+      Content.AlgorithmInstances.ItemsMoved += ContentOnAlgorithmInstancesChanged;
+      Content.AlgorithmInstances.ItemsRemoved += ContentOnAlgorithmInstancesChanged;
+      Content.AlgorithmInstances.ItemsReplaced += ContentOnAlgorithmInstancesChanged;
     }
 
@@ -99 +91 @@
       Content.DownloadStarted -= ContentOnDownloadStarted;
       Content.AlgorithmInstanceStarted -= ContentOnAlgorithmInstanceStarted;
+      Content.RecommendationModelChanged -= ContentOnRecommendationModelChanged;
       DeregisterContentProblemEvents();
       DeregisterContentProblemInstancesEvents();
-      DeregisterContentProblemCharacteristicsEvents();
       DeregisterContentSolutionSeedingPoolEvents();
       DeregisterContentSuggestedInstancesEvents();
@@ -122 +114 @@
     }
 
-    private void DeregisterContentProblemCharacteristicsEvents() {
-      Content.ProblemCharacteristics.ItemsAdded -= ContentOnProblemCharacteristicsChanged;
-      Content.ProblemCharacteristics.ItemsReplaced -= ContentOnProblemCharacteristicsChanged;
-      Content.ProblemCharacteristics.ItemsRemoved -= ContentOnProblemCharacteristicsChanged;
-      Content.ProblemCharacteristics.CheckedItemsChanged -= ContentOnProblemCharacteristicsChanged;
-      Content.ProblemCharacteristics.CollectionReset -= ContentOnProblemCharacteristicsChanged;
-    }
-
     private void DeregisterContentSolutionSeedingPoolEvents() {
       Content.SolutionSeedingPool.CheckedItemsChanged -= ContentOnSolutionSeedingPoolChanged;
@@ -139 +123 @@
 
     private void DeregisterContentSuggestedInstancesEvents() {
-      Content.AlgorithmInstances.CollectionReset -= ContentOnSuggestedInstancesChanged;
-      Content.AlgorithmInstances.ItemsAdded -= ContentOnSuggestedInstancesChanged;
-      Content.AlgorithmInstances.ItemsMoved -= ContentOnSuggestedInstancesChanged;
-      Content.AlgorithmInstances.ItemsRemoved -= ContentOnSuggestedInstancesChanged;
-      Content.AlgorithmInstances.ItemsReplaced -= ContentOnSuggestedInstancesChanged;
+      Content.AlgorithmInstances.CollectionReset -= ContentOnAlgorithmInstancesChanged;
+      Content.AlgorithmInstances.ItemsAdded -= ContentOnAlgorithmInstancesChanged;
+      Content.AlgorithmInstances.ItemsMoved -= ContentOnAlgorithmInstancesChanged;
+      Content.AlgorithmInstances.ItemsRemoved -= ContentOnAlgorithmInstancesChanged;
+      Content.AlgorithmInstances.ItemsReplaced -= ContentOnAlgorithmInstancesChanged;
     }
     #endregion
@@ -150 +134 @@
     protected virtual void OnDownloadEnded() { }
     protected virtual void OnAlgorithmInstanceStarted(IAlgorithm algorithm) { }
+    protected virtual void OnRecommendationModelChanged() { }
     protected virtual void OnPropertyChanged(string propertyName) { }
     protected virtual void OnProblemChanged() { }
     protected virtual void OnProblemSolutionsChanged() { }
     protected virtual void OnProblemInstancesChanged() { }
-    protected virtual void OnProblemCharacteristicsChanged() { }
     protected virtual void OnSolutionSeedingPoolChanged() { }
-    protected virtual void OnSuggestedInstancesChanged() { }
+    protected virtual void OnAlgorithmInstancesChanged() { }
     protected virtual void OnKnowledgeBaseChanged() { }
 
@@ -170 +154 @@
       if (InvokeRequired) { Invoke((Action<object, EventArgs<IAlgorithm>>)ContentOnAlgorithmInstanceStarted, sender, e); return; }
       OnAlgorithmInstanceStarted(e.Value);
+    }
+
+    private void ContentOnRecommendationModelChanged(object sender, EventArgs e) {
+      if (InvokeRequired) { Invoke((Action<object, EventArgs<IAlgorithm>>)ContentOnRecommendationModelChanged, sender, e); return; }
+      OnRecommendationModelChanged();
     }
 
@@ -194 +183 @@
     }
 
-    private void ContentOnProblemCharacteristicsChanged(object sender, EventArgs e) {
-      if (InvokeRequired) Invoke((Action)OnProblemCharacteristicsChanged);
-      else OnProblemCharacteristicsChanged();
-    }
-
     private void ContentOnSolutionSeedingPoolChanged(object sender, EventArgs e) {
       if (InvokeRequired) Invoke((Action)OnSolutionSeedingPoolChanged);
@@ -204 +188 @@
     }
 
-    private void ContentOnSuggestedInstancesChanged(object sender, EventArgs e) {
-      if (InvokeRequired) Invoke((Action)OnSuggestedInstancesChanged);
-      else OnSuggestedInstancesChanged();
+    private void ContentOnAlgorithmInstancesChanged(object sender, EventArgs e) {
+      if (InvokeRequired) Invoke((Action)OnAlgorithmInstancesChanged);
+      else OnAlgorithmInstancesChanged();
     }
     #endregion

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin();
-      WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin2 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin();
-      WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient4 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
-      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient8 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
-      WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin();
-      WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient();
-      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient9 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
-      WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient5 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
-      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient10 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
-      WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient();
-      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient11 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
-      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient12 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
-      WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient6 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
-      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient13 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
-      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient14 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+      WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin4 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin();
+      WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin4 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin();
+      WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient10 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
+      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient22 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+      WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin4 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin();
+      WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient4 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient();
+      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient23 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+      WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient11 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
+      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient24 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+      WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient4 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient();
+      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient25 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient26 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+      WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient12 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
+      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient27 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+      WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient28 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
       this.minTargetView = new HeuristicLab.Data.Views.StringConvertibleValueView();
       this.maxEvaluationsView = new HeuristicLab.Data.Views.StringConvertibleValueView();
       this.algorithmCloneButton = new System.Windows.Forms.Button();
       this.seedingStrategyPanel = new System.Windows.Forms.Panel();
+      this.algorithmStartButton = new System.Windows.Forms.Button();
+      this.minimumTargetLabel = new System.Windows.Forms.Label();
+      this.seedingStrategyLabel = new System.Windows.Forms.Label();
+      this.evaluationsLimitabel = new System.Windows.Forms.Label();
+      this.suggestedInstancesComboBox = new System.Windows.Forms.ComboBox();
+      this.instanceLabel = new System.Windows.Forms.Label();
       this.solverTabControl = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl();
       this.resultsTabPage = new System.Windows.Forms.TabPage();
@@ -77 +83 @@
       this.operatorGraphTabPage = new System.Windows.Forms.TabPage();
       this.operatorGraphViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
-      this.algorithmStartButton = new System.Windows.Forms.Button();
-      this.minimumTargetLabel = new System.Windows.Forms.Label();
-      this.seedingStrategyLabel = new System.Windows.Forms.Label();
-      this.evaluationsLimitabel = new System.Windows.Forms.Label();
-      this.recommenderLabel = new System.Windows.Forms.Label();
-      this.suggestedInstancesComboBox = new System.Windows.Forms.ComboBox();
-      this.recommenderComboBox = new System.Windows.Forms.ComboBox();
-      this.solverSplitContainer = new System.Windows.Forms.SplitContainer();
-      this.recommenderViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
-      this.instanceLabel = new System.Windows.Forms.Label();
-      this.recommendRefreshButton = new System.Windows.Forms.Button();
       this.solverTabControl.SuspendLayout();
       this.resultsTabPage.SuspendLayout();
@@ -94 +89 @@
       this.parametersTabPage.SuspendLayout();
       this.operatorGraphTabPage.SuspendLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.solverSplitContainer)).BeginInit();
-      this.solverSplitContainer.Panel1.SuspendLayout();
-      this.solverSplitContainer.Panel2.SuspendLayout();
-      this.solverSplitContainer.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -124 +115 @@
       // algorithmCloneButton
       // 
-      this.algorithmCloneButton.Location = new System.Drawing.Point(123, 60);
+      this.algorithmCloneButton.Location = new System.Drawing.Point(518, 56);
       this.algorithmCloneButton.Name = "algorithmCloneButton";
       this.algorithmCloneButton.Size = new System.Drawing.Size(26, 23);
       this.algorithmCloneButton.TabIndex = 15;
-      this.algorithmCloneButton.Text = "Clone";
+      this.algorithmCloneButton.Text = "c";
       this.algorithmCloneButton.UseVisualStyleBackColor = true;
       this.algorithmCloneButton.Click += new System.EventHandler(this.AlgorithmCloneButtonOnClick);
@@ -141 +132 @@
       this.seedingStrategyPanel.TabIndex = 12;
       // 
+      // algorithmStartButton
+      // 
+      this.algorithmStartButton.Location = new System.Drawing.Point(486, 56);
+      this.algorithmStartButton.Name = "algorithmStartButton";
+      this.algorithmStartButton.Size = new System.Drawing.Size(26, 23);
+      this.algorithmStartButton.TabIndex = 10;
+      this.algorithmStartButton.Text = "Start";
+      this.algorithmStartButton.UseVisualStyleBackColor = true;
+      this.algorithmStartButton.Click += new System.EventHandler(this.AlgorithmStartButtonOnClick);
+      // 
+      // minimumTargetLabel
+      // 
+      this.minimumTargetLabel.AutoSize = true;
+      this.minimumTargetLabel.Location = new System.Drawing.Point(384, 6);
+      this.minimumTargetLabel.Name = "minimumTargetLabel";
+      this.minimumTargetLabel.Size = new System.Drawing.Size(41, 13);
+      this.minimumTargetLabel.TabIndex = 13;
+      this.minimumTargetLabel.Text = "Target:";
+      // 
+      // seedingStrategyLabel
+      // 
+      this.seedingStrategyLabel.AutoSize = true;
+      this.seedingStrategyLabel.Location = new System.Drawing.Point(3, 33);
+      this.seedingStrategyLabel.Name = "seedingStrategyLabel";
+      this.seedingStrategyLabel.Size = new System.Drawing.Size(91, 13);
+      this.seedingStrategyLabel.TabIndex = 8;
+      this.seedingStrategyLabel.Text = "Seeding Strategy:";
+      // 
+      // evaluationsLimitabel
+      // 
+      this.evaluationsLimitabel.AutoSize = true;
+      this.evaluationsLimitabel.Location = new System.Drawing.Point(3, 6);
+      this.evaluationsLimitabel.Name = "evaluationsLimitabel";
+      this.evaluationsLimitabel.Size = new System.Drawing.Size(66, 13);
+      this.evaluationsLimitabel.TabIndex = 13;
+      this.evaluationsLimitabel.Text = "Budget (FE):";
+      // 
+      // suggestedInstancesComboBox
+      // 
+      this.suggestedInstancesComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.suggestedInstancesComboBox.FormattingEnabled = true;
+      this.suggestedInstancesComboBox.Location = new System.Drawing.Point(108, 56);
+      this.suggestedInstancesComboBox.Name = "suggestedInstancesComboBox";
+      this.suggestedInstancesComboBox.Size = new System.Drawing.Size(372, 21);
+      this.suggestedInstancesComboBox.TabIndex = 7;
+      this.suggestedInstancesComboBox.SelectedIndexChanged += new System.EventHandler(this.SuggestedInstancesComboBoxOnSelectedIndexChanged);
+      // 
+      // instanceLabel
+      // 
+      this.instanceLabel.AutoSize = true;
+      this.instanceLabel.Location = new System.Drawing.Point(3, 59);
+      this.instanceLabel.Name = "instanceLabel";
+      this.instanceLabel.Size = new System.Drawing.Size(51, 13);
+      this.instanceLabel.TabIndex = 9;
+      this.instanceLabel.Text = "Instance:";
+      // 
       // solverTabControl
       // 
-      this.solverTabControl.AllowDrop = true;
+      this.solverTabControl.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.solverTabControl.Controls.Add(this.resultsTabPage);
       this.solverTabControl.Controls.Add(this.runsTabPage);
@@ -150 +199 @@
       this.solverTabControl.Controls.Add(this.parametersTabPage);
       this.solverTabControl.Controls.Add(this.operatorGraphTabPage);
-      this.solverTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.solverTabControl.Location = new System.Drawing.Point(3, 3);
+      this.solverTabControl.Location = new System.Drawing.Point(6, 85);
       this.solverTabControl.Name = "solverTabControl";
       this.solverTabControl.SelectedIndex = 0;
-      this.solverTabControl.Size = new System.Drawing.Size(556, 502);
-      this.solverTabControl.TabIndex = 11;
+      this.solverTabControl.Size = new System.Drawing.Size(843, 479);
+      this.solverTabControl.TabIndex = 17;
       // 
       // resultsTabPage
@@ -164 +212 @@
       this.resultsTabPage.Name = "resultsTabPage";
       this.resultsTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.resultsTabPage.Size = new System.Drawing.Size(548, 476);
+      this.resultsTabPage.Size = new System.Drawing.Size(835, 453);
       this.resultsTabPage.TabIndex = 2;
       this.resultsTabPage.Text = "Results";
@@ -189 +237 @@
       this.resultsDockPanel.Location = new System.Drawing.Point(3, 29);
       this.resultsDockPanel.Name = "resultsDockPanel";
-      this.resultsDockPanel.Size = new System.Drawing.Size(542, 444);
-      dockPanelGradient4.EndColor = System.Drawing.SystemColors.ControlLight;
-      dockPanelGradient4.StartColor = System.Drawing.SystemColors.ControlLight;
-      autoHideStripSkin2.DockStripGradient = dockPanelGradient4;
-      tabGradient8.EndColor = System.Drawing.SystemColors.Control;
-      tabGradient8.StartColor = System.Drawing.SystemColors.Control;
-      tabGradient8.TextColor = System.Drawing.SystemColors.ControlDarkDark;
-      autoHideStripSkin2.TabGradient = tabGradient8;
-      autoHideStripSkin2.TextFont = new System.Drawing.Font("Segoe UI", 9F);
-      dockPanelSkin2.AutoHideStripSkin = autoHideStripSkin2;
-      tabGradient9.EndColor = System.Drawing.SystemColors.ControlLightLight;
-      tabGradient9.StartColor = System.Drawing.SystemColors.ControlLightLight;
-      tabGradient9.TextColor = System.Drawing.SystemColors.ControlText;
-      dockPaneStripGradient2.ActiveTabGradient = tabGradient9;
-      dockPanelGradient5.EndColor = System.Drawing.SystemColors.Control;
-      dockPanelGradient5.StartColor = System.Drawing.SystemColors.Control;
-      dockPaneStripGradient2.DockStripGradient = dockPanelGradient5;
-      tabGradient10.EndColor = System.Drawing.SystemColors.ControlLight;
-      tabGradient10.StartColor = System.Drawing.SystemColors.ControlLight;
-      tabGradient10.TextColor = System.Drawing.SystemColors.ControlText;
-      dockPaneStripGradient2.InactiveTabGradient = tabGradient10;
-      dockPaneStripSkin2.DocumentGradient = dockPaneStripGradient2;
-      dockPaneStripSkin2.TextFont = new System.Drawing.Font("Segoe UI", 9F);
-      tabGradient11.EndColor = System.Drawing.SystemColors.ActiveCaption;
-      tabGradient11.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
-      tabGradient11.StartColor = System.Drawing.SystemColors.GradientActiveCaption;
-      tabGradient11.TextColor = System.Drawing.SystemColors.ActiveCaptionText;
-      dockPaneStripToolWindowGradient2.ActiveCaptionGradient = tabGradient11;
-      tabGradient12.EndColor = System.Drawing.SystemColors.Control;
-      tabGradient12.StartColor = System.Drawing.SystemColors.Control;
-      tabGradient12.TextColor = System.Drawing.SystemColors.ControlText;
-      dockPaneStripToolWindowGradient2.ActiveTabGradient = tabGradient12;
-      dockPanelGradient6.EndColor = System.Drawing.SystemColors.ControlLight;
-      dockPanelGradient6.StartColor = System.Drawing.SystemColors.ControlLight;
-      dockPaneStripToolWindowGradient2.DockStripGradient = dockPanelGradient6;
-      tabGradient13.EndColor = System.Drawing.SystemColors.InactiveCaption;
-      tabGradient13.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
-      tabGradient13.StartColor = System.Drawing.SystemColors.GradientInactiveCaption;
-      tabGradient13.TextColor = System.Drawing.SystemColors.InactiveCaptionText;
-      dockPaneStripToolWindowGradient2.InactiveCaptionGradient = tabGradient13;
-      tabGradient14.EndColor = System.Drawing.Color.Transparent;
-      tabGradient14.StartColor = System.Drawing.Color.Transparent;
-      tabGradient14.TextColor = System.Drawing.SystemColors.ControlDarkDark;
-      dockPaneStripToolWindowGradient2.InactiveTabGradient = tabGradient14;
-      dockPaneStripSkin2.ToolWindowGradient = dockPaneStripToolWindowGradient2;
-      dockPanelSkin2.DockPaneStripSkin = dockPaneStripSkin2;
-      this.resultsDockPanel.Skin = dockPanelSkin2;
+      this.resultsDockPanel.Size = new System.Drawing.Size(829, 421);
+      dockPanelGradient10.EndColor = System.Drawing.SystemColors.ControlLight;
+      dockPanelGradient10.StartColor = System.Drawing.SystemColors.ControlLight;
+      autoHideStripSkin4.DockStripGradient = dockPanelGradient10;
+      tabGradient22.EndColor = System.Drawing.SystemColors.Control;
+      tabGradient22.StartColor = System.Drawing.SystemColors.Control;
+      tabGradient22.TextColor = System.Drawing.SystemColors.ControlDarkDark;
+      autoHideStripSkin4.TabGradient = tabGradient22;
+      autoHideStripSkin4.TextFont = new System.Drawing.Font("Segoe UI", 9F);
+      dockPanelSkin4.AutoHideStripSkin = autoHideStripSkin4;
+      tabGradient23.EndColor = System.Drawing.SystemColors.ControlLightLight;
+      tabGradient23.StartColor = System.Drawing.SystemColors.ControlLightLight;
+      tabGradient23.TextColor = System.Drawing.SystemColors.ControlText;
+      dockPaneStripGradient4.ActiveTabGradient = tabGradient23;
+      dockPanelGradient11.EndColor = System.Drawing.SystemColors.Control;
+      dockPanelGradient11.StartColor = System.Drawing.SystemColors.Control;
+      dockPaneStripGradient4.DockStripGradient = dockPanelGradient11;
+      tabGradient24.EndColor = System.Drawing.SystemColors.ControlLight;
+      tabGradient24.StartColor = System.Drawing.SystemColors.ControlLight;
+      tabGradient24.TextColor = System.Drawing.SystemColors.ControlText;
+      dockPaneStripGradient4.InactiveTabGradient = tabGradient24;
+      dockPaneStripSkin4.DocumentGradient = dockPaneStripGradient4;
+      dockPaneStripSkin4.TextFont = new System.Drawing.Font("Segoe UI", 9F);
+      tabGradient25.EndColor = System.Drawing.SystemColors.ActiveCaption;
+      tabGradient25.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
+      tabGradient25.StartColor = System.Drawing.SystemColors.GradientActiveCaption;
+      tabGradient25.TextColor = System.Drawing.SystemColors.ActiveCaptionText;
+      dockPaneStripToolWindowGradient4.ActiveCaptionGradient = tabGradient25;
+      tabGradient26.EndColor = System.Drawing.SystemColors.Control;
+      tabGradient26.StartColor = System.Drawing.SystemColors.Control;
+      tabGradient26.TextColor = System.Drawing.SystemColors.ControlText;
+      dockPaneStripToolWindowGradient4.ActiveTabGradient = tabGradient26;
+      dockPanelGradient12.EndColor = System.Drawing.SystemColors.ControlLight;
+      dockPanelGradient12.StartColor = System.Drawing.SystemColors.ControlLight;
+      dockPaneStripToolWindowGradient4.DockStripGradient = dockPanelGradient12;
+      tabGradient27.EndColor = System.Drawing.SystemColors.InactiveCaption;
+      tabGradient27.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
+      tabGradient27.StartColor = System.Drawing.SystemColors.GradientInactiveCaption;
+      tabGradient27.TextColor = System.Drawing.SystemColors.InactiveCaptionText;
+      dockPaneStripToolWindowGradient4.InactiveCaptionGradient = tabGradient27;
+      tabGradient28.EndColor = System.Drawing.Color.Transparent;
+      tabGradient28.StartColor = System.Drawing.Color.Transparent;
+      tabGradient28.TextColor = System.Drawing.SystemColors.ControlDarkDark;
+      dockPaneStripToolWindowGradient4.InactiveTabGradient = tabGradient28;
+      dockPaneStripSkin4.ToolWindowGradient = dockPaneStripToolWindowGradient4;
+      dockPanelSkin4.DockPaneStripSkin = dockPaneStripSkin4;
+      this.resultsDockPanel.Skin = dockPanelSkin4;
       this.resultsDockPanel.TabIndex = 0;
       // 
@@ -244 +292 @@
       this.runsTabPage.Name = "runsTabPage";
       this.runsTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.runsTabPage.Size = new System.Drawing.Size(548, 476);
+      this.runsTabPage.Size = new System.Drawing.Size(548, 418);
       this.runsTabPage.TabIndex = 4;
       this.runsTabPage.Text = "Runs";
@@ -257 +305 @@
       this.runsView.Name = "runsView";
       this.runsView.ReadOnly = false;
-      this.runsView.Size = new System.Drawing.Size(542, 470);
+      this.runsView.Size = new System.Drawing.Size(542, 412);
       this.runsView.TabIndex = 0;
       // 
@@ -266 +314 @@
       this.seededRunsTabPage.Name = "seededRunsTabPage";
       this.seededRunsTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.seededRunsTabPage.Size = new System.Drawing.Size(548, 476);
+      this.seededRunsTabPage.Size = new System.Drawing.Size(548, 418);
       this.seededRunsTabPage.TabIndex = 5;
       this.seededRunsTabPage.Text = "Seeded Runs";
@@ -279 +327 @@
       this.seededRunsView.Name = "seededRunsView";
       this.seededRunsView.ReadOnly = false;
-      this.seededRunsView.Size = new System.Drawing.Size(542, 470);
+      this.seededRunsView.Size = new System.Drawing.Size(542, 412);
       this.seededRunsView.TabIndex = 1;
       // 
@@ -287 +335 @@
       this.solutionSeedingTabPage.Name = "solutionSeedingTabPage";
       this.solutionSeedingTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.solutionSeedingTabPage.Size = new System.Drawing.Size(548, 476);
+      this.solutionSeedingTabPage.Size = new System.Drawing.Size(548, 418);
       this.solutionSeedingTabPage.TabIndex = 1;
       this.solutionSeedingTabPage.Text = "Seeding Pool";
@@ -298 +346 @@
       this.parametersTabPage.Name = "parametersTabPage";
       this.parametersTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.parametersTabPage.Size = new System.Drawing.Size(548, 476);
+      this.parametersTabPage.Size = new System.Drawing.Size(548, 418);
       this.parametersTabPage.TabIndex = 0;
       this.parametersTabPage.Text = "Parameters";
@@ -313 +361 @@
       this.solverParametersView.ReadOnly = true;
       this.solverParametersView.ShowDetails = true;
-      this.solverParametersView.Size = new System.Drawing.Size(542, 470);
+      this.solverParametersView.Size = new System.Drawing.Size(542, 412);
       this.solverParametersView.TabIndex = 0;
       // 
@@ -322 +370 @@
       this.operatorGraphTabPage.Name = "operatorGraphTabPage";
       this.operatorGraphTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.operatorGraphTabPage.Size = new System.Drawing.Size(548, 476);
+      this.operatorGraphTabPage.Size = new System.Drawing.Size(548, 418);
       this.operatorGraphTabPage.TabIndex = 3;
       this.operatorGraphTabPage.Text = "Operator Graph";
@@ -336 +384 @@
       this.operatorGraphViewHost.Name = "operatorGraphViewHost";
       this.operatorGraphViewHost.ReadOnly = true;
-      this.operatorGraphViewHost.Size = new System.Drawing.Size(542, 470);
+      this.operatorGraphViewHost.Size = new System.Drawing.Size(542, 412);
       this.operatorGraphViewHost.TabIndex = 0;
       this.operatorGraphViewHost.ViewsLabelVisible = true;
       this.operatorGraphViewHost.ViewType = null;
       // 
-      // algorithmStartButton
-      // 
-      this.algorithmStartButton.Location = new System.Drawing.Point(91, 60);
-      this.algorithmStartButton.Name = "algorithmStartButton";
-      this.algorithmStartButton.Size = new System.Drawing.Size(26, 23);
-      this.algorithmStartButton.TabIndex = 10;
-      this.algorithmStartButton.Text = "Start";
-      this.algorithmStartButton.UseVisualStyleBackColor = true;
-      this.algorithmStartButton.Click += new System.EventHandler(this.AlgorithmStartButtonOnClick);
-      // 
-      // minimumTargetLabel
-      // 
-      this.minimumTargetLabel.AutoSize = true;
-      this.minimumTargetLabel.Location = new System.Drawing.Point(384, 6);
-      this.minimumTargetLabel.Name = "minimumTargetLabel";
-      this.minimumTargetLabel.Size = new System.Drawing.Size(41, 13);
-      this.minimumTargetLabel.TabIndex = 13;
-      this.minimumTargetLabel.Text = "Target:";
-      // 
-      // seedingStrategyLabel
-      // 
-      this.seedingStrategyLabel.AutoSize = true;
-      this.seedingStrategyLabel.Location = new System.Drawing.Point(3, 33);
-      this.seedingStrategyLabel.Name = "seedingStrategyLabel";
-      this.seedingStrategyLabel.Size = new System.Drawing.Size(91, 13);
-      this.seedingStrategyLabel.TabIndex = 8;
-      this.seedingStrategyLabel.Text = "Seeding Strategy:";
-      // 
-      // evaluationsLimitabel
-      // 
-      this.evaluationsLimitabel.AutoSize = true;
-      this.evaluationsLimitabel.Location = new System.Drawing.Point(3, 6);
-      this.evaluationsLimitabel.Name = "evaluationsLimitabel";
-      this.evaluationsLimitabel.Size = new System.Drawing.Size(66, 13);
-      this.evaluationsLimitabel.TabIndex = 13;
-      this.evaluationsLimitabel.Text = "Budget (FE):";
-      // 
-      // recommenderLabel
-      // 
-      this.recommenderLabel.AutoSize = true;
-      this.recommenderLabel.Location = new System.Drawing.Point(6, 9);
-      this.recommenderLabel.Name = "recommenderLabel";
-      this.recommenderLabel.Size = new System.Drawing.Size(79, 13);
-      this.recommenderLabel.TabIndex = 9;
-      this.recommenderLabel.Text = "Recommender:";
-      // 
-      // suggestedInstancesComboBox
-      // 
-      this.suggestedInstancesComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.suggestedInstancesComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-      this.suggestedInstancesComboBox.FormattingEnabled = true;
-      this.suggestedInstancesComboBox.Location = new System.Drawing.Point(91, 33);
-      this.suggestedInstancesComboBox.Name = "suggestedInstancesComboBox";
-      this.suggestedInstancesComboBox.Size = new System.Drawing.Size(186, 21);
-      this.suggestedInstancesComboBox.TabIndex = 7;
-      this.suggestedInstancesComboBox.SelectedIndexChanged += new System.EventHandler(this.SuggestedInstancesComboBoxOnSelectedIndexChanged);
-      // 
-      // recommenderComboBox
-      // 
-      this.recommenderComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.recommenderComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-      this.recommenderComboBox.FormattingEnabled = true;
-      this.recommenderComboBox.Location = new System.Drawing.Point(91, 6);
-      this.recommenderComboBox.Name = "recommenderComboBox";
-      this.recommenderComboBox.Size = new System.Drawing.Size(154, 21);
-      this.recommenderComboBox.TabIndex = 7;
-      this.recommenderComboBox.SelectedIndexChanged += new System.EventHandler(this.RecommenderComboBoxOnSelectedIndexChanged);
-      // 
-      // solverSplitContainer
-      // 
-      this.solverSplitContainer.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.solverSplitContainer.Location = new System.Drawing.Point(0, 56);
-      this.solverSplitContainer.Name = "solverSplitContainer";
-      // 
-      // solverSplitContainer.Panel1
-      // 
-      this.solverSplitContainer.Panel1.Controls.Add(this.recommenderViewHost);
-      this.solverSplitContainer.Panel1.Controls.Add(this.instanceLabel);
-      this.solverSplitContainer.Panel1.Controls.Add(this.recommenderLabel);
-      this.solverSplitContainer.Panel1.Controls.Add(this.recommenderComboBox);
-      this.solverSplitContainer.Panel1.Controls.Add(this.algorithmCloneButton);
-      this.solverSplitContainer.Panel1.Controls.Add(this.suggestedInstancesComboBox);
-      this.solverSplitContainer.Panel1.Controls.Add(this.recommendRefreshButton);
-      this.solverSplitContainer.Panel1.Controls.Add(this.algorithmStartButton);
-      this.solverSplitContainer.Panel1.Padding = new System.Windows.Forms.Padding(3);
-      // 
-      // solverSplitContainer.Panel2
-      // 
-      this.solverSplitContainer.Panel2.Controls.Add(this.solverTabControl);
-      this.solverSplitContainer.Panel2.Padding = new System.Windows.Forms.Padding(3);
-      this.solverSplitContainer.Size = new System.Drawing.Size(849, 508);
-      this.solverSplitContainer.SplitterDistance = 283;
-      this.solverSplitContainer.TabIndex = 17;
-      // 
-      // recommenderViewHost
-      // 
-      this.recommenderViewHost.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.recommenderViewHost.Caption = "View";
-      this.recommenderViewHost.Content = null;
-      this.recommenderViewHost.Enabled = false;
-      this.recommenderViewHost.Location = new System.Drawing.Point(6, 89);
-      this.recommenderViewHost.Name = "recommenderViewHost";
-      this.recommenderViewHost.ReadOnly = false;
-      this.recommenderViewHost.Size = new System.Drawing.Size(271, 412);
-      this.recommenderViewHost.TabIndex = 16;
-      this.recommenderViewHost.ViewsLabelVisible = true;
-      this.recommenderViewHost.ViewType = null;
-      // 
-      // instanceLabel
-      // 
-      this.instanceLabel.AutoSize = true;
-      this.instanceLabel.Location = new System.Drawing.Point(6, 36);
-      this.instanceLabel.Name = "instanceLabel";
-      this.instanceLabel.Size = new System.Drawing.Size(51, 13);
-      this.instanceLabel.TabIndex = 9;
-      this.instanceLabel.Text = "Instance:";
-      // 
-      // recommendRefreshButton
-      // 
-      this.recommendRefreshButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.recommendRefreshButton.Location = new System.Drawing.Point(251, 6);
-      this.recommendRefreshButton.Name = "recommendRefreshButton";
-      this.recommendRefreshButton.Size = new System.Drawing.Size(26, 23);
-      this.recommendRefreshButton.TabIndex = 10;
-      this.recommendRefreshButton.Text = "Start";
-      this.recommendRefreshButton.UseVisualStyleBackColor = true;
-      this.recommendRefreshButton.Click += new System.EventHandler(this.button1_Click);
-      // 
       // SolverView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.solverSplitContainer);
+      this.Controls.Add(this.solverTabControl);
+      this.Controls.Add(this.algorithmCloneButton);
+      this.Controls.Add(this.instanceLabel);
+      this.Controls.Add(this.algorithmStartButton);
       this.Controls.Add(this.minTargetView);
       this.Controls.Add(this.maxEvaluationsView);
+      this.Controls.Add(this.suggestedInstancesComboBox);
       this.Controls.Add(this.seedingStrategyPanel);
       this.Controls.Add(this.minimumTargetLabel);
@@ -495 +413 @@
       this.parametersTabPage.ResumeLayout(false);
       this.operatorGraphTabPage.ResumeLayout(false);
-      this.solverSplitContainer.Panel1.ResumeLayout(false);
-      this.solverSplitContainer.Panel1.PerformLayout();
-      this.solverSplitContainer.Panel2.ResumeLayout(false);
-      ((System.ComponentModel.ISupportInitialize)(this.solverSplitContainer)).EndInit();
-      this.solverSplitContainer.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -508 +421 @@
 
     private System.Windows.Forms.Panel seedingStrategyPanel;
+    private System.Windows.Forms.Button algorithmStartButton;
+    private System.Windows.Forms.Label seedingStrategyLabel;
+    private System.Windows.Forms.Label evaluationsLimitabel;
+    private System.Windows.Forms.ComboBox suggestedInstancesComboBox;
+    private System.Windows.Forms.Button algorithmCloneButton;
+    private Data.Views.StringConvertibleValueView maxEvaluationsView;
+    private System.Windows.Forms.Label minimumTargetLabel;
+    private Data.Views.StringConvertibleValueView minTargetView;
+    private System.Windows.Forms.Label instanceLabel;
     private MainForm.WindowsForms.DragOverTabControl solverTabControl;
     private System.Windows.Forms.TabPage resultsTabPage;
+    private System.Windows.Forms.CheckBox showOnlyFinalResultCheckBox;
+    private WeifenLuo.WinFormsUI.Docking.DockPanel resultsDockPanel;
+    private System.Windows.Forms.TabPage runsTabPage;
+    private Optimization.Views.RunCollectionView runsView;
+    private System.Windows.Forms.TabPage seededRunsTabPage;
+    private Optimization.Views.RunCollectionView seededRunsView;
     private System.Windows.Forms.TabPage solutionSeedingTabPage;
     private System.Windows.Forms.TabPage parametersTabPage;
@@ -515 +443 @@
     private System.Windows.Forms.TabPage operatorGraphTabPage;
     private MainForm.WindowsForms.ViewHost operatorGraphViewHost;
-    private System.Windows.Forms.Button algorithmStartButton;
-    private System.Windows.Forms.Label seedingStrategyLabel;
-    private System.Windows.Forms.Label evaluationsLimitabel;
-    private System.Windows.Forms.Label recommenderLabel;
-    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;
-    private System.Windows.Forms.Label minimumTargetLabel;
-    private Data.Views.StringConvertibleValueView minTargetView;
-    private System.Windows.Forms.ComboBox recommenderComboBox;
-    private System.Windows.Forms.SplitContainer solverSplitContainer;
-    private MainForm.WindowsForms.ViewHost recommenderViewHost;
-    private System.Windows.Forms.Label instanceLabel;
-    private System.Windows.Forms.Button recommendRefreshButton;
   }
 }

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

@@ -28 +28 @@
 using HeuristicLab.OptimizationExpertSystem.Common;
 using System;
+using System.Linq;
 using System.Windows.Forms;
 
@@ -44 +45 @@
       algorithmCloneButton.Text = string.Empty;
       algorithmCloneButton.Image = VSImageLibrary.Clone;
-      recommendRefreshButton.Text = string.Empty;
-      recommendRefreshButton.Image = VSImageLibrary.Refresh;
       seedingStrategyView = new EnumValueView<SeedingStrategyTypes>() {
         Dock = DockStyle.Fill
@@ -68 +67 @@
           seedingStrategyView.Content = null;
           seedingSolutionsView.Content = null;
-          recommenderViewHost.Content = null;
         } else {
           maxEvaluationsView.Content = Content.MaximumEvaluations;
@@ -76 +74 @@
           seedingStrategyView.Content = Content.SeedingStrategy;
           seedingSolutionsView.Content = Content.SolutionSeedingPool;
-          recommenderViewHost.Content = Content.AlgorithmInstanceRecommender;
         }
       } finally { SuppressEvents = false; }
       UpdateSuggestedInstancesCombobox();
-      UpdateRecommenderCombobox();
     }
 
@@ -91 +87 @@
     }
 
+    #region Update Controls
+    private void UpdateSuggestedInstancesCombobox() {
+      var prevSelection = (AlgorithmInstanceItem)suggestedInstancesComboBox.SelectedItem;
+      var prevNewIndex = -1;
+      suggestedInstancesComboBox.Items.Clear();
+      if (Content == null) return;
+
+      var ranking = Content.GetAlgorithmInstanceRanking().ToList();
+
+      for (var i = 0; i < ranking.Count; i++) {
+        suggestedInstancesComboBox.Items.Add(new AlgorithmInstanceItem(ranking[i]));
+        if (prevSelection == null || ranking[i].Item1.Name == prevSelection.Item.Item1.Name)
+          prevNewIndex = prevSelection == null ? 0 : i;
+      }
+      suggestedInstancesComboBox.SelectedIndex = prevNewIndex;
+    }
+    #endregion
+
+    #region Content Event Handlers
     protected override void OnAlgorithmInstanceStarted(IAlgorithm algorithm) {
       base.OnAlgorithmInstanceStarted(algorithm);
@@ -97 +112 @@
     }
 
-    protected override void OnSuggestedInstancesChanged() {
-      base.OnSuggestedInstancesChanged();
+    protected override void OnRecommendationModelChanged() {
+      base.OnRecommendationModelChanged();
       UpdateSuggestedInstancesCombobox();
     }
+    #endregion
 
-    private void UpdateSuggestedInstancesCombobox() {
-      var prevSelection = (IAlgorithm)suggestedInstancesComboBox.SelectedItem;
-      var prevNewIndex = -1;
-      suggestedInstancesComboBox.Items.Clear();
-      if (Content == null) return;
-
-      for (var i = 0; i < Content.AlgorithmInstances.Count; i++) {
-        suggestedInstancesComboBox.Items.Add(Content.AlgorithmInstances[i]);
-        if (prevSelection == null || Content.AlgorithmInstances[i].Name == prevSelection.Name)
-          prevNewIndex = prevSelection == null ? 0 : i;
-      }
-      if (prevNewIndex >= 0) suggestedInstancesComboBox.SelectedIndex = prevNewIndex;
-    }
-
-    private void UpdateRecommenderCombobox() {
-      var prevSelection = Content.AlgorithmInstanceRecommender;
-      var prevNewIndex = -1;
-      recommenderComboBox.Items.Clear();
-      if (Content == null) return;
-
-      /*var i = 0;
-      foreach (var type in ApplicationManager.Manager.GetTypes(typeof (IAlgorithmInstanceRecommender))) {
-        var r = (IAlgorithmInstanceRecommender)Activator.CreateInstance(type, BindingFlags.CreateInstance, Content);
-        recommenderComboBox.Items.Add(r);
-        if (prevSelection == null || type == prevSelection.GetType())
-          prevNewIndex = prevSelection == null ? 0 : i;
-        i++;
-      }
-      if (prevNewIndex >= 0) recommenderComboBox.SelectedIndex = prevNewIndex;*/
-      recommenderComboBox.Items.Add(new OverallBestRecommender(Content));
-      if (prevSelection is OverallBestRecommender) recommenderComboBox.SelectedIndex = recommenderComboBox.Items.Count - 1;
-      recommenderComboBox.Items.Add(new KNearestNeighborRecommender(Content));
-      if (prevSelection is KNearestNeighborRecommender) recommenderComboBox.SelectedIndex = recommenderComboBox.Items.Count - 1;
-      recommenderComboBox.Items.Add(new DistanceWeightedRecommender(Content));
-      if (prevSelection is DistanceWeightedRecommender) recommenderComboBox.SelectedIndex = recommenderComboBox.Items.Count - 1;
-    }
-
+    #region Control Event Handlers
     private void AlgorithmStartButtonOnClick(object sender, EventArgs e) {
       if (suggestedInstancesComboBox.SelectedIndex >= 0)
-        Content.StartAlgorithmAsync(suggestedInstancesComboBox.SelectedIndex);
+        Content.StartAlgorithmAsync(Content.AlgorithmInstances.Select((a, i) => new { Alg = a, Index = i}).Single(x => x.Alg.Name == ((AlgorithmInstanceItem)suggestedInstancesComboBox.SelectedItem).Item.Item1.Name).Index);
     }
 
     private void AlgorithmCloneButtonOnClick(object sender, EventArgs e) {
       if (suggestedInstancesComboBox.SelectedIndex >= 0)
-        MainForm.ShowContent((IAlgorithm)Content.AlgorithmInstances[suggestedInstancesComboBox.SelectedIndex].Clone());
+        MainForm.ShowContent((IAlgorithm)Content.AlgorithmInstances[Content.AlgorithmInstances.Select((a, i) => new { Alg = a, Index = i }).Single(x => x.Alg.Name == ((AlgorithmInstanceItem)suggestedInstancesComboBox.SelectedItem).Item.Item1.Name).Index].Clone());
     }
 
@@ -152 +132 @@
       if (InvokeRequired) { Invoke((Action<object, EventArgs>)SuggestedInstancesComboBoxOnSelectedIndexChanged, sender, e); return; }
       if (suggestedInstancesComboBox.SelectedIndex >= 0) {
-        var alg = Content.AlgorithmInstances[suggestedInstancesComboBox.SelectedIndex];
+        var alg = Content.AlgorithmInstances[Content.AlgorithmInstances.Select((a, i) => new { Alg = a, Index = i }).Single(x => x.Alg.Name == ((AlgorithmInstanceItem)suggestedInstancesComboBox.SelectedItem).Item.Item1.Name).Index];
         solverParametersView.Content = alg.Parameters;
         var engineAlg = alg as EngineAlgorithm;
@@ -163 +143 @@
       SetEnabledStateOfControls();
     }
+    #endregion
 
-    private void RecommenderComboBoxOnSelectedIndexChanged(object sender, EventArgs e) {
-      if (InvokeRequired) { Invoke((Action<object, EventArgs>)RecommenderComboBoxOnSelectedIndexChanged, sender, e); return; }
-      if (recommenderComboBox.SelectedIndex < 0) return;
-      Content.AlgorithmInstanceRecommender = (IAlgorithmInstanceRecommender)recommenderComboBox.SelectedItem;
-      recommenderViewHost.Content = Content.AlgorithmInstanceRecommender;
-      Content.UpdateSuggestions();
+    #region Helper Classes and Methods
+    private class AlgorithmInstanceItem {
+      private readonly Tuple<IAlgorithm, double> item;
+      public Tuple<IAlgorithm, double> Item { get { return item; } }
+
+      public AlgorithmInstanceItem(Tuple<IAlgorithm, double> item) {
+        this.item = item;
+      }
+
+      public override string ToString() {
+        return item.Item2.ToString("F0") + ": " + item.Item1.Name;
+      }
     }
-
-    private void button1_Click(object sender, EventArgs e) {
-      Content.UpdateSuggestions();
-    }
+    #endregion
   }
 }

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

@@ -22 +22 @@
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
-using HeuristicLab.Core.Views;
 using HeuristicLab.Data;
 using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.OptimizationExpertSystem.Common;
 using System;
@@ -39 +39 @@
   public sealed partial class UnderstandingProblemInstanceView : KnowledgeCenterViewBase {
     private bool SuppressEvents { get; set; }
-    private readonly CheckedItemListView<StringValue> characteristicsView;
+    private readonly CheckedItemList<StringValue> characteristics;
  
     public UnderstandingProblemInstanceView() {
@@ -45 +45 @@
       showCharacteristicsCheckBox.Text = string.Empty;
       showCharacteristicsCheckBox.Image = VSImageLibrary.Properties;
-      characteristicsView = new CheckedItemListView<StringValue>() {
-        Dock = DockStyle.Fill
-      };
-      mapSplitContainer.Panel2.Controls.Add(characteristicsView);
+      characteristics = new CheckedItemList<StringValue>();
+      characteristics.CheckedItemsChanged += CharacteristicsOnCheckedItemsChanged;
+      mapSplitContainer.Panel2.Controls.Add(new ViewHost() {
+        Dock = DockStyle.Fill,
+        Content = characteristics
+      });
     }
 
     protected override void OnContentChanged() {
       base.OnContentChanged();
+      characteristics.Clear();
       if (Content == null) {
         problemInstancesView.Content = null;
-        characteristicsView.Content = null;
         instanceMapChart.Series["InstancesSeries"].Points.Clear();
         instanceMapChart.Series["CurrentInstanceSeries"].Points.Clear();
       } else {
         problemInstancesView.Content = Content.ProblemInstances;
-        characteristicsView.Content = Content.ProblemCharacteristics;
+        UpdateCharacteristics();
         UpdateProjectionComboBox();
         UpdateSizeComboBox();
@@ -67 +69 @@
     }
 
-    #region Content Event Handlers
-    protected override void OnProblemChanged() {
-      base.OnProblemChanged();
-      SetEnabledStateOfControls();
-    }
-
-    protected override void OnProblemInstancesChanged() {
-      base.OnProblemInstancesChanged();
-      if (Content.ProblemInstances.UpdateOfRunsInProgress) return;
-      UpdateProjectionComboBox();
-      UpdateSizeComboBox();
-      UpdateColorComboBox();
-      UpdateProjection();
-    }
-    #endregion
+    protected override void SetEnabledStateOfControls() {
+      base.SetEnabledStateOfControls();
+    }
+
+    #region Update Controls
+    private void UpdateCharacteristics() {
+      var @checked = new HashSet<string>(characteristics.CheckedItems.Select(x => x.Value.Value));
+      characteristics.Clear();
+      foreach (var c in Content.ProblemInstances.ResultNames) {
+        characteristics.Add(new StringValue(c), @checked.Contains(c));
+      }
+    }
 
     private void UpdateProjectionComboBox() {
@@ -126 +125 @@
       } finally { SuppressEvents = false; }
     }
-    
-    private IEnumerable<string> GetProjections() {
-      return Content.ProblemInstances
-        .SelectMany(x => x.Results.Where(y => Regex.IsMatch(y.Key, "^Projection[.].*[.][XY]$")))
-        .Select(x => Regex.Match(x.Key, "Projection[.](?<g>.*)[.][XY]").Groups["g"].Value)
-        .Distinct();
-    }
 
     private void UpdateProjection() {
@@ -153 +145 @@
         size, color, invPropCheckBox.Checked, fromZeroCheckBox.Checked);
     }
+    #endregion
+
+    #region Content Event Handlers
+    protected override void OnProblemChanged() {
+      base.OnProblemChanged();
+      SetEnabledStateOfControls();
+    }
+
+    protected override void OnProblemInstancesChanged() {
+      base.OnProblemInstancesChanged();
+      if (Content.ProblemInstances.UpdateOfRunsInProgress) return;
+      try {
+        SuppressEvents = true;
+        UpdateCharacteristics();
+      } finally { SuppressEvents = false; }
+      UpdateProjectionComboBox();
+      UpdateSizeComboBox();
+      UpdateColorComboBox();
+      UpdateProjection();
+    }
+    #endregion
+
+    #region Control Event Handlers
+    private void ProjectionComboBoxOnSelectedIndexChanged(object sender, EventArgs e) {
+      UpdateProjection();
+    }
+
+    private void SizeComboBoxOnSelectedIndexChanged(object sender, EventArgs e) {
+      UpdateProjection();
+    }
+
+    private void colorComboBox_SelectedIndexChanged(object sender, EventArgs e) {
+      UpdateProjection();
+    }
+
+    private void InvPropCheckBoxOnCheckedChanged(object sender, EventArgs e) {
+      UpdateProjection();
+    }
+
+    private void fromZeroCheckBox_CheckedChanged(object sender, EventArgs e) {
+      UpdateProjection();
+    }
+
+    private void showCharacteristicsCheckBox_CheckedChanged(object sender, EventArgs e) {
+      mapSplitContainer.Panel2Collapsed = !showCharacteristicsCheckBox.Checked;
+    }
+    #endregion
+
+    #region Other Event Handlers
+    private void CharacteristicsOnCheckedItemsChanged(object sender, EventArgs e) {
+      if (SuppressEvents) return;
+      if (characteristics.CheckedItems.Any())
+        Content.UpdateInstanceProjection(characteristics.CheckedItems.Select(x => x.Value.Value).ToArray());
+    }
+    #endregion
+
+    #region Helper Classes and Methods
+    private IEnumerable<string> GetProjections() {
+      return Content.ProblemInstances.ResultNames
+        .Where(x => Regex.IsMatch(x, "^Projection[.].*[.][XY]$"))
+        .Select(x => Regex.Match(x, "Projection[.](?<g>.*)[.][XY]").Groups["g"].Value)
+        .Distinct();
+    }
 
     private void DoProjectProblemInstances(Series instancesSeries, Series currentInstanceSeries, string projection, string size, string color, bool invProp, bool fromZero) {
@@ -160 +215 @@
       double maxSize = 0, minSize = 0;
       if (!string.IsNullOrEmpty(size)) {
-        var sizes = Content.ProblemInstances.Where(x => x.Results.ContainsKey(size)).Select(x => x.Results[size]).OfType<Data.DoubleValue>().Where(x => !double.IsNaN(x.Value)).ToList();
+        var sizes = Content.ProblemInstances.Where(x => x.Results.ContainsKey(size)).Select(x => x.Results[size]).OfType<DoubleValue>().Where(x => !double.IsNaN(x.Value)).ToList();
         if (sizes.Count > 0) {
           maxSize = sizes.Max(x => x.Value);
@@ -177 +232 @@
         var yKey = "Projection." + projection + ".Y";
         if (!run.Results.ContainsKey(xKey) || !run.Results.ContainsKey(yKey)
-            || !(run.Results[xKey] is Data.DoubleValue) || !(run.Results[yKey] is Data.DoubleValue)) continue;
-        var x = ((Data.DoubleValue)run.Results[xKey]).Value;
-        var y = ((Data.DoubleValue)run.Results[yKey]).Value;
+            || !(run.Results[xKey] is DoubleValue) || !(run.Results[yKey] is DoubleValue)) continue;
+        var x = ((DoubleValue)run.Results[xKey]).Value;
+        var y = ((DoubleValue)run.Results[yKey]).Value;
         var dataPoint = new DataPoint(x, y) {
           Label = run.Name,
@@ -185 +240 @@
         IItem item;
         if (maxSize > minSize && run.Results.TryGetValue(size, out item)) {
-          var dItem = item as Data.DoubleValue;
+          var dItem = item as DoubleValue;
           if (dItem == null && item is IntValue) dItem = new DoubleValue(((IntValue)item).Value);
           if (dItem != null) {
@@ -216 +271 @@
       }
     }
-
-    #region Control Event Handlers
-    private void ProjectionComboBoxOnSelectedIndexChanged(object sender, EventArgs e) {
-      UpdateProjection();
-    }
-
-    private void SizeComboBoxOnSelectedIndexChanged(object sender, EventArgs e) {
-      UpdateProjection();
-    }
-
-    private void colorComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-      UpdateProjection();
-    }
-
-    private void InvPropCheckBoxOnCheckedChanged(object sender, EventArgs e) {
-      UpdateProjection();
-    }
-
-    private void fromZeroCheckBox_CheckedChanged(object sender, EventArgs e) {
-      UpdateProjection();
-    }
-
-    private void showCharacteristicsCheckBox_CheckedChanged(object sender, EventArgs e) {
-      mapSplitContainer.Panel2Collapsed = !showCharacteristicsCheckBox.Checked;
-    }
     #endregion
   }

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

@@ -54 +54 @@
       UpdateSolutionVisualization();
     }
-
-    protected override void OnProblemChanged() {
-      base.OnProblemInstancesChanged();
-      UpdateSimilarityCalculators();
-      UpdateNamesComboboxes();
-      UpdateSolutionVisualization();
-    }
-
-    protected override void OnProblemSolutionsChanged() {
-      base.OnProblemSolutionsChanged();
-      UpdateNamesComboboxes();
-      UpdateSolutionVisualization();
-    }
-
-    protected override void OnSolutionSeedingPoolChanged() {
-      base.OnSolutionSeedingPoolChanged();
-      UpdateSolutionNetworkAnalysis(similarityComboBox.SelectedItem as ISolutionSimilarityCalculator, (string)solutionNetworkProjectionComboBox.SelectedItem, linesCheckBox.Checked, contrastTrackBar.Value, minimumTrackBar.Value);
-    }
-
+    
+    #region Update Controls
     private void UpdateSimilarityCalculators() {
       var selected = (ISolutionSimilarityCalculator)(similarityComboBox.SelectedIndex >= 0 ? similarityComboBox.SelectedItem : null);
@@ -280 +263 @@
       }
     }
-
+    #endregion
+
+    #region Content Event Handlers
+    protected override void OnProblemChanged() {
+      base.OnProblemInstancesChanged();
+      UpdateSimilarityCalculators();
+      UpdateNamesComboboxes();
+      UpdateSolutionVisualization();
+    }
+
+    protected override void OnProblemSolutionsChanged() {
+      base.OnProblemSolutionsChanged();
+      UpdateNamesComboboxes();
+      UpdateSolutionVisualization();
+    }
+
+    protected override void OnSolutionSeedingPoolChanged() {
+      base.OnSolutionSeedingPoolChanged();
+      UpdateSolutionNetworkAnalysis(similarityComboBox.SelectedItem as ISolutionSimilarityCalculator, (string)solutionNetworkProjectionComboBox.SelectedItem, linesCheckBox.Checked, contrastTrackBar.Value, minimumTrackBar.Value);
+    }
+    #endregion
+
+    #region Control Event Handlers
     private void SimilarityComboBoxOnSelectedIndexChanged(object sender, EventArgs e) {
       if (InvokeRequired) { Invoke((Action<object, EventArgs>)SimilarityComboBoxOnSelectedIndexChanged, sender, e); return; }
@@ -370 +375 @@
       }
     }
-
-    #region Helpers
+    #endregion
+
+    #region Helper Classes and Methods
     private List<IScope> GetSolutionScopes() {
       return Content.Problem.Solutions.Select(x => x.Solution).OfType<IScope>().ToList();