Changeset 15799

Timestamp:

02/21/18 14:08:26 (6 years ago)

Author:

fholzing

Message:

#2871: Added textual status update

Location:

trunk

Files:

• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolutionVariableImpactsCalculator.cs (modified) (3 diffs)

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

@@ -154 +154 @@
       try {
         var impacts = await Task.Run(() => RegressionSolutionVariableImpactsCalculator.CalculateImpacts(Content, dataPartition, replMethod, factorReplMethod,
-          (i) => {
+          (i, s) => {
             progress.ProgressValue = i;
+            progress.Status = s;
             return cancellationToken.Token.IsCancellationRequested;
           }), cancellationToken.Token);

trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolutionVariableImpactsCalculator.cs

@@ -97 +97 @@
       ReplacementMethodEnum replacementMethod = ReplacementMethodEnum.Median,
       FactorReplacementMethodEnum factorReplacementMethod = FactorReplacementMethodEnum.Best,
-      Func<double, bool> progressCallback = null) {
+      Func<double, string, bool> progressCallback = null) {
 
       var problemData = solution.ProblemData;
@@ -135 +135 @@
       var allowedInputVariables = dataset.VariableNames.Where(v => inputvariables.Contains(v)).ToList();
 
-      int curIdx = 1;
+      int curIdx = 0;
       int count = allowedInputVariables.Where(problemData.Dataset.VariableHasType<double>).Count();
       // calculate impacts for double variables
@@ -141 +141 @@
         //Report the current progress in percent. If the callback returns true, it means the execution shall be stopped
         if (progressCallback != null) {
-          if (progressCallback((double)curIdx++ / count)) { return null; }
+          curIdx++;
+          if (progressCallback((double)curIdx / count, $"Calculating impact for variable {inputVariable} ({curIdx} of {count})")) { return null; }
         }
         var newEstimates = EvaluateModelWithReplacedVariable(solution.Model, inputVariable, modifiableDataset, rows, replacementMethod);