Changeset 13748

Timestamp:

04/07/16 15:26:47 (8 years ago)

Author:

abeham

Message:

#2457: Added toolbar, fixed some bugs

Location:

branches/PerformanceComparison

Files:

• HeuristicLab.OptimizationExpertSystem.Common/3.3/KnowledgeCenter.cs (modified) (3 diffs)
• HeuristicLab.OptimizationExpertSystem/3.3/HeuristicLab.OptimizationExpertSystem-3.3.csproj (modified) (1 diff)
• HeuristicLab.OptimizationExpertSystem/3.3/Menu/0_Config/30_DownloadFromOkbMenuItem.cs (modified) (4 diffs)
• HeuristicLab.OptimizationExpertSystem/3.3/OptimizationKnowledgeCenter.cs (modified) (4 diffs)
• HeuristicLab.OptimizationExpertSystem/3.3/Toolbar (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Toolbar/DownloadFromOKBToolbarItem.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Toolbar/ToolbarItemBase.cs (copied) (copied from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Menu/MenuItemBase.cs) (1 diff)

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

@@ -107 +107 @@
 
     public KnowledgeCenter() {
-      maximumEvaluations = new IntValue(0);
+      maximumEvaluations = new IntValue(10000);
       instanceRuns = new RunCollection();
+      seededRuns = new RunCollection();
       knowledgeBase = new RunCollection();
       suggestedInstances = new ItemList<IAlgorithm>();
@@ -122 +123 @@
 
     private void ProblemOnProblemChanged(object sender, EventArgs eventArgs) {
-      
+      // TODO: Potentially, knowledge base has to be re-downloaded
     }
 
@@ -337 +338 @@
       EventHandler exeStateChanged = (sender, e) => {
         if (algorithmClone.ExecutionState == ExecutionState.Stopped) {
-          foreach (var solution in algorithmClone.Results.Where(x => x.Name.ToLower().Contains("solution")).Select(x => x.Value).OfType<IScope>()) {
-            Problem.Solutions.Add(new SingleObjectiveOKBSolution(Problem.ProblemId) {
-              Quality = solution.Variables.ContainsKey(Problem.Problem.Evaluator.QualityParameter.ActualName) ? ((DoubleValue)solution.Variables[Problem.Problem.Evaluator.QualityParameter.ActualName].Value).Value : double.NaN,
-              Solution = (IItem)solution.Clone()
-            });
+          lock (Problem.Solutions) {
+            foreach (var solution in algorithmClone.Results.Where(x => x.Name.ToLower().Contains("solution")).Select(x => x.Value).OfType<IScope>()) {
+              Problem.Solutions.Add(new SingleObjectiveOKBSolution(Problem.ProblemId) {
+                Quality = solution.Variables.ContainsKey(Problem.Problem.Evaluator.QualityParameter.ActualName) ? ((DoubleValue)solution.Variables[Problem.Problem.Evaluator.QualityParameter.ActualName].Value).Value : double.NaN,
+                Solution = (IItem)solution.Clone()
+              });
+            }
           }
           if (seedingStrategyLocal == SeedingStrategyTypes.NoSeeding) {
-            InstanceRuns.Add(algorithmClone.Runs.Last());
-          } else SeededRuns.Add(algorithmClone.Runs.Last());
+            lock (InstanceRuns) {
+              InstanceRuns.Add(algorithmClone.Runs.Last());
+            }
+          } else {
+            lock (SeededRuns) {
+              SeededRuns.Add(algorithmClone.Runs.Last());
+            }
+          }
           waitHandle.Set();
         }

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

@@ -191 +191 @@
       <DependentUpon>AlgorithmControlForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="Toolbar\DownloadFromOKBToolbarItem.cs" />
+    <Compile Include="Toolbar\ToolbarItemBase.cs" />
     <Compile Include="Views\KnowledgeCenterAllinOneView.cs">
       <SubType>UserControl</SubType>

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Menu/0_Config/30_DownloadFromOkbMenuItem.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
+using HeuristicLab.MainForm;
 using System;
 using System.Collections.Generic;
@@ -41 +43 @@
     }
 
-    public override string ToolTipText { get { return "Download relevant runs from the knowledge base."; } }
+    public override string ToolTipText {
+      get {
+        return @"Download relevant runs, including algorithm instances
+and problem instances from the OKB server.";
+      }
+    }
 
     public override void Execute() {
@@ -51 +58 @@
       ToolStripItem.Enabled = MainForm.ExpertSystem.Problem.ProblemId != -1;
       MainForm.ExpertSystem.Problem.ProblemChanged += OnProblemChanged;
+      MainForm.ExpertSystem.DownloadStarted += OnDownloadStarted;
     }
 
@@ -56 +64 @@
       ToolStripItem.Enabled = MainForm.ExpertSystem.Problem.ProblemId != -1;
     }
+
+    private void OnDownloadStarted(object sender, EventArgs<IProgress> e) {
+      ToolStripItem.Enabled = false;
+      e.Value.ProgressStateChanged += DownloadProgressOnStateChanged;
+    }
+
+    private void DownloadProgressOnStateChanged(object sender, EventArgs eventArgs) {
+      var progress = (IProgress)sender;
+      if (progress.ProgressState == ProgressState.Finished || progress.ProgressState == ProgressState.Canceled) {
+        ToolStripItem.Enabled = true;
+        progress.ProgressStateChanged -= DownloadProgressOnStateChanged;
+      }
+    }
   }
 }

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

@@ -42 +42 @@
 
     private void ExpertSystemOnDownloadStarted(object sender, EventArgs<IProgress> e) {
+      if (InvokeRequired) { Invoke((Action<object, EventArgs<IProgress>>)ExpertSystemOnDownloadStarted, sender, e); return; }
       e.Value.ProgressStateChanged += OnProgressStateChanged;
       e.Value.ProgressValueChanged += OnProgressValueChanged;
@@ -52 +53 @@
 
     private void OnProgressStateChanged(object sender, EventArgs e) {
+      if (InvokeRequired) { Invoke((Action<object, EventArgs>)OnProgressStateChanged, sender, e); return; }
       var progress = (IProgress)sender;
       if (progress.ProgressState == ProgressState.Canceled
@@ -64 +66 @@
 
     private void OnProgressValueChanged(object sender, EventArgs e) {
+      if (InvokeRequired) { Invoke((Action<object, EventArgs>)OnProgressValueChanged, sender, e); return; }
       var progress = (IProgress)sender;
       progressBar.Value = Math.Max(progressBar.Minimum, Math.Min(progressBar.Maximum, (int)(progress.ProgressValue * 100)));
@@ -69 +72 @@
 
     private void OnProgressStatusChanged(object sender, EventArgs e) {
+      if (InvokeRequired) { Invoke((Action<object, EventArgs>)OnProgressStatusChanged, sender, e); return; }
       var progress = (IProgress)sender;
       progressLabel.Text = progress.Status.Replace(Environment.NewLine, "   ");

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Toolbar/ToolbarItemBase.cs

@@ -22 +22 @@
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.OptimizationExpertSystem.Menu {
-  internal abstract class MenuItemBase : MenuItem, IOptimizationKnowledgeCenterUi {
+namespace HeuristicLab.OptimizationExpertSystem.Toolbar {
+  internal abstract class ToolbarItemBase : ToolBarItem, IOptimizationKnowledgeCenterUi {
     public OptimizationKnowledgeCenter MainForm {
       get { return (OptimizationKnowledgeCenter)HeuristicLab.MainForm.MainFormManager.MainForm; }