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

Timestamp:

03/03/16 15:54:48 (8 years ago)

Author:

abeham

Message:

#2457: fixed bugs in suggestions

Location:

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Views/3.3

Files:

• ExpertSystemView.Designer.cs (modified) (1 diff)
• ExpertSystemView.cs (modified) (6 diffs)
• ExpertSystemView.resx (modified) (1 diff)

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

@@ -211 +211 @@
       this.suggestedInstancesComboBox.Size = new System.Drawing.Size(322, 21);
       this.suggestedInstancesComboBox.TabIndex = 0;
+      this.suggestedInstancesComboBox.SelectedIndexChanged += new System.EventHandler(this.SuggestedInstancesComboBoxOnSelectedIndexChanged);
       // 
       // runsTabPage

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

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common.Resources;
+using HeuristicLab.Core.Views;
+using HeuristicLab.MainForm;
+using HeuristicLab.Optimization;
+using HeuristicLab.Optimization.Views;
 using System;
 using System.ComponentModel;
@@ -26 +31 @@
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
-using HeuristicLab.Common.Resources;
-using HeuristicLab.Core.Views;
-using HeuristicLab.MainForm;
-using HeuristicLab.Optimization;
-using HeuristicLab.Optimization.Views;
 
 namespace HeuristicLab.OptimizationExpertSystem.Views {
@@ -104 +104 @@
           kbViewHost.Content = Content.KnowledgeBase;
           problemInstancesView.Content = Content.ProblemInstances;
+          algorithmViewHost.Content = Content.CurrentResult;
         }
       } finally { SuppressEvents = false; }
@@ -161 +162 @@
             break;
           case "ProblemInstances": problemInstancesView.Content = Content.ProblemInstances; break;
+          case "CurrentResult": algorithmViewHost.Content = Content.CurrentResult; break;
         }
       } finally { SuppressEvents = false; }
@@ -231 +233 @@
 
     private void AlgorithmStartButtonOnClick(object sender, EventArgs e) {
-      var selectedInstance = (IAlgorithm)suggestedInstancesComboBox.SelectedItem;
-      var clone = (IAlgorithm)selectedInstance.Clone();
-      clone.Prepare(true);
-      clone.Start();
-      algorithmViewHost.Content = clone.Results;
+      if (suggestedInstancesComboBox.SelectedIndex >= 0)
+        Content.StartAlgorithmAsync(suggestedInstancesComboBox.SelectedIndex);
     }
 
@@ -268 +267 @@
       }
     }
+
+    private void SuggestedInstancesComboBoxOnSelectedIndexChanged(object sender, EventArgs e) {
+      SetEnabledStateOfControls();
+    }
   }
 }

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

@@ -121 +121 @@
     <value>17, 17</value>
   </metadata>
-  <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>