Changeset 16728 for branches/1614_GeneralizedQAP/HeuristicLab.OptimizationExpertSystem

Timestamp:

03/31/19 14:40:15 (6 years ago)

Author:

abeham

Message:

#1614: updated to new persistence and .NET 4.6.1

• merged changes in #3000
• merged changes in #2936

Location:

branches/1614_GeneralizedQAP/HeuristicLab.OptimizationExpertSystem/3.3

Files:

• HeuristicLab.OptimizationExpertSystem-3.3.csproj (modified) (1 diff)
• Menu/0_Config/30_DownloadFromOkbMenuItem.cs (modified) (2 diffs)
• OptimizationKnowledgeCenter.cs (modified) (4 diffs)
• Toolbar/DownloadFromOKBToolbarItem.cs (modified) (2 diffs)
• Views/KnowledgeCenterAllinOneView.cs (modified) (3 diffs)
• Views/KnowledgeCenterViewBase.cs (modified) (3 diffs)
• Views/PerformanceModelingView.cs (modified) (2 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.OptimizationExpertSystem/3.3/HeuristicLab.OptimizationExpertSystem-3.3.csproj

@@ -10 +10 @@
     <RootNamespace>HeuristicLab.OptimizationExpertSystem</RootNamespace>
     <AssemblyName>HeuristicLab.OptimizationExpertSystem-3.3</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

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

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Drawing;
 using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
 using HeuristicLab.MainForm;
-using System;
-using System.Collections.Generic;
-using System.Drawing;
 
 namespace HeuristicLab.OptimizationExpertSystem.Menu {
@@ -72 +72 @@
     private void DownloadProgressOnStateChanged(object sender, EventArgs eventArgs) {
       var progress = (IProgress)sender;
-      if (progress.ProgressState == ProgressState.Finished || progress.ProgressState == ProgressState.Canceled) {
+      if (progress.ProgressState == ProgressState.Finished || progress.ProgressState == ProgressState.CancelRequested) {
         SetToolStripItemEnabled(true);
         progress.ProgressStateChanged -= DownloadProgressOnStateChanged;

branches/1614_GeneralizedQAP/HeuristicLab.OptimizationExpertSystem/3.3/OptimizationKnowledgeCenter.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Windows.Forms;
 using HeuristicLab.Common;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.OptimizationExpertSystem.Common;
-using System;
-using System.Windows.Forms;
 
 namespace HeuristicLab.OptimizationExpertSystem {
@@ -45 +45 @@
       e.Value.ProgressStateChanged += OnProgressStateChanged;
       e.Value.ProgressValueChanged += OnProgressValueChanged;
-      e.Value.StatusChanged += OnProgressStatusChanged;
+      e.Value.MessageChanged += OnProgressStatusChanged;
       progressBar.Value = progressBar.Minimum;
       progressLabel.Text = string.Empty;
@@ -55 +55 @@
       if (InvokeRequired) { Invoke((Action<object, EventArgs>)OnProgressStateChanged, sender, e); return; }
       var progress = (IProgress)sender;
-      if (progress.ProgressState == ProgressState.Canceled
+      if (progress.ProgressState == ProgressState.CancelRequested
           || progress.ProgressState == ProgressState.Finished) {
         progress.ProgressStateChanged -= OnProgressStateChanged;
         progress.ProgressValueChanged -= OnProgressValueChanged;
-        progress.StatusChanged -= OnProgressStatusChanged;
+        progress.MessageChanged -= OnProgressStatusChanged;
         progressBar.Visible = false;
         progressLabel.Visible = false;
@@ -74 +74 @@
       if (InvokeRequired) { Invoke((Action<object, EventArgs>)OnProgressStatusChanged, sender, e); return; }
       var progress = (IProgress)sender;
-      progressLabel.Text = progress.Status.Replace(Environment.NewLine, "   ");
+      progressLabel.Text = progress.Message.Replace(Environment.NewLine, "   ");
     }
 

branches/1614_GeneralizedQAP/HeuristicLab.OptimizationExpertSystem/3.3/Toolbar/DownloadFromOKBToolbarItem.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Drawing;
 using HeuristicLab.Common;
 using HeuristicLab.MainForm;
-using System;
-using System.Drawing;
 
 namespace HeuristicLab.OptimizationExpertSystem.Toolbar {
@@ -66 +66 @@
     private void DownloadProgressOnStateChanged(object sender, EventArgs eventArgs) {
       var progress = (IProgress)sender;
-      if (progress.ProgressState == ProgressState.Finished || progress.ProgressState == ProgressState.Canceled) {
+      if (progress.ProgressState == ProgressState.Finished || progress.ProgressState == ProgressState.CancelRequested) {
         SetToolStripItemEnabled(true);
         progress.ProgressStateChanged -= DownloadProgressOnStateChanged;

branches/1614_GeneralizedQAP/HeuristicLab.OptimizationExpertSystem/3.3/Views/KnowledgeCenterAllinOneView.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+using System.Windows.Forms.DataVisualization.Charting;
 using HeuristicLab.Analysis;
 using HeuristicLab.Analysis.QualityAnalysis;
@@ -34 +41 @@
 using HeuristicLab.Optimization.Views;
 using HeuristicLab.OptimizationExpertSystem.Common;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Windows.Forms;
-using System.Windows.Forms.DataVisualization.Charting;
 
 namespace HeuristicLab.OptimizationExpertSystem {
@@ -221 +221 @@
         return;
       }
-      var progress = new Progress();
+      var progress = Progress.ShowOnControl(progressPanel, "");
       progress.ProgressStateChanged += OkbDownloadProgressOnStateChanged;
       Content.UpdateKnowledgeBaseAsync(progress);
-      MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(progressPanel, progress);
       progressPanel.Visible = true;
       SetEnabledStateOfControls();

branches/1614_GeneralizedQAP/HeuristicLab.OptimizationExpertSystem/3.3/Views/KnowledgeCenterViewBase.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.MainForm;
@@ -25 +26 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.OptimizationExpertSystem.Common;
-using System;
 
 namespace HeuristicLab.OptimizationExpertSystem {
@@ -146 +146 @@
     private void ContentOnDownloadStarted(object sender, EventArgs<IProgress> e) {
       if (InvokeRequired) { Invoke((Action<object, EventArgs<IProgress>>)ContentOnDownloadStarted, sender, e); return; }
-      MainForm.AddOperationProgressToView(this, e.Value);
+      Progress.Show(this, e.Value);
       e.Value.ProgressStateChanged += ProgressOnStateChanged;
       OnDownloadStarted(e.Value);

branches/1614_GeneralizedQAP/HeuristicLab.OptimizationExpertSystem/3.3/Views/PerformanceModelingView.cs

@@ -153 +153 @@
     private void xValidateButton_Click(object sender, EventArgs e) {
       var recommender = (IAlgorithmInstanceRecommender)recommenderComboBox.SelectedItem;
-      var progress = MainForm.AddOperationProgressToView(this, "Performing Leave-one-out Crossvalidation");
+      var progress = Progress.ShowOnControl(this, "Performing Leave-one-out Crossvalidation");
       var topN = (int)topNComboBox.SelectedItem;
       Task.Factory.StartNew(() => { DoCrossvalidate(recommender, topN, progress); }, TaskCreationOptions.LongRunning);
@@ -190 +190 @@
           var observed = Content.GetAlgorithmPerformanceLog10(pi);
           if (observed.Count == 0) continue;
-          progress.Status = pi.Name + "...";
+          progress.Message = pi.Name + "...";
           var model = recommender.TrainModel(trainingSet.Where(x => x != pi).ToArray(), Content, features);
           var predictedTopN = model.GetRanking(pi).Take(topN).ToDictionary(x => x.Key, x => Math.Log10(x.Value));