Changeset 12860 for branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Views

Timestamp:

08/13/15 16:05:08 (9 years ago)

Author:

abeham

Message:

#2457: worked on expert system

Location:

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Views/3.3

Files:

• ExpertSystemView.Designer.cs (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Views/3.3/ExpertSystemOptimizerView.Designer.cs) (14 diffs)
• ExpertSystemView.cs (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Views/3.3/ExpertSystemOptimizerView.cs) (9 diffs)
• HeuristicLab.OptimizationExpertSystem.Views-3.3.csproj (modified) (1 diff)

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

@@ -21 +21 @@
 
 namespace HeuristicLab.OptimizationExpertSystem.Views {
-  partial class ExpertSystemOptimizerView {
+  partial class ExpertSystemView {
     /// <summary> 
     /// Required designer variable.
@@ -48 +48 @@
       this.runsView = new HeuristicLab.Optimization.Views.RunCollectionView();
       this.okbTabPage = new System.Windows.Forms.TabPage();
-      this.okbRunCollectionView = new HeuristicLab.Optimization.Views.RunCollectionView();
       this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
+      this.algorithmInstancesViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.tabControl.SuspendLayout();
@@ -58 +58 @@
       this.SuspendLayout();
       // 
-      // startButton
-      // 
-      this.startButton.Location = new System.Drawing.Point(0, 440);
-      this.startButton.TabIndex = 18;
-      this.toolTip.SetToolTip(this.startButton, "Start/Resume Optimizer");
-      // 
-      // executionTimeTextBox
-      // 
-      this.executionTimeTextBox.Location = new System.Drawing.Point(412, 444);
-      this.executionTimeTextBox.TabIndex = 23;
-      // 
-      // executionTimeLabel
-      // 
-      this.executionTimeLabel.Location = new System.Drawing.Point(323, 447);
-      this.executionTimeLabel.TabIndex = 22;
-      // 
-      // pauseButton
-      // 
-      this.pauseButton.Location = new System.Drawing.Point(30, 440);
-      this.pauseButton.TabIndex = 19;
-      this.toolTip.SetToolTip(this.pauseButton, "Pause Optimizer");
-      // 
-      // stopButton
-      // 
-      this.stopButton.Location = new System.Drawing.Point(60, 440);
-      this.stopButton.TabIndex = 20;
-      this.toolTip.SetToolTip(this.stopButton, "Stop Optimizer");
-      // 
-      // resetButton
-      // 
-      this.resetButton.Location = new System.Drawing.Point(90, 440);
-      this.resetButton.TabIndex = 21;
-      this.toolTip.SetToolTip(this.resetButton, "Reset Optimizer");
-      // 
       // nameTextBox
       // 
@@ -135 +101 @@
       this.tabControl.Name = "tabControl";
       this.tabControl.SelectedIndex = 0;
-      this.tabControl.Size = new System.Drawing.Size(546, 382);
+      this.tabControl.Size = new System.Drawing.Size(546, 361);
       this.tabControl.TabIndex = 17;
       // 
@@ -147 +113 @@
       this.problemTabPage.Name = "problemTabPage";
       this.problemTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.problemTabPage.Size = new System.Drawing.Size(538, 356);
+      this.problemTabPage.Size = new System.Drawing.Size(538, 335);
       this.problemTabPage.TabIndex = 1;
       this.problemTabPage.Text = "Problem";
@@ -166 +132 @@
       this.problemViewHost.Name = "problemViewHost";
       this.problemViewHost.ReadOnly = false;
-      this.problemViewHost.Size = new System.Drawing.Size(526, 314);
+      this.problemViewHost.Size = new System.Drawing.Size(526, 293);
       this.problemViewHost.TabIndex = 2;
       this.problemViewHost.ViewsLabelVisible = true;
@@ -201 +167 @@
       this.algorithmTabPage.Name = "algorithmTabPage";
       this.algorithmTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.algorithmTabPage.Size = new System.Drawing.Size(538, 356);
+      this.algorithmTabPage.Size = new System.Drawing.Size(538, 335);
       this.algorithmTabPage.TabIndex = 4;
       this.algorithmTabPage.Text = "Algorithm";
@@ -217 +183 @@
       this.algorithmViewHost.Name = "algorithmViewHost";
       this.algorithmViewHost.ReadOnly = false;
-      this.algorithmViewHost.Size = new System.Drawing.Size(526, 314);
+      this.algorithmViewHost.Size = new System.Drawing.Size(526, 293);
       this.algorithmViewHost.TabIndex = 2;
       this.algorithmViewHost.ViewsLabelVisible = true;
@@ -249 +215 @@
       this.runsTabPage.Name = "runsTabPage";
       this.runsTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.runsTabPage.Size = new System.Drawing.Size(538, 356);
+      this.runsTabPage.Size = new System.Drawing.Size(538, 335);
       this.runsTabPage.TabIndex = 3;
       this.runsTabPage.Text = "Runs";
@@ -262 +228 @@
       this.runsView.Name = "runsView";
       this.runsView.ReadOnly = false;
-      this.runsView.Size = new System.Drawing.Size(532, 350);
+      this.runsView.Size = new System.Drawing.Size(532, 329);
       this.runsView.TabIndex = 1;
       // 
       // okbTabPage
       // 
-      this.okbTabPage.Controls.Add(this.okbRunCollectionView);
+      this.okbTabPage.Controls.Add(this.algorithmInstancesViewHost);
       this.okbTabPage.Location = new System.Drawing.Point(4, 22);
       this.okbTabPage.Name = "okbTabPage";
       this.okbTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.okbTabPage.Size = new System.Drawing.Size(538, 356);
+      this.okbTabPage.Size = new System.Drawing.Size(538, 335);
       this.okbTabPage.TabIndex = 5;
       this.okbTabPage.Text = "Knowledge Base";
       this.okbTabPage.UseVisualStyleBackColor = true;
-      // 
-      // okbRunCollectionView
-      // 
-      this.okbRunCollectionView.Caption = "RunCollection View";
-      this.okbRunCollectionView.Content = null;
-      this.okbRunCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.okbRunCollectionView.Location = new System.Drawing.Point(3, 3);
-      this.okbRunCollectionView.Name = "okbRunCollectionView";
-      this.okbRunCollectionView.ReadOnly = false;
-      this.okbRunCollectionView.Size = new System.Drawing.Size(532, 350);
-      this.okbRunCollectionView.TabIndex = 0;
       // 
       // openFileDialog
@@ -293 +248 @@
       this.openFileDialog.Filter = "HeuristicLab Files|*.hl|All Files|*.*";
       this.openFileDialog.Title = "Open Optimizer";
+      // 
+      // algorithmInstancesViewHost
+      // 
+      this.algorithmInstancesViewHost.Caption = "View";
+      this.algorithmInstancesViewHost.Content = null;
+      this.algorithmInstancesViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.algorithmInstancesViewHost.Enabled = false;
+      this.algorithmInstancesViewHost.Location = new System.Drawing.Point(3, 3);
+      this.algorithmInstancesViewHost.Name = "algorithmInstancesViewHost";
+      this.algorithmInstancesViewHost.ReadOnly = false;
+      this.algorithmInstancesViewHost.Size = new System.Drawing.Size(532, 329);
+      this.algorithmInstancesViewHost.TabIndex = 0;
+      this.algorithmInstancesViewHost.ViewsLabelVisible = true;
+      this.algorithmInstancesViewHost.ViewType = null;
       // 
       // ExpertSystemOptimizerView
@@ -301 +270 @@
       this.Controls.Add(this.maxEvaluationsTextBox);
       this.Name = "ExpertSystemOptimizerView";
-      this.Size = new System.Drawing.Size(549, 464);
+      this.Size = new System.Drawing.Size(549, 413);
       this.Controls.SetChildIndex(this.maxEvaluationsTextBox, 0);
       this.Controls.SetChildIndex(this.evaluationsLimitabel, 0);
@@ -308 +277 @@
       this.Controls.SetChildIndex(this.nameTextBox, 0);
       this.Controls.SetChildIndex(this.infoLabel, 0);
-      this.Controls.SetChildIndex(this.resetButton, 0);
-      this.Controls.SetChildIndex(this.stopButton, 0);
-      this.Controls.SetChildIndex(this.pauseButton, 0);
-      this.Controls.SetChildIndex(this.executionTimeLabel, 0);
-      this.Controls.SetChildIndex(this.executionTimeTextBox, 0);
-      this.Controls.SetChildIndex(this.startButton, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.tabControl.ResumeLayout(false);
@@ -343 +306 @@
     private System.Windows.Forms.ComboBox suggestedInstancesComboBox;
     private System.Windows.Forms.TabPage okbTabPage;
-    private Optimization.Views.RunCollectionView okbRunCollectionView;
+    private MainForm.WindowsForms.ViewHost algorithmInstancesViewHost;
   }
 }

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

@@ -22 +22 @@
 using System;
 using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
 using System.Windows.Forms;
-using HeuristicLab.Analysis;
 using HeuristicLab.Common;
-using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimization;
-using HeuristicLab.Optimization.Views;
 using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.OptimizationExpertSystem.Views {
   [View("Expert-system Optimizer View")]
-  [Content(typeof(ExpertSystemOptimizer), IsDefaultView = true)]
-  public partial class ExpertSystemOptimizerView : IOptimizerView {
+  [Content(typeof(ExpertSystem), IsDefaultView = true)]
+  public partial class ExpertSystemView : NamedItemView {
     protected TypeSelectorDialog problemTypeSelectorDialog;
     protected virtual bool SuppressEvents { get; set; }
 
-    public new ExpertSystemOptimizer Content {
-      get { return (ExpertSystemOptimizer)base.Content; }
+    public new ExpertSystem Content {
+      get { return (ExpertSystem)base.Content; }
       set { base.Content = value; }
     }
 
-    public ExpertSystemOptimizerView() {
+    public ExpertSystemView() {
       InitializeComponent();
     }
@@ -87 +82 @@
           algorithmViewHost.Content = null;
           runsView.Content = null;
-          okbRunCollectionView.Content = null;
+          algorithmInstancesViewHost.Content = null;
         } else {
           maxEvaluationsTextBox.Text = Content.MaximumEvaluations.ToString();
           problemViewHost.Content = Content.Problem;
           runsView.Content = Content.Runs;
-          okbRunCollectionView.Content = Content.KnowledgeBase;
+          algorithmInstancesViewHost.Content = Content.AlgorithmInstances;
         }
-        UpdateSuggestedInstancesCombobox();
       } finally { SuppressEvents = false; }
+      UpdateSuggestedInstancesCombobox();
     }
 
@@ -107 +102 @@
       algorithmViewHost.Enabled = Content != null && !ReadOnly && !Locked;
       runsView.Enabled = Content != null;
-      okbRunCollectionView.Enabled = Content != null;
-    }
-
-    protected override void OnClosed(FormClosedEventArgs e) {
-      if ((Content != null) && (Content.ExecutionState == ExecutionState.Started)) {
-        //The content must be stopped if no other view showing the content is available
-        var optimizers = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v != this).Select(v => v.Content).OfType<IOptimizer>();
-        if (!optimizers.Contains(Content)) {
-          var nestedOptimizers = optimizers.SelectMany(opt => opt.NestedOptimizers);
-          if (!nestedOptimizers.Contains(Content)) Content.Stop();
-        }
-      }
-      base.OnClosed(e);
+      algorithmInstancesViewHost.Enabled = Content != null;
     }
 
     private void UpdateSuggestedInstancesCombobox() {
-      SuspendRepaint();
-      try {
-        var prevSelection = (IAlgorithm)suggestedInstancesComboBox.SelectedItem;
-        var prevNewIndex = -1;
-        suggestedInstancesComboBox.Items.Clear();
-        if (Content == null) return;
-
-        for (var i = 0; i < Content.SuggestedInstances.Count; i++) {
-          suggestedInstancesComboBox.Items.Add(Content.SuggestedInstances[i]);
-          if (prevSelection == null || Content.SuggestedInstances[i].Name == prevSelection.Name)
-            prevNewIndex = prevSelection == null ? 0 : i;
-        }
-        if (prevNewIndex >= 0) {
-          suggestedInstancesComboBox.SelectedIndex = prevNewIndex;
-        }
-      } finally { ResumeRepaint(true); }
+      var prevSelection = (IAlgorithm)suggestedInstancesComboBox.SelectedItem;
+      var prevNewIndex = -1;
+      suggestedInstancesComboBox.Items.Clear();
+      if (Content == null) return;
+
+      for (var i = 0; i < Content.SuggestedInstances.Count; i++) {
+        suggestedInstancesComboBox.Items.Add(Content.SuggestedInstances[i]);
+        if (prevSelection == null || Content.SuggestedInstances[i].Name == prevSelection.Name)
+          prevNewIndex = prevSelection == null ? 0 : i;
+      }
+      if (prevNewIndex >= 0) {
+        suggestedInstancesComboBox.SelectedIndex = prevNewIndex;
+      }
     }
 
@@ -152 +132 @@
         switch (e.PropertyName) {
           case "MaximumEvaluations": maxEvaluationsTextBox.Text = Content.MaximumEvaluations.ToString(); break;
-          case "Runs": runsView.Content = Content.Runs; break;
-          case "KnowledgeBase": okbRunCollectionView.Content = Content.KnowledgeBase; break;
           case "Problem": problemViewHost.Content = Content.Problem; break;
         }
@@ -160 +138 @@
 
     private void SuggestedInstancesOnChanged(object sender, EventArgs e) {
-      SuppressEvents = true;
-      try {
-        UpdateSuggestedInstancesCombobox();
-      } finally { SuppressEvents = false; }
+      UpdateSuggestedInstancesCombobox();
     }
     #endregion
@@ -189 +164 @@
         problemTypeSelectorDialog = new TypeSelectorDialog { Caption = "Select Problem" };
         problemTypeSelectorDialog.TypeSelector.Caption = "Available Problems";
-        problemTypeSelectorDialog.TypeSelector.Configure(typeof(IProblem)
+        problemTypeSelectorDialog.TypeSelector.Configure(typeof(ISingleObjectiveHeuristicOptimizationProblem)
           , showNotInstantiableTypes: false, showGenericTypes: false);
       }
       if (problemTypeSelectorDialog.ShowDialog(this) == DialogResult.OK) {
         try {
-          Content.Problem = (IProblem)problemTypeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
+          Content.Problem = (ISingleObjectiveHeuristicOptimizationProblem)problemTypeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
         } catch (Exception ex) {
           ErrorHandling.ShowErrorDialog(this, ex);
@@ -210 +185 @@
           try {
             if (error != null) throw error;
-            var problem = content as IProblem;
+            var problem = content as ISingleObjectiveHeuristicOptimizationProblem;
             if (problem == null) {
               var algorithm = content as IAlgorithm;
-              if (algorithm == null || algorithm.Problem == null)
+              if (algorithm == null || !(algorithm.Problem is ISingleObjectiveHeuristicOptimizationProblem))
                 MessageBox.Show(this, "The selected file is not a problem, nor an algorithm with a problem.", "Invalid File", MessageBoxButtons.OK, MessageBoxIcon.Error);
-              else Content.Problem = algorithm.Problem;
+              else Content.Problem = (ISingleObjectiveHeuristicOptimizationProblem)algorithm.Problem;
             } else
               Content.Problem = problem;
@@ -232 +207 @@
     private void problemTabPage_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
-      var prob = e.Data.GetData(Constants.DragDropDataFormat) as IProblem;
+      var prob = e.Data.GetData(Constants.DragDropDataFormat) as ISingleObjectiveHeuristicOptimizationProblem;
       if (!ReadOnly && prob != null) {
         if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
@@ -244 +219 @@
     private void problemTabPage_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
-        var prob = e.Data.GetData(Constants.DragDropDataFormat) as IProblem;
-        if (e.Effect.HasFlag(DragDropEffects.Copy)) prob = (IProblem)prob.Clone();
+        var prob = e.Data.GetData(Constants.DragDropDataFormat) as ISingleObjectiveHeuristicOptimizationProblem;
+        if (e.Effect.HasFlag(DragDropEffects.Copy)) prob = (ISingleObjectiveHeuristicOptimizationProblem)prob.Clone();
         Content.Problem = prob;
       }

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

@@ -134 +134 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ExpertSystemOptimizerView.cs">
+    <Compile Include="ExpertSystemView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="ExpertSystemOptimizerView.Designer.cs">
-      <DependentUpon>ExpertSystemOptimizerView.cs</DependentUpon>
+    <Compile Include="ExpertSystemView.Designer.cs">
+      <DependentUpon>ExpertSystemView.cs</DependentUpon>
     </Compile>
     <Compile Include="Plugin.cs" />