Changeset 13718

Timestamp:

03/18/16 16:15:10 (8 years ago)

Author:

abeham

Message:

#2457: worked on expert system

Location:

branches/PerformanceComparison

Files:

• HeuristicLab.OptimizationExpertSystem.Common/3.3/ExpertSystem.cs (modified) (3 diffs)
• HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystemView.Designer.cs (modified) (38 diffs)
• HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystemView.cs (modified) (15 diffs)
• HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystemView.resx (modified) (1 diff)
• HeuristicLab.OptimizationExpertSystem/3.3/HeuristicLab.OptimizationExpertSystem-3.3.csproj (modified) (5 diffs)
• HeuristicLab.OptimizationExpertSystem/3.3/HeuristicLab.OptimizationExpertSystem-3.3.csproj.user (modified) (1 diff)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu/0_Config (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu/0_Config/10_SetCredentialsMenuItem.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu/0_Config/20_SetProblemMenuItem.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu/0_Config/30_DownloadFromOkbMenuItem.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu/0_Config/40_AdministerOkbMenuItem.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu/100_Understanding (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu/100_Understanding/110_ProblemInstanceMenuItem.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu/100_Understanding/120_SolutionsMenuItem.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu/200_Solving (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu/200_Solving/210_SolverMenuItem.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu/300_Learning (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu/300_Learning/310_AlgorithmInstancesMenuItem.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu/900_Tools (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu/900_Tools/910_NewCSharpScriptMenuItem.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu/900_Tools/920_OpenCSharpScriptMenuItem.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu/900_Tools/930_SaveCSharpScriptMenuItem.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu/MenuItemBase.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/OptimizationExpertSystem.Designer.cs (modified) (1 diff)
• HeuristicLab.OptimizationExpertSystem/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.OptimizationExpertSystem/3.3/UnderstandingProblemInstanceView.Designer.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/UnderstandingProblemInstanceView.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/UnderstandingProblemInstanceView.resx (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Views (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Views/ExpertSystemViewBase.Designer.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Views/ExpertSystemViewBase.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Views/ExpertSystemViewBase.resx (added)

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/ExpertSystem.cs

@@ -251 +251 @@
       // It has to be decided somehow which problem instances to include in order to obtain the set of features that is expressive and available
       var allCharacteristics = ProblemInstances.Select(x => new HashSet<string>(x.Results.Where(y => y.Key.StartsWith("Characteristic.", StringComparison.Ordinal)).Select(y => y.Key))).ToList();
+      if (allCharacteristics.Count == 0) return;
+
       var commonCharacteristics = filter.Count > 0 ? filter : allCharacteristics[0];
       for (var i = 0; i < allCharacteristics.Count; i++)
@@ -446 +448 @@
     }
 
-    public async void UpdateKnowledgeBaseAsync(IProgress progress) {
+    public Task UpdateKnowledgeBaseAsync(IProgress progress = null) {
+      if (progress == null) progress = new Progress(string.Empty);
       progress.Start("Updating Knowledge Base from OKB");
-      await Task.Factory.StartNew(() => { DoUpdateKnowledgeBase(progress); }, TaskCreationOptions.LongRunning);
-    }
-
-    public void UpdateKnowledgeBase() {
-      DoUpdateKnowledgeBase(new Progress(string.Empty, ProgressState.Started));
+      OnDownloadStarted(progress);
+      return Task.Factory.StartNew(() => { DoUpdateKnowledgeBase(progress); }, TaskCreationOptions.LongRunning);
+    }
+
+    public void UpdateKnowledgeBase(IProgress progress = null) {
+      UpdateKnowledgeBaseAsync(progress).Wait();
     }
 
@@ -632 +636 @@
       if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName));
     }
+
+    public event EventHandler<EventArgs<IProgress>> DownloadStarted;
+    private void OnDownloadStarted(IProgress progress) {
+      var handler = DownloadStarted;
+      if (handler != null) handler(this, new EventArgs<IProgress>(progress));
+    }
   }
 }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystemView.Designer.cs

@@ -49 +49 @@
       System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
       System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
+      System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
       System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
       System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend();
-      System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
       System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series();
+      System.Windows.Forms.DataVisualization.Charting.Series series4 = new System.Windows.Forms.DataVisualization.Charting.Series();
       this.evaluationsLimitabel = new System.Windows.Forms.Label();
       this.maxEvaluationsTextBox = new System.Windows.Forms.TextBox();
@@ -64 +65 @@
       this.similarityComboBox = new System.Windows.Forms.ComboBox();
       this.solutionsTabControl = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl();
-      this.solutionsSeedingTabPage = new System.Windows.Forms.TabPage();
       this.solutionsQualityTabPage = new System.Windows.Forms.TabPage();
       this.solutionsQualityViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.solutionsLengthScaleTabPage = new System.Windows.Forms.TabPage();
+      this.solutionsLengthScaleViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.solutionsDiversityTabPage = new System.Windows.Forms.TabPage();
       this.solutionsDiversityViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.solutionsFdcTabPage = new System.Windows.Forms.TabPage();
+      this.fdcBetweenBestCheckBox = new System.Windows.Forms.CheckBox();
       this.solutionsFdcViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
-      this.solutionsLengthScaleTabPage = new System.Windows.Forms.TabPage();
-      this.solutionsLengthScaleViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.solutionsNetworkTabPage = new System.Windows.Forms.TabPage();
       this.solutionsNetworkChart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
       this.solversTabPage = new System.Windows.Forms.TabPage();
-      this.solversSplitContainer = new System.Windows.Forms.SplitContainer();
+      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.solutionSeedingTabPage = new System.Windows.Forms.TabPage();
+      this.parametersTabPage = new System.Windows.Forms.TabPage();
       this.solverParametersView = new HeuristicLab.Core.Views.ParameterCollectionView();
-      this.solverResultsView = new HeuristicLab.Optimization.Views.ResultCollectionView();
+      this.operatorGraphTabPage = new System.Windows.Forms.TabPage();
+      this.operatorGraphViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.algorithmCloneButton = new System.Windows.Forms.Button();
       this.algorithmStartButton = new System.Windows.Forms.Button();
+      this.label1 = new System.Windows.Forms.Label();
       this.algorithmSuggestionLabel = new System.Windows.Forms.Label();
       this.suggestedInstancesComboBox = new System.Windows.Forms.ComboBox();
@@ -99 +107 @@
       this.okbDownloadButton = new System.Windows.Forms.Button();
       this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
-      this.solutionsSeedingTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
-      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.tabControl.SuspendLayout();
       this.problemTabPage.SuspendLayout();
       this.solutionsTabPage.SuspendLayout();
       this.solutionsTabControl.SuspendLayout();
-      this.solutionsSeedingTabPage.SuspendLayout();
       this.solutionsQualityTabPage.SuspendLayout();
+      this.solutionsLengthScaleTabPage.SuspendLayout();
       this.solutionsDiversityTabPage.SuspendLayout();
       this.solutionsFdcTabPage.SuspendLayout();
-      this.solutionsLengthScaleTabPage.SuspendLayout();
       this.solutionsNetworkTabPage.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.solutionsNetworkChart)).BeginInit();
       this.solversTabPage.SuspendLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.solversSplitContainer)).BeginInit();
-      this.solversSplitContainer.Panel1.SuspendLayout();
-      this.solversSplitContainer.Panel2.SuspendLayout();
-      this.solversSplitContainer.SuspendLayout();
+      this.solverTabControl.SuspendLayout();
+      this.resultsTabPage.SuspendLayout();
+      this.parametersTabPage.SuspendLayout();
+      this.operatorGraphTabPage.SuspendLayout();
       this.runsTabPage.SuspendLayout();
       this.okbTabPage.SuspendLayout();
@@ -126 +131 @@
       this.SuspendLayout();
       // 
