Changeset 15796 for trunk/HeuristicLab.Problems.DataAnalysis.Views

Timestamp:

02/21/18 12:01:54 (6 years ago)

Author:

fholzing

Message:

#2871: Added additional logic for progress

File:

• trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.cs (modified) (9 diffs)

trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using HeuristicLab.Common;
 using HeuristicLab.Data;
@@ -33 +32 @@
   [Content(typeof(IRegressionSolution))]
   public partial class RegressionSolutionVariableImpactsView : DataAnalysisSolutionEvaluationView {
-    #region Nested Types
+    private class BackgroundworkerArguments {
+      internal MainForm.WindowsForms.MainForm mainForm;
+      internal RegressionSolutionVariableImpactsCalculator.ReplacementMethodEnum replMethod;
+      internal RegressionSolutionVariableImpactsCalculator.FactorReplacementMethodEnum factorReplMethod;
+      internal RegressionSolutionVariableImpactsCalculator.DataPartitionEnum dataPartition;
+    }
     private enum SortingCriteria {
       ImpactValue,
@@ -39 +43 @@
       VariableName
     }
-    #endregion
-
-    #region Fields
+    private IProgress progress;
     private Dictionary<string, double> rawVariableImpacts = new Dictionary<string, double>();
-    private Thread thread;
-    #endregion
-
-    #region Getter/Setter
+    private BackgroundWorker worker = new BackgroundWorker();
+
     public new IRegressionSolution Content {
       get { return (IRegressionSolution)base.Content; }
@@ -53 +53 @@
       }
     }
-    #endregion
-
-    #region Ctor
+
     public RegressionSolutionVariableImpactsView()
       : base() {
@@ -68 +66 @@
       this.replacementComboBox.SelectedIndex = 0;
       this.factorVarReplComboBox.SelectedIndex = 0;
-    }
-    #endregion
-
-    #region Events
+
+      //Worker magic
+      worker.WorkerSupportsCancellation = true;
+      worker.WorkerReportsProgress = true;
+      worker.DoWork += Worker_DoWork;
+      worker.RunWorkerCompleted += Worker_RunWorkerCompleted;
+      worker.ProgressChanged += Worker_ProgressChanged;
+    }
+
+
+    private void Worker_DoWork(object sender, DoWorkEventArgs e) {
+      var args = e.Argument as BackgroundworkerArguments;
+
+      //Remember the original ordering of the variables
+      var impacts = RegressionSolutionVariableImpactsCalculator.CalculateImpacts(Content, args.dataPartition, args.replMethod, args.factorReplMethod,
+        (i) => {
+          var worker = (sender as BackgroundWorker);
+          worker.ReportProgress(0, i);
+          return worker.CancellationPending;
+        });
+
+      if ((sender as BackgroundWorker).CancellationPending) { return; }
+      var problemData = Content.ProblemData;
+      var inputvariables = new HashSet<string>(problemData.AllowedInputVariables.Union(Content.Model.VariablesUsedForPrediction));
+      var originalVariableOrdering = problemData.Dataset.VariableNames.Where(v => inputvariables.Contains(v)).Where(problemData.Dataset.VariableHasType<double>).ToList();
+
+      rawVariableImpacts.Clear();
+      originalVariableOrdering.ForEach(v => rawVariableImpacts.Add(v, impacts.First(vv => vv.Item1 == v).Item2));
+    }
+    private void Worker_ProgressChanged(object sender, ProgressChangedEventArgs e) {
+      progress.ProgressValue = (double)e.UserState;
+    }
+    private void Worker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) {
+      if (e.Error != null) { throw e.Error; }
+      if (e.Error == null && !e.Cancelled) { UpdateDataOrdering(); }
+      ((MainForm.WindowsForms.MainForm)MainFormManager.MainForm).RemoveOperationProgressFromView(this);
+    }
+
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
@@ -102 +134 @@
 
     private void RegressionSolutionVariableImpactsView_VisibleChanged(object sender, EventArgs e) {
-      if (thread == null) { return; }
-
-      if (thread.IsAlive) { thread.Abort(); }
-      thread = null;
+      if (!worker.IsBusy) { return; }
+      worker.CancelAsync();
     }
 
@@ -142 +172 @@
     }
 
-    #endregion
-
-    #region Helper Methods   
+
     private void UpdateVariableImpact() {
       //Check if the selection is valid
@@ -159 +187 @@
 
       variableImactsArrayView.Caption = Content.Name + " Variable Impacts";
-
-      mainForm.AddOperationProgressToView(this, "Calculating variable impacts for " + Content.Name);
-
-      Task.Factory.StartNew(() => {
-        thread = Thread.CurrentThread;
-        //Remember the original ordering of the variables
-        var impacts = RegressionSolutionVariableImpactsCalculator.CalculateImpacts(Content, dataPartition, replMethod, factorReplMethod);
-        var problemData = Content.ProblemData;
-        var inputvariables = new HashSet<string>(problemData.AllowedInputVariables.Union(Content.Model.VariablesUsedForPrediction));
-        var originalVariableOrdering = problemData.Dataset.VariableNames.Where(v => inputvariables.Contains(v)).Where(problemData.Dataset.VariableHasType<double>).ToList();
-
-        rawVariableImpacts.Clear();
-        originalVariableOrdering.ForEach(v => rawVariableImpacts.Add(v, impacts.First(vv => vv.Item1 == v).Item2));
-      }).ContinueWith((o) => {
-        UpdateDataOrdering();
-        mainForm.RemoveOperationProgressFromView(this);
-        thread = null;
-      }, TaskScheduler.FromCurrentSynchronizationContext());
+      progress = mainForm.AddOperationProgressToView(this, "Calculating variable impacts for " + Content.Name);
+      progress.ProgressValue = 0;
+
+      if (!worker.IsBusy) {
+        worker.RunWorkerAsync(new BackgroundworkerArguments() {
+          mainForm = mainForm,
+          dataPartition = dataPartition,
+          factorReplMethod = factorReplMethod,
+          replMethod = replMethod
+        });
+      }
     }
 
@@ -221 +242 @@
       }
     }
-    #endregion
   }
 }