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

Timestamp:

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

Author:

abeham

Message:

#2457:

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

File:

• branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views/KnowledgeCenterAllinOneView.cs (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystemView.cs) (9 diffs)

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

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