-      // nameTextBox
-      // 
-      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
-      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
-      this.nameTextBox.Location = new System.Drawing.Point(75, 0);
-      this.nameTextBox.Size = new System.Drawing.Size(592, 20);
-      // 
-      // infoLabel
-      // 
-      this.infoLabel.Location = new System.Drawing.Point(673, 3);
-      // 
       // evaluationsLimitabel
       // 
       this.evaluationsLimitabel.AutoSize = true;
-      this.evaluationsLimitabel.Location = new System.Drawing.Point(3, 29);
+      this.evaluationsLimitabel.Location = new System.Drawing.Point(5, 9);
       this.evaluationsLimitabel.Name = "evaluationsLimitabel";
       this.evaluationsLimitabel.Size = new System.Drawing.Size(66, 13);
@@ -150 +144 @@
       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(75, 26);
+      this.maxEvaluationsTextBox.Location = new System.Drawing.Point(110, 6);
       this.maxEvaluationsTextBox.Name = "maxEvaluationsTextBox";
-      this.maxEvaluationsTextBox.Size = new System.Drawing.Size(592, 20);
+      this.maxEvaluationsTextBox.Size = new System.Drawing.Size(564, 20);
       this.maxEvaluationsTextBox.TabIndex = 6;
       this.maxEvaluationsTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.MaxEvaluationsTextBoxOnValidating);
@@ -168 +162 @@
       this.tabControl.Controls.Add(this.okbTabPage);
       this.tabControl.Controls.Add(this.problemInstancesTabPage);
-      this.tabControl.Location = new System.Drawing.Point(0, 81);
+      this.tabControl.Location = new System.Drawing.Point(0, 32);
       this.tabControl.Name = "tabControl";
       this.tabControl.SelectedIndex = 0;
-      this.tabControl.Size = new System.Drawing.Size(689, 454);
+      this.tabControl.Size = new System.Drawing.Size(689, 503);
       this.tabControl.TabIndex = 17;
       // 
@@ -181 +175 @@
       this.problemTabPage.Name = "problemTabPage";
       this.problemTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.problemTabPage.Size = new System.Drawing.Size(681, 428);
+      this.problemTabPage.Size = new System.Drawing.Size(681, 477);
       this.problemTabPage.TabIndex = 1;
       this.problemTabPage.Text = "Problem";
@@ -195 +189 @@
       this.problemViewHost.Name = "problemViewHost";
       this.problemViewHost.ReadOnly = false;
-      this.problemViewHost.Size = new System.Drawing.Size(675, 422);
+      this.problemViewHost.Size = new System.Drawing.Size(675, 471);
       this.problemViewHost.TabIndex = 2;
       this.problemViewHost.ViewsLabelVisible = false;
@@ -210 +204 @@
       this.solutionsTabPage.Name = "solutionsTabPage";
       this.solutionsTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.solutionsTabPage.Size = new System.Drawing.Size(681, 428);
+      this.solutionsTabPage.Size = new System.Drawing.Size(681, 477);
       this.solutionsTabPage.TabIndex = 7;
       this.solutionsTabPage.Text = "Solutions";
@@ -261 +255 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.solutionsTabControl.Controls.Add(this.solutionsSeedingTabPage);
       this.solutionsTabControl.Controls.Add(this.solutionsQualityTabPage);
+      this.solutionsTabControl.Controls.Add(this.solutionsLengthScaleTabPage);
       this.solutionsTabControl.Controls.Add(this.solutionsDiversityTabPage);
       this.solutionsTabControl.Controls.Add(this.solutionsFdcTabPage);
-      this.solutionsTabControl.Controls.Add(this.solutionsLengthScaleTabPage);
       this.solutionsTabControl.Controls.Add(this.solutionsNetworkTabPage);
       this.solutionsTabControl.Location = new System.Drawing.Point(3, 33);
       this.solutionsTabControl.Name = "solutionsTabControl";
       this.solutionsTabControl.SelectedIndex = 0;
-      this.solutionsTabControl.Size = new System.Drawing.Size(675, 392);
+      this.solutionsTabControl.Size = new System.Drawing.Size(675, 441);
       this.solutionsTabControl.TabIndex = 0;
-      // 
-      // solutionsSeedingTabPage
-      // 
-      this.solutionsSeedingTabPage.Controls.Add(this.solutionsSeedingTableLayoutPanel);
-      this.solutionsSeedingTabPage.Location = new System.Drawing.Point(4, 22);
-      this.solutionsSeedingTabPage.Name = "solutionsSeedingTabPage";
-      this.solutionsSeedingTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.solutionsSeedingTabPage.Size = new System.Drawing.Size(667, 366);
-      this.solutionsSeedingTabPage.TabIndex = 6;
-      this.solutionsSeedingTabPage.Text = "Seeding";
-      this.solutionsSeedingTabPage.UseVisualStyleBackColor = true;
       // 
       // solutionsQualityTabPage
@@ -290 +272 @@
       this.solutionsQualityTabPage.Name = "solutionsQualityTabPage";
       this.solutionsQualityTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.solutionsQualityTabPage.Size = new System.Drawing.Size(667, 366);
+      this.solutionsQualityTabPage.Size = new System.Drawing.Size(667, 415);
       this.solutionsQualityTabPage.TabIndex = 1;
       this.solutionsQualityTabPage.Text = "Quality Analysis";
@@ -304 +286 @@
       this.solutionsQualityViewHost.Name = "solutionsQualityViewHost";
       this.solutionsQualityViewHost.ReadOnly = false;
-      this.solutionsQualityViewHost.Size = new System.Drawing.Size(661, 360);
+      this.solutionsQualityViewHost.Size = new System.Drawing.Size(661, 409);
       this.solutionsQualityViewHost.TabIndex = 0;
       this.solutionsQualityViewHost.ViewsLabelVisible = true;
       this.solutionsQualityViewHost.ViewType = null;
+      // 
+      // solutionsLengthScaleTabPage
+      // 
+      this.solutionsLengthScaleTabPage.Controls.Add(this.solutionsLengthScaleViewHost);
+      this.solutionsLengthScaleTabPage.Location = new System.Drawing.Point(4, 22);
+      this.solutionsLengthScaleTabPage.Name = "solutionsLengthScaleTabPage";
+      this.solutionsLengthScaleTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.solutionsLengthScaleTabPage.Size = new System.Drawing.Size(667, 415);
+      this.solutionsLengthScaleTabPage.TabIndex = 3;
+      this.solutionsLengthScaleTabPage.Text = "Length-Scale Analysis";
+      this.solutionsLengthScaleTabPage.UseVisualStyleBackColor = true;
+      // 
+      // solutionsLengthScaleViewHost
+      // 
+      this.solutionsLengthScaleViewHost.Caption = "View";
+      this.solutionsLengthScaleViewHost.Content = null;
+      this.solutionsLengthScaleViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.solutionsLengthScaleViewHost.Enabled = false;
+      this.solutionsLengthScaleViewHost.Location = new System.Drawing.Point(3, 3);
+      this.solutionsLengthScaleViewHost.Name = "solutionsLengthScaleViewHost";
+      this.solutionsLengthScaleViewHost.ReadOnly = false;
+      this.solutionsLengthScaleViewHost.Size = new System.Drawing.Size(661, 409);
+      this.solutionsLengthScaleViewHost.TabIndex = 0;
+      this.solutionsLengthScaleViewHost.ViewsLabelVisible = true;
+      this.solutionsLengthScaleViewHost.ViewType = null;
       // 
       // solutionsDiversityTabPage
@@ -315 +322 @@
       this.solutionsDiversityTabPage.Name = "solutionsDiversityTabPage";
       this.solutionsDiversityTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.solutionsDiversityTabPage.Size = new System.Drawing.Size(667, 366);
+      this.solutionsDiversityTabPage.Size = new System.Drawing.Size(667, 415);
       this.solutionsDiversityTabPage.TabIndex = 2;
       this.solutionsDiversityTabPage.Text = "Diversity Analysis";
