Changeset 16958 for branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem/3.3/Views

Timestamp:

05/15/19 14:52:20 (6 years ago)

Author:

abeham

Message:

#2457: adapted to trunk

Location:

branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem/3.3/Views

Files:

• KnowledgeCenterAllinOneView.cs (modified) (3 diffs)
• KnowledgeCenterViewBase.cs (modified) (3 diffs)
• PerformanceModelingView.cs (modified) (4 diffs)

branches/2457_ExpertSystem/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 {
@@ -224 +224 @@
       progress.ProgressStateChanged += OkbDownloadProgressOnStateChanged;
       Content.UpdateKnowledgeBaseAsync(progress);
-      MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(progressPanel, progress);
+      Progress.ShowOnControl(progressPanel, progress);
       progressPanel.Visible = true;
       SetEnabledStateOfControls();

branches/2457_ExpertSystem/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);
+      //MainForm.AddOperationProgressToView(this, e.Value);
       e.Value.ProgressStateChanged += ProgressOnStateChanged;
       OnDownloadStarted(e.Value);

branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem/3.3/Views/PerformanceModelingView.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common.Resources;
@@ -28 +32 @@
 using HeuristicLab.OptimizationExpertSystem.Common;
 using HeuristicLab.PluginInfrastructure;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace HeuristicLab.OptimizationExpertSystem {
@@ -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);
@@ -188 +188 @@
           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));