@@ -329 +336 @@
       this.solutionsDiversityViewHost.Name = "solutionsDiversityViewHost";
       this.solutionsDiversityViewHost.ReadOnly = false;
-      this.solutionsDiversityViewHost.Size = new System.Drawing.Size(661, 360);
+      this.solutionsDiversityViewHost.Size = new System.Drawing.Size(661, 409);
       this.solutionsDiversityViewHost.TabIndex = 1;
       this.solutionsDiversityViewHost.ViewsLabelVisible = true;
@@ -336 +343 @@
       // solutionsFdcTabPage
       // 
+      this.solutionsFdcTabPage.Controls.Add(this.fdcBetweenBestCheckBox);
       this.solutionsFdcTabPage.Controls.Add(this.solutionsFdcViewHost);
       this.solutionsFdcTabPage.Location = new System.Drawing.Point(4, 22);
       this.solutionsFdcTabPage.Name = "solutionsFdcTabPage";
       this.solutionsFdcTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.solutionsFdcTabPage.Size = new System.Drawing.Size(667, 366);
+      this.solutionsFdcTabPage.Size = new System.Drawing.Size(667, 415);
       this.solutionsFdcTabPage.TabIndex = 5;
       this.solutionsFdcTabPage.Text = "Fitness-Distance Analysis";
       this.solutionsFdcTabPage.UseVisualStyleBackColor = true;
       // 
+      // fdcBetweenBestCheckBox
+      // 
+      this.fdcBetweenBestCheckBox.AutoSize = true;
+      this.fdcBetweenBestCheckBox.Location = new System.Drawing.Point(6, 6);
+      this.fdcBetweenBestCheckBox.Name = "fdcBetweenBestCheckBox";
+      this.fdcBetweenBestCheckBox.Size = new System.Drawing.Size(233, 17);
+      this.fdcBetweenBestCheckBox.TabIndex = 2;
+      this.fdcBetweenBestCheckBox.Text = "Calculate FDC between best solution(s) only";
+      this.fdcBetweenBestCheckBox.UseVisualStyleBackColor = true;
+      this.fdcBetweenBestCheckBox.CheckedChanged += new System.EventHandler(this.FdcBetweenBestCheckBoxOnCheckedChanged);
+      // 
       // solutionsFdcViewHost
       // 
+      this.solutionsFdcViewHost.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.solutionsFdcViewHost.Caption = "View";
       this.solutionsFdcViewHost.Content = null;
-      this.solutionsFdcViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
       this.solutionsFdcViewHost.Enabled = false;
-      this.solutionsFdcViewHost.Location = new System.Drawing.Point(3, 3);
+      this.solutionsFdcViewHost.Location = new System.Drawing.Point(3, 29);
       this.solutionsFdcViewHost.Name = "solutionsFdcViewHost";
       this.solutionsFdcViewHost.ReadOnly = false;
-      this.solutionsFdcViewHost.Size = new System.Drawing.Size(661, 360);
+      this.solutionsFdcViewHost.Size = new System.Drawing.Size(661, 386);
       this.solutionsFdcViewHost.TabIndex = 0;
       this.solutionsFdcViewHost.ViewsLabelVisible = true;
       this.solutionsFdcViewHost.ViewType = null;
-      // 
-      // solutionsLengthScaleTabPage
-      // 
-      this.solutionsLengthScaleTabPage.Controls.Add(this.solutionsLengthScaleViewHost);
-      this.solutionsLengthScaleTabPage.Location = new System.Drawing.Point(4, 22);
-      this.solutionsLengthScaleTabPage.Name = "solutionsLengthScaleTabPage";
-      this.solutionsLengthScaleTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.solutionsLengthScaleTabPage.Size = new System.Drawing.Size(667, 366);
-      this.solutionsLengthScaleTabPage.TabIndex = 3;
-      this.solutionsLengthScaleTabPage.Text = "Length-Scale Analysis";
-      this.solutionsLengthScaleTabPage.UseVisualStyleBackColor = true;
-      // 
-      // solutionsLengthScaleViewHost
-      // 
-      this.solutionsLengthScaleViewHost.Caption = "View";
-      this.solutionsLengthScaleViewHost.Content = null;
-      this.solutionsLengthScaleViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.solutionsLengthScaleViewHost.Enabled = false;
-      this.solutionsLengthScaleViewHost.Location = new System.Drawing.Point(3, 3);
-      this.solutionsLengthScaleViewHost.Name = "solutionsLengthScaleViewHost";
-      this.solutionsLengthScaleViewHost.ReadOnly = false;
-      this.solutionsLengthScaleViewHost.Size = new System.Drawing.Size(661, 360);
-      this.solutionsLengthScaleViewHost.TabIndex = 0;
-      this.solutionsLengthScaleViewHost.ViewsLabelVisible = true;
-      this.solutionsLengthScaleViewHost.ViewType = null;
       // 
       // solutionsNetworkTabPage
@@ -390 +386 @@
       this.solutionsNetworkTabPage.Name = "solutionsNetworkTabPage";
       this.solutionsNetworkTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.solutionsNetworkTabPage.Size = new System.Drawing.Size(667, 366);
+      this.solutionsNetworkTabPage.Size = new System.Drawing.Size(667, 415);
       this.solutionsNetworkTabPage.TabIndex = 4;
       this.solutionsNetworkTabPage.Text = "Network Analysis";
@@ -423 +419 @@
       series1.Name = "SolutionSeries";
       series1.YValuesPerPoint = 2;
+      series2.ChartArea = "SolutionsNetworkChartArea";
+      series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Bubble;
+      series2.IsValueShownAsLabel = true;
+      series2.Label = "#LABEL";
+      series2.Legend = "Legend1";
+      series2.MarkerStyle = System.Windows.Forms.DataVisualization.Charting.MarkerStyle.Cross;
+      series2.Name = "SeedingSolutionSeries";
+      series2.YValuesPerPoint = 2;
       this.solutionsNetworkChart.Series.Add(series1);
-      this.solutionsNetworkChart.Size = new System.Drawing.Size(661, 360);
+      this.solutionsNetworkChart.Series.Add(series2);
+      this.solutionsNetworkChart.Size = new System.Drawing.Size(661, 409);
       this.solutionsNetworkChart.TabIndex = 0;
       this.solutionsNetworkChart.Text = "enhancedChart1";
+      this.solutionsNetworkChart.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SolutionsNetworkChartOnMouseClick);
       // 
       // solversTabPage
       // 
-      this.solversTabPage.Controls.Add(this.solversSplitContainer);
+      this.solversTabPage.Controls.Add(this.seedingStrategyPanel);
+      this.solversTabPage.Controls.Add(this.solverTabControl);
       this.solversTabPage.Controls.Add(this.algorithmCloneButton);
       this.solversTabPage.Controls.Add(this.algorithmStartButton);
+      this.solversTabPage.Controls.Add(this.label1);
+      this.solversTabPage.Controls.Add(this.evaluationsLimitabel);
       this.solversTabPage.Controls.Add(this.algorithmSuggestionLabel);
+      this.solversTabPage.Controls.Add(this.maxEvaluationsTextBox);
       this.solversTabPage.Controls.Add(this.suggestedInstancesComboBox);
       this.solversTabPage.Location = new System.Drawing.Point(4, 22);
       this.solversTabPage.Name = "solversTabPage";
       this.solversTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.solversTabPage.Size = new System.Drawing.Size(681, 428);
+      this.solversTabPage.Size = new System.Drawing.Size(681, 477);
       this.solversTabPage.TabIndex = 4;
       this.solversTabPage.Text = "Solvers";
       this.solversTabPage.UseVisualStyleBackColor = true;
       // 
-      // solversSplitContainer
-      // 
-      this.solversSplitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+      // seedingStrategyPanel
+      // 
+      this.seedingStrategyPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.seedingStrategyPanel.Location = new System.Drawing.Point(110, 32);
+      this.seedingStrategyPanel.Name = "seedingStrategyPanel";
+      this.seedingStrategyPanel.Size = new System.Drawing.Size(564, 21);
+      this.seedingStrategyPanel.TabIndex = 5;
+      // 
+      // 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.solversSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
-      this.solversSplitContainer.Location = new System.Drawing.Point(3, 33);
-      this.solversSplitContainer.Name = "solversSplitContainer";
-      // 
-      // solversSplitContainer.Panel1
-      // 
-      this.solversSplitContainer.Panel1.Controls.Add(this.solverParametersView);
-      // 
-      // solversSplitContainer.Panel2
-      // 
-      this.solversSplitContainer.Panel2.Controls.Add(this.solverResultsView);
-      this.solversSplitContainer.Size = new System.Drawing.Size(675, 392);
-      this.solversSplitContainer.SplitterDistance = 300;
-      this.solversSplitContainer.TabIndex = 4;
+      this.solverTabControl.Controls.Add(this.resultsTabPage);
+      this.solverTabControl.Controls.Add(this.solutionSeedingTabPage);
+      this.solverTabControl.Controls.Add(this.parametersTabPage);
+      this.solverTabControl.Controls.Add(this.operatorGraphTabPage);
+      this.solverTabControl.Location = new System.Drawing.Point(2, 87);
+      this.solverTabControl.Name = "solverTabControl";
+      this.solverTabControl.SelectedIndex = 0;
+      this.solverTabControl.Size = new System.Drawing.Size(676, 387);
+      this.solverTabControl.TabIndex = 4;
+      // 
+      // resultsTabPage
+      // 
+      this.resultsTabPage.Controls.Add(this.solverResultsView);
+      this.resultsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.resultsTabPage.Name = "resultsTabPage";
+      this.resultsTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.resultsTabPage.Size = new System.Drawing.Size(668, 361);
+      this.resultsTabPage.TabIndex = 2;
+      this.resultsTabPage.Text = "Results";
+      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(662, 355);
+      this.solverResultsView.TabIndex = 1;
+      // 
+      // solutionSeedingTabPage
+      // 
+      this.solutionSeedingTabPage.Location = new System.Drawing.Point(4, 22);
+      this.solutionSeedingTabPage.Name = "solutionSeedingTabPage";
+      this.solutionSeedingTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.solutionSeedingTabPage.Size = new System.Drawing.Size(668, 361);
+      this.solutionSeedingTabPage.TabIndex = 1;
+      this.solutionSeedingTabPage.Text = "Seeding Pool";
+      this.solutionSeedingTabPage.UseVisualStyleBackColor = true;
+      // 
+      // parametersTabPage
+      // 
+      this.parametersTabPage.Controls.Add(this.solverParametersView);
+      this.parametersTabPage.Location = new System.Drawing.Point(4, 22);
+      this.parametersTabPage.Name = "parametersTabPage";
+      this.parametersTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.parametersTabPage.Size = new System.Drawing.Size(668, 361);
+      this.parametersTabPage.TabIndex = 0;
+      this.parametersTabPage.Text = "Parameters";
+      this.parametersTabPage.UseVisualStyleBackColor = true;
       // 
       // solverParametersView
@@ -469 +528 @@
       this.solverParametersView.Content = null;
       this.solverParametersView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.solverParametersView.Location = new System.Drawing.Point(0, 0);
+      this.solverParametersView.Location = new System.Drawing.Point(3, 3);
       this.solverParametersView.Name = "solverParametersView";
       this.solverParametersView.ReadOnly = true;
-      this.solverParametersView.ShowDetails = false;
-      this.solverParametersView.Size = new System.Drawing.Size(300, 392);
+      this.solverParametersView.ShowDetails = true;
+      this.solverParametersView.Size = new System.Drawing.Size(662, 355);
       this.solverParametersView.TabIndex = 0;
       // 
-      // 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(0, 0);
-      this.solverResultsView.Name = "solverResultsView";
-      this.solverResultsView.ReadOnly = true;
-      this.solverResultsView.ShowDetails = true;
-      this.solverResultsView.Size = new System.Drawing.Size(371, 392);
-      this.solverResultsView.TabIndex = 0;
+      // operatorGraphTabPage
+      // 
+      this.operatorGraphTabPage.Controls.Add(this.operatorGraphViewHost);
+      this.operatorGraphTabPage.Location = new System.Drawing.Point(4, 22);
+      this.operatorGraphTabPage.Name = "operatorGraphTabPage";
+      this.operatorGraphTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.operatorGraphTabPage.Size = new System.Drawing.Size(668, 361);
+      this.operatorGraphTabPage.TabIndex = 3;
+      this.operatorGraphTabPage.Text = "Operator Graph";
+      this.operatorGraphTabPage.UseVisualStyleBackColor = true;
+      // 
+      // operatorGraphViewHost
+      // 
+      this.operatorGraphViewHost.Caption = "View";
+      this.operatorGraphViewHost.Content = null;
+      this.operatorGraphViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.operatorGraphViewHost.Enabled = false;
+      this.operatorGraphViewHost.Location = new System.Drawing.Point(3, 3);
+      this.operatorGraphViewHost.Name = "operatorGraphViewHost";
+      this.operatorGraphViewHost.ReadOnly = true;
+      this.operatorGraphViewHost.Size = new System.Drawing.Size(662, 355);
+      this.operatorGraphViewHost.TabIndex = 0;
+      this.operatorGraphViewHost.ViewsLabelVisible = true;
+      this.operatorGraphViewHost.ViewType = null;
       // 
       // algorithmCloneButton
       // 
       this.algorithmCloneButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.algorithmCloneButton.Location = new System.Drawing.Point(649, 5);
+      this.algorithmCloneButton.Location = new System.Drawing.Point(648, 58);
       this.algorithmCloneButton.Name = "algorithmCloneButton";
       this.algorithmCloneButton.Size = new System.Drawing.Size(26, 23);
@@ -502 +574 @@
       // 
       this.algorithmStartButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.algorithmStartButton.Location = new System.Drawing.Point(617, 5);
+      this.algorithmStartButton.Location = new System.Drawing.Point(616, 58);
       this.algorithmStartButton.Name = "algorithmStartButton";
       this.algorithmStartButton.Size = new System.Drawing.Size(26, 23);
@@ -510 +582 @@
       this.algorithmStartButton.Click += new System.EventHandler(this.AlgorithmStartButtonOnClick);
       // 
+      // label1
+      // 
+      this.label1.AutoSize = true;
+      this.label1.Location = new System.Drawing.Point(5, 36);
+      this.label1.Name = "label1";
+      this.label1.Size = new System.Drawing.Size(91, 13);
+      this.label1.TabIndex = 1;
+      this.label1.Text = "Seeding Strategy:";
+      // 
       // algorithmSuggestionLabel
       // 
       this.algorithmSuggestionLabel.AutoSize = true;
-      this.algorithmSuggestionLabel.Location = new System.Drawing.Point(6, 9);
+      this.algorithmSuggestionLabel.Location = new System.Drawing.Point(5, 62);
       this.algorithmSuggestionLabel.Name = "algorithmSuggestionLabel";
       this.algorithmSuggestionLabel.Size = new System.Drawing.Size(99, 13);
@@ -525 +606 @@
       this.suggestedInstancesComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.suggestedInstancesComboBox.FormattingEnabled = true;
-      this.suggestedInstancesComboBox.Location = new System.Drawing.Point(111, 6);
+      this.suggestedInstancesComboBox.Location = new System.Drawing.Point(110, 59);
       this.suggestedInstancesComboBox.Name = "suggestedInstancesComboBox";
       this.suggestedInstancesComboBox.Size = new System.Drawing.Size(500, 21);
@@ -537 +618 @@
       this.runsTabPage.Name = "runsTabPage";
       this.runsTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.runsTabPage.Size = new System.Drawing.Size(681, 428);
+      this.runsTabPage.Size = new System.Drawing.Size(681, 477);
       this.runsTabPage.TabIndex = 3;
       this.runsTabPage.Text = "Runs";
@@ -550 +631 @@
       this.runsView.Name = "runsView";
       this.runsView.ReadOnly = false;
-      this.runsView.Size = new System.Drawing.Size(675, 422);
+      this.runsView.Size = new System.Drawing.Size(675, 471);
       this.runsView.TabIndex = 1;
       // 
@@ -559 +640 @@
       this.okbTabPage.Name = "okbTabPage";
       this.okbTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.okbTabPage.Size = new System.Drawing.Size(681, 428);
+      this.okbTabPage.Size = new System.Drawing.Size(681, 477);
       this.okbTabPage.TabIndex = 5;
       this.okbTabPage.Text = "Knowledge Base";
@@ -573 +654 @@
       this.kbViewHost.Name = "kbViewHost";
       this.kbViewHost.ReadOnly = true;
-      this.kbViewHost.Size = new System.Drawing.Size(675, 422);
+      this.kbViewHost.Size = new System.Drawing.Size(675, 471);
       this.kbViewHost.TabIndex = 3;
       this.kbViewHost.ViewsLabelVisible = true;
@@ -587 +668 @@
       this.problemInstancesTabPage.Name = "problemInstancesTabPage";
       this.problemInstancesTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.problemInstancesTabPage.Size = new System.Drawing.Size(681, 428);
+      this.problemInstancesTabPage.Size = new System.Drawing.Size(681, 477);
       this.problemInstancesTabPage.TabIndex = 6;
       this.problemInstancesTabPage.Text = "Problem Instances";
@@ -622 +703 @@
       this.problemInstancesTabControl.Name = "problemInstancesTabControl";
       this.problemInstancesTabControl.SelectedIndex = 0;
-      this.problemInstancesTabControl.Size = new System.Drawing.Size(675, 390);
+      this.problemInstancesTabControl.Size = new System.Drawing.Size(675, 439);
       this.problemInstancesTabControl.TabIndex = 4;
       // 
@@ -631 +712 @@
       this.instancesTabPage.Name = "instancesTabPage";
       this.instancesTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.instancesTabPage.Size = new System.Drawing.Size(667, 364);
+      this.instancesTabPage.Size = new System.Drawing.Size(667, 413);
       this.instancesTabPage.TabIndex = 0;
       this.instancesTabPage.Text = "Instances";
@@ -645 +726 @@
       this.problemInstancesView.Name = "problemInstancesView";
       this.problemInstancesView.ReadOnly = false;
-      this.problemInstancesView.Size = new System.Drawing.Size(661, 358);
+      this.problemInstancesView.Size = new System.Drawing.Size(661, 407);
       this.problemInstancesView.TabIndex = 0;
       this.problemInstancesView.ViewsLabelVisible = true;
@@ -656 +737 @@
       this.mapTabPage.Name = "mapTabPage";
       this.mapTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.mapTabPage.Size = new System.Drawing.Size(667, 364);
+      this.mapTabPage.Size = new System.Drawing.Size(667, 413);
       this.mapTabPage.TabIndex = 1;
       this.mapTabPage.Text = "Map";
@@ -676 +757 @@
       this.instanceMapChart.Location = new System.Drawing.Point(3, 3);
       this.instanceMapChart.Name = "instanceMapChart";
-      series2.ChartArea = "Default";
-      series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Point;
-      series2.Legend = "Legend";
-      series2.MarkerSize = 10;
-      series2.Name = "InstancesSeries";
       series3.ChartArea = "Default";
       series3.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Point;
       series3.Legend = "Legend";
-      series3.MarkerColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-      series3.MarkerSize = 15;
-      series3.MarkerStyle = System.Windows.Forms.DataVisualization.Charting.MarkerStyle.Cross;
-      series3.Name = "CurrentInstanceSeries";
-      this.instanceMapChart.Series.Add(series2);
+      series3.MarkerSize = 10;
+      series3.Name = "InstancesSeries";
+      series4.ChartArea = "Default";
+      series4.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Point;
+      series4.Legend = "Legend";
+      series4.MarkerColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+      series4.MarkerSize = 15;
+      series4.MarkerStyle = System.Windows.Forms.DataVisualization.Charting.MarkerStyle.Cross;
+      series4.Name = "CurrentInstanceSeries";
       this.instanceMapChart.Series.Add(series3);
-      this.instanceMapChart.Size = new System.Drawing.Size(661, 358);
+      this.instanceMapChart.Series.Add(series4);
+      this.instanceMapChart.Size = new System.Drawing.Size(661, 407);
       this.instanceMapChart.TabIndex = 0;
       // 
@@ -708 +789 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.progressPanel.Location = new System.Drawing.Point(0, 81);
+      this.progressPanel.Location = new System.Drawing.Point(0, 32);
       this.progressPanel.Name = "progressPanel";
-      this.progressPanel.Size = new System.Drawing.Size(692, 454);
+      this.progressPanel.Size = new System.Drawing.Size(692, 503);
       this.progressPanel.TabIndex = 2;
       this.progressPanel.Visible = false;
@@ -718 +799 @@
       this.okbDownloadButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.okbDownloadButton.Location = new System.Drawing.Point(6, 52);
+      this.okbDownloadButton.Location = new System.Drawing.Point(3, 3);
       this.okbDownloadButton.Name = "okbDownloadButton";
-      this.okbDownloadButton.Size = new System.Drawing.Size(661, 23);
+      this.okbDownloadButton.Size = new System.Drawing.Size(686, 23);
       this.okbDownloadButton.TabIndex = 1;
       this.okbDownloadButton.Text = "Download from OKB";
@@ -733 +814 @@
       this.openFileDialog.Title = "Open Optimizer";
       // 
-      // solutionsSeedingTableLayoutPanel
-      // 
-      this.solutionsSeedingTableLayoutPanel.ColumnCount = 1;
-      this.solutionsSeedingTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-      this.solutionsSeedingTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.solutionsSeedingTableLayoutPanel.Location = new System.Drawing.Point(3, 3);
-      this.solutionsSeedingTableLayoutPanel.Name = "solutionsSeedingTableLayoutPanel";
-      this.solutionsSeedingTableLayoutPanel.RowCount = 2;
-      this.solutionsSeedingTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
-      this.solutionsSeedingTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());
-      this.solutionsSeedingTableLayoutPanel.Size = new System.Drawing.Size(661, 360);
-      this.solutionsSeedingTableLayoutPanel.TabIndex = 0;
-      // 
       // ExpertSystemView
       // 
@@ -751 +819 @@
       this.Controls.Add(this.okbDownloadButton);
       this.Controls.Add(this.tabControl);
-      this.Controls.Add(this.evaluationsLimitabel);
-      this.Controls.Add(this.maxEvaluationsTextBox);
       this.Controls.Add(this.progressPanel);
       this.Name = "ExpertSystemView";
       this.Size = new System.Drawing.Size(692, 535);
-      this.Controls.SetChildIndex(this.progressPanel, 0);
-      this.Controls.SetChildIndex(this.maxEvaluationsTextBox, 0);
-      this.Controls.SetChildIndex(this.evaluationsLimitabel, 0);
-      this.Controls.SetChildIndex(this.tabControl, 0);
-      this.Controls.SetChildIndex(this.nameLabel, 0);
-      this.Controls.SetChildIndex(this.okbDownloadButton, 0);
-      this.Controls.SetChildIndex(this.nameTextBox, 0);
-      this.Controls.SetChildIndex(this.infoLabel, 0);
-      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.tabControl.ResumeLayout(false);
       this.problemTabPage.ResumeLayout(false);
@@ -770 +827 @@
       this.solutionsTabPage.PerformLayout();
       this.solutionsTabControl.ResumeLayout(false);
-      this.solutionsSeedingTabPage.ResumeLayout(false);
       this.solutionsQualityTabPage.ResumeLayout(false);
+      this.solutionsLengthScaleTabPage.ResumeLayout(false);
       this.solutionsDiversityTabPage.ResumeLayout(false);
       this.solutionsFdcTabPage.ResumeLayout(false);
-      this.solutionsLengthScaleTabPage.ResumeLayout(false);
+      this.solutionsFdcTabPage.PerformLayout();
       this.solutionsNetworkTabPage.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.solutionsNetworkChart)).EndInit();
       this.solversTabPage.ResumeLayout(false);
       this.solversTabPage.PerformLayout();
-      this.solversSplitContainer.Panel1.ResumeLayout(false);
-      this.solversSplitContainer.Panel2.ResumeLayout(false);
-      ((System.ComponentModel.ISupportInitialize)(this.solversSplitContainer)).EndInit();
-      this.solversSplitContainer.ResumeLayout(false);
+      this.solverTabControl.ResumeLayout(false);
+      this.resultsTabPage.ResumeLayout(false);
+      this.parametersTabPage.ResumeLayout(false);
+      this.operatorGraphTabPage.ResumeLayout(false);
       this.runsTabPage.ResumeLayout(false);
       this.okbTabPage.ResumeLayout(false);
@@ -792 +849 @@
       ((System.ComponentModel.ISupportInitialize)(this.instanceMapChart)).EndInit();
       this.ResumeLayout(false);
-      this.PerformLayout();
 
     }
@@ -838 +894 @@
     private Visualization.ChartControlsExtensions.EnhancedChart solutionsNetworkChart;
     private System.Windows.Forms.Button algorithmCloneButton;
-    private System.Windows.Forms.SplitContainer solversSplitContainer;
-    private Core.Views.ParameterCollectionView solverParametersView;
-    private Optimization.Views.ResultCollectionView solverResultsView;
     private System.Windows.Forms.Label solutionNameLabel;
     private System.Windows.Forms.ComboBox solutionNameComboBox;
-    private System.Windows.Forms.TabPage solutionsSeedingTabPage;
-    private System.Windows.Forms.TableLayoutPanel solutionsSeedingTableLayoutPanel;
+    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;
+    private Core.Views.ParameterCollectionView solverParametersView;
+    private System.Windows.Forms.Panel seedingStrategyPanel;
+    private System.Windows.Forms.Label label1;
+    private System.Windows.Forms.TabPage operatorGraphTabPage;
+    private MainForm.WindowsForms.ViewHost operatorGraphViewHost;
+    private System.Windows.Forms.CheckBox fdcBetweenBestCheckBox;
   }
 }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystemView.cs

@@ -40 +40 @@
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
-using DoubleValue = HeuristicLab.Data.DoubleValue;
 
 namespace HeuristicLab.OptimizationExpertSystem {
-  [View("Expert-system Optimizer View")]
+  [View("Knowledge Center (all-in-one view)")]
   [Content(typeof(ExpertSystem), IsDefaultView = true)]
-  public partial class ExpertSystemView : NamedItemView {
+  public partial class ExpertSystemView : ItemView {
     private EnumValueView<SeedingStrategyTypes> seedingStrategyView;
     private CheckedItemListView<IScope> seedingSolutionsView;
@@ -72 +71 @@
         Dock = DockStyle.Fill
       };
-      solutionsSeedingTableLayoutPanel.SuspendLayout();
-      solutionsSeedingTableLayoutPanel.Controls.Add(seedingStrategyView, 0, 0);
-      solutionsSeedingTableLayoutPanel.Controls.Add(seedingSolutionsView, 0, 1);
-      solutionsSeedingTableLayoutPanel.ResumeLayout(true);
+      seedingStrategyPanel.Controls.Add(seedingStrategyView);
+      solutionSeedingTabPage.Controls.Add(seedingSolutionsView);
     }
 
@@ -86 +83 @@
       Content.SuggestedInstances.ItemsRemoved -= SuggestedInstancesOnChanged;
       Content.SuggestedInstances.ItemsReplaced -= SuggestedInstancesOnChanged;
+      Content.SolutionSeedingPool.CollectionReset -= SeedingPoolOnChanged;
+      Content.SolutionSeedingPool.ItemsAdded -= SeedingPoolOnChanged;
+      Content.SolutionSeedingPool.ItemsRemoved -= SeedingPoolOnChanged;
+      Content.SolutionSeedingPool.ItemsReplaced -= SeedingPoolOnChanged;
+      Content.SolutionSeedingPool.CheckedItemsChanged -= SeedingPoolOnChanged;
       DeregisterProblemEvents(Content.Problem);
       base.DeregisterContentEvents();
@@ -98 +100 @@
       Content.SuggestedInstances.ItemsRemoved += SuggestedInstancesOnChanged;
       Content.SuggestedInstances.ItemsReplaced += SuggestedInstancesOnChanged;
+      Content.SolutionSeedingPool.CollectionReset += SeedingPoolOnChanged;
+      Content.SolutionSeedingPool.ItemsAdded += SeedingPoolOnChanged;
+      Content.SolutionSeedingPool.ItemsRemoved += SeedingPoolOnChanged;
+      Content.SolutionSeedingPool.ItemsReplaced += SeedingPoolOnChanged;
+      Content.SolutionSeedingPool.CheckedItemsChanged += SeedingPoolOnChanged;
       RegisterProblemEvents(Content.Problem);
     }
@@ -201 +208 @@
     }
 
+    private void SeedingPoolOnChanged(object sender, EventArgs e) {
+      UpdateSolutionVisualization();
+    }
+
     private void SolutionsOnChanged(object sender, EventArgs e) {
       UpdateNamesComboboxes();
@@ -217 +228 @@
       if (!int.TryParse(maxEvaluationsTextBox.Text, out value)) {
         e.Cancel = !maxEvaluationsTextBox.ReadOnly && maxEvaluationsTextBox.Enabled;
-        errorProvider.SetError(maxEvaluationsTextBox, "Please enter a valid integer number.");
+        //errorProvider.SetError(maxEvaluationsTextBox, "Please enter a valid integer number.");
       } else {
         Content.MaximumEvaluations = value;
         e.Cancel = false;
-        errorProvider.SetError(maxEvaluationsTextBox, null);
+        //errorProvider.SetError(maxEvaluationsTextBox, null);
       }
     }
@@ -299 +310 @@
       if (InvokeRequired) { Invoke((Action<object, EventArgs>)SuggestedInstancesComboBoxOnSelectedIndexChanged, sender, e); return; }
       if (suggestedInstancesComboBox.SelectedIndex >= 0) {
-        solverParametersView.Content = Content.SuggestedInstances[suggestedInstancesComboBox.SelectedIndex].Parameters;
-      } else solverParametersView.Content = null;
+        var alg = Content.SuggestedInstances[suggestedInstancesComboBox.SelectedIndex];
+        solverParametersView.Content = alg.Parameters;
+        var engineAlg = alg as EngineAlgorithm;
+        if (engineAlg != null) operatorGraphViewHost.Content = engineAlg.OperatorGraph;
+        else operatorGraphViewHost.Content = new Data.StringValue("Algorithm is not modeled as an operator graph.");
+      } else {
+        solverParametersView.Content = null;
+        operatorGraphViewHost.Content = null;
+      }
       SetEnabledStateOfControls();
     }
@@ -312 +330 @@
       }
       UpdateSolutionDiversityAnalysis(calculator);
-      UpdateSolutionFdcAnalysis(calculator);
+      UpdateSolutionFdcAnalysis(calculator, fdcBetweenBestCheckBox.Checked);
       UpdateSolutionLengthScaleAnalysis(calculator);
       UpdateSolutionNetworkAnalysis(calculator);
+    }
+
+    private void FdcBetweenBestCheckBoxOnCheckedChanged(object sender, EventArgs e) {
+      if (InvokeRequired) { Invoke((Action<object, EventArgs>)FdcBetweenBestCheckBoxOnCheckedChanged, sender, e); return; }
+      UpdateSolutionFdcAnalysis((ISolutionSimilarityCalculator)similarityComboBox.SelectedItem, fdcBetweenBestCheckBox.Checked);
+    }
+
+    private void SolutionsNetworkChartOnMouseClick(object sender, MouseEventArgs e) {
+      var result = solutionsNetworkChart.HitTest(e.X, e.Y);
+      if (result.ChartElementType == ChartElementType.DataPoint) {
+        var point = (DataPoint)result.Object;
+        var solutionScope = point.Tag as IScope;
+        if (solutionScope == null || !Content.SolutionSeedingPool.Contains(solutionScope)) return;
+        Content.SolutionSeedingPool.SetItemCheckedState(solutionScope, !Content.SolutionSeedingPool.ItemChecked(solutionScope));
+      }
     }
     #endregion
@@ -386 +419 @@
         var calculator = (ISolutionSimilarityCalculator)similarityComboBox.SelectedItem;
         UpdateSolutionDiversityAnalysis(calculator);
-        UpdateSolutionFdcAnalysis(calculator);
+        UpdateSolutionFdcAnalysis(calculator, fdcBetweenBestCheckBox.Checked);
         UpdateSolutionLengthScaleAnalysis(calculator);
         UpdateSolutionNetworkAnalysis(calculator);
@@ -403 +436 @@
         solutionsQualityViewHost.Content = dt;
       }
-      QualityDistributionAnalyzer.UpdateTable(dt, Content.Problem.Solutions.Select(x => x.Solution).OfType<IScope>().Where(x => x.Variables.ContainsKey(qualityName)).Select(x => x.Variables[qualityName].Value).OfType<DoubleValue>().Select(x => x.Value));
+      QualityDistributionAnalyzer.UpdateTable(dt, GetSolutionScopes().Select(x => GetQuality(x, qualityName) ?? double.NaN).Where(x => !double.IsNaN(x)));
     }
 
@@ -409 +442 @@
       try {
         solutionsDiversityViewHost.Content = null;
-        var similarities = new double[Content.Problem.Solutions.Count, Content.Problem.Solutions.Count];
-        for (int i = 0; i < Content.Problem.Solutions.Count; i++) {
-          for (int j = 0; j < Content.Problem.Solutions.Count; j++)
-            similarities[i, j] = calculator.CalculateSolutionSimilarity((IScope)Content.Problem.Solutions[i].Solution, (IScope)Content.Problem.Solutions[j].Solution);
+        var solutionScopes = GetSolutionScopes();
+        var similarities = new double[solutionScopes.Count, solutionScopes.Count];
+        for (var i = 0; i < solutionScopes.Count; i++) {
+          for (var j = 0; j < solutionScopes.Count; j++)
+            similarities[i, j] = calculator.CalculateSolutionSimilarity(solutionScopes[i], solutionScopes[j]);
         }
         var hm = new HeatMap(similarities, "Solution Similarities", 0.0, 1.0);
@@ -419 +453 @@
     }
 
-    private void UpdateSolutionFdcAnalysis(ISolutionSimilarityCalculator calculator) {
+    private void UpdateSolutionFdcAnalysis(ISolutionSimilarityCalculator calculator, bool distanceToBest) {
       try {
         solutionsFdcViewHost.Content = null;
+        var solutionScopes = GetSolutionScopes();
         var points = new List<Point2D<double>>();
-        for (int i = 0; i < Content.Problem.Solutions.Count; i++) {
-          for (int j = 0; j < Content.Problem.Solutions.Count; j++) {
-            if (i == j) continue;
-            var qDiff = Math.Abs(((DoubleValue)((IScope)Content.Problem.Solutions[i].Solution).Variables[calculator.QualityVariableName].Value).Value
-              - ((DoubleValue)((IScope)Content.Problem.Solutions[j].Solution).Variables[calculator.QualityVariableName].Value).Value);
-            points.Add(new Point2D<double>(qDiff, 1.0 - calculator.CalculateSolutionSimilarity((IScope)Content.Problem.Solutions[i].Solution, (IScope)Content.Problem.Solutions[j].Solution)));
+        if (distanceToBest) {
+          var maximization = ((IValueParameter<Data.BoolValue>)Content.Problem.MaximizationParameter).Value.Value;
+          var bestSolutions = (maximization ? solutionScopes.MaxItems(x => GetQuality(x, calculator.QualityVariableName) ?? double.NegativeInfinity)
+                                            : solutionScopes.MinItems(x => GetQuality(x, calculator.QualityVariableName) ?? double.PositiveInfinity)).ToList();
+          foreach (var solScope in solutionScopes.Except(bestSolutions)) {
+            var maxSimilarity = bestSolutions.Max(x => calculator.CalculateSolutionSimilarity(solScope, x));
+            var qDiff = (GetQuality(solScope, calculator.QualityVariableName) ?? double.NaN)
+                      - (GetQuality(bestSolutions[0], calculator.QualityVariableName) ?? double.NaN);
+            points.Add(new Point2D<double>(Math.Abs(qDiff), 1.0 - maxSimilarity));
+          }
+        } else {
+          for (int i = 0; i < solutionScopes.Count; i++) {
+            for (int j = 0; j < solutionScopes.Count; j++) {
+              if (i == j) continue;
+              var qDiff = (GetQuality(solutionScopes[i], calculator.QualityVariableName) ?? double.NaN)
+                          - (GetQuality(solutionScopes[j], calculator.QualityVariableName) ?? double.NaN);
+              if (double.IsNaN(qDiff)) continue;
+              points.Add(new Point2D<double>(Math.Abs(qDiff), 1.0 - calculator.CalculateSolutionSimilarity(solutionScopes[i], solutionScopes[j])));
+            }
           }
         }
@@ -434 +482 @@
         splot.VisualProperties.XAxisTitle = "Absolute Fitness Difference";
         splot.VisualProperties.XAxisMinimumFixedValue = 0.0;
+        splot.VisualProperties.XAxisMinimumAuto = false;
         splot.VisualProperties.YAxisTitle = "Solution Distance";
         splot.VisualProperties.YAxisMinimumFixedValue = 0.0;
+        splot.VisualProperties.YAxisMinimumAuto = false;
         splot.VisualProperties.YAxisMaximumFixedValue = 1.0;
+        splot.VisualProperties.YAxisMaximumAuto = false;
         var row = new ScatterPlotDataRow("Fdc", "", points);
         row.VisualProperties.PointSize = 7;
@@ -452 +503 @@
           solutionsLengthScaleViewHost.Content = dt;
         }
-
         QualityDistributionAnalyzer.UpdateTable(dt, CalculateLengthScale(calculator));
-      } catch { }
+      } catch {
+        solutionsLengthScaleViewHost.Content = null;
+      }
     }
 
     private IEnumerable<double> CalculateLengthScale(ISolutionSimilarityCalculator calculator) {
-      for (int i = 0; i < Content.Problem.Solutions.Count; i++) {
-        for (int j = 0; j < Content.Problem.Solutions.Count; j++) {
+      var solutionScopes = GetSolutionScopes();
+      for (var i = 0; i < solutionScopes.Count; i++) {
+        for (var j = 0; j < solutionScopes.Count; j++) {
           if (i == j) continue;
-          var sim = calculator.CalculateSolutionSimilarity((IScope)Content.Problem.Solutions[i].Solution, (IScope)Content.Problem.Solutions[j].Solution);
+          var sim = calculator.CalculateSolutionSimilarity(solutionScopes[i], solutionScopes[j]);
           if (sim.IsAlmost(0)) continue;
-          var qDiff = Math.Abs(((DoubleValue)((IScope)Content.Problem.Solutions[i].Solution).Variables[calculator.QualityVariableName].Value).Value
-            - ((DoubleValue)((IScope)Content.Problem.Solutions[j].Solution).Variables[calculator.QualityVariableName].Value).Value);
-          yield return qDiff / sim;
+          var qDiff = (GetQuality(solutionScopes[i], calculator.QualityVariableName) ?? double.NaN)
+                    - (GetQuality(solutionScopes[j], calculator.QualityVariableName) ?? double.NaN);
+          if (!double.IsNaN(qDiff)) yield return Math.Abs(qDiff) / sim;
         }
       }
@@ -471 +524 @@
 
     private void UpdateSolutionNetworkAnalysis(ISolutionSimilarityCalculator calculator) {
+      var series = solutionsNetworkChart.Series["SolutionSeries"];
+      var seedingSeries = solutionsNetworkChart.Series["SeedingSolutionSeries"];
       try {
-        var series = solutionsNetworkChart.Series["SolutionSeries"];
         series.Points.Clear();
-        var dissimilarities = new DoubleMatrix(Content.Problem.Solutions.Count, Content.Problem.Solutions.Count);
-        for (int i = 0; i < Content.Problem.Solutions.Count; i++) {
-          for (int j = 0; j < Content.Problem.Solutions.Count; j++) {
+        seedingSeries.Points.Clear();
+        var solutionScopes = GetSolutionScopes();
+        var dissimilarities = new DoubleMatrix(solutionScopes.Count, solutionScopes.Count);
+        for (var i = 0; i < solutionScopes.Count; i++) {
+          for (var j = 0; j < solutionScopes.Count; j++) {
             if (i == j) continue;
-            dissimilarities[i, j] = 1.0 - calculator.CalculateSolutionSimilarity((IScope)Content.Problem.Solutions[i].Solution, (IScope)Content.Problem.Solutions[j].Solution);
+            dissimilarities[i, j] = 1.0 - calculator.CalculateSolutionSimilarity(solutionScopes[i], solutionScopes[j]);
           }
         }
         var coords = MultidimensionalScaling.KruskalShepard(dissimilarities);
         for (var i = 0; i < coords.Rows; i++) {
-          var quality = ((DoubleValue)((IScope)Content.Problem.Solutions[i].Solution).Variables[calculator.QualityVariableName].Value).Value;
-          series.Points.Add(new DataPoint() {
+          var quality = GetQuality(solutionScopes[i], calculator.QualityVariableName) ?? double.NaN;
+          var dataPoint = new DataPoint() {
             Name = (i + 1).ToString(),
             XValue = coords[i, 0],
-            YValues = new[] { coords[i, 1], quality },
-            Label = i + ": " + quality
-          });
-        }
-      } catch { }
-    }
-    #endregion
-    #endregion
+            YValues = new[] {coords[i, 1], quality},
+            Label = i + ": " + quality,
+            Tag = solutionScopes[i]
+          };
+          if (Content.SolutionSeedingPool.Contains(solutionScopes[i]) && Content.SolutionSeedingPool.ItemChecked(solutionScopes[i]))
+            seedingSeries.Points.Add(dataPoint);
+          else series.Points.Add(dataPoint);
+        }
+      } catch {
+        // problems in calculating the similarity
+        series.Points.Clear();
+        seedingSeries.Points.Clear();
+      }
+    }
+    #endregion
+    #endregion
+
+    private List<IScope> GetSolutionScopes() {
+      return Content.Problem.Solutions.Select(x => x.Solution).OfType<IScope>().ToList();
+    } 
+
+    private double? GetQuality(IScope scope, string qualityName) {
+      IVariable v;
+      if (!scope.Variables.TryGetValue(qualityName, out v)) return null;
+      var dval = v.Value as Data.DoubleValue;
+      if (dval == null) return null;
+      return dval.Value;
+    }
   }
 }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystemView.resx

@@ -118 +118 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>140, 17</value>
-  </metadata>
   <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>230, 17</value>

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

@@ -83 +83 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Clients.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Clients.Common-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Clients.OKB-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -146 +151 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Scripting-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Scripting-3.3.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -173 +183 @@
     </Compile>
     <Compile Include="Interfaces\IOptimizationExpertSystemUi.cs" />
+    <Compile Include="Menu\0_Config\40_AdministerOkbMenuItem.cs" />
+    <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\300_Learning\310_AlgorithmInstancesMenuItem.cs" />
+    <Compile Include="Menu\900_Tools\910_NewCSharpScriptMenuItem.cs" />
+    <Compile Include="Menu\900_Tools\930_SaveCSharpScriptMenuItem.cs" />
+    <Compile Include="Menu\900_Tools\920_OpenCSharpScriptMenuItem.cs" />
+    <Compile Include="Menu\MenuItemBase.cs" />
+    <Compile Include="Menu\0_Config\20_SetProblemMenuItem.cs" />
+    <Compile Include="Menu\100_Understanding\120_SolutionsMenuItem.cs" />
+    <Compile Include="Menu\100_Understanding\110_ProblemInstanceMenuItem.cs" />
     <Compile Include="OptimizationExpertSystem.cs">
       <SubType>Form</SubType>
@@ -180 +202 @@
     </Compile>
     <Compile Include="Plugin.cs" />
+    <Compile Include="UnderstandingProblemInstanceView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UnderstandingProblemInstanceView.Designer.cs">
+      <DependentUpon>UnderstandingProblemInstanceView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ExpertSystemViewBase.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\ExpertSystemViewBase.Designer.cs">
+      <DependentUpon>ExpertSystemViewBase.cs</DependentUpon>
+    </Compile>
     <None Include="Properties\AssemblyInfo.cs.frame" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -220 +254 @@
     <EmbeddedResource Include="OptimizationExpertSystem.resx">
       <DependentUpon>OptimizationExpertSystem.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UnderstandingProblemInstanceView.resx">
+      <DependentUpon>UnderstandingProblemInstanceView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Views\ExpertSystemViewBase.resx">
+      <DependentUpon>ExpertSystemViewBase.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>

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

@@ -4 +4 @@
     <StartAction>Program</StartAction>
     <StartProgram>C:\Users\P40311\Work\HL3\trunk\sources\bin\HeuristicLab 3.3.exe</StartProgram>
-    <StartArguments>/start:"Optimizer" /hideStarter</StartArguments>
+    <StartArguments>/start:"Optimization Knowledge Center" /hideStarter</StartArguments>
   </PropertyGroup>
 </Project>

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

@@ -32 +32 @@
       this.ClientSize = new System.Drawing.Size(624, 412);
       this.Name = "OptimizationExpertSystem";
-      this.Text = "Optimization Expert System (OES)";
-      this.Title = "Optimization Expert System (OES)";
+      this.Text = "Optimization Knowledge Center (OKC)";
+      this.Title = "Optimization Knowledge Center (OKC)";
       this.Load += new System.EventHandler(this.OptimizationExpertSystem_Load);
       this.ResumeLayout(false);

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Plugin.cs.frame

@@ -43 +43 @@
   }
 
-  [Application("Optimization Expert System", "HeuristicLab Optimization Expert System 3.3.13.$WCREV$")]
-  internal class HeuristicLabOptimizationExpertSystemApplication : ApplicationBase {
+  [Application("Optimization Knowledge Center", "HeuristicLab Optimization Knowledge Center 3.3.13.$WCREV$")]
+  internal class HeuristicLabOptimizationKnowledgeCenterApplication : ApplicationBase {
     public override void Run(ICommandLineArgument[] args) {
       HeuristicLab.MainForm.WindowsForms.MainForm mainForm = new OptimizationExpertSystem(typeof(IOptimizationExpertSystemUi));