Changeset 15415 for branches/EnhancedProgress/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

Timestamp:

10/10/17 14:30:37 (7 years ago)

Author:

pfleck

Message:

#2845

• Fixed/Added Progress Cancellation/Stopping
• Added Visible property to progress and ProgressBarMode.

File:

• branches/EnhancedProgress/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (modified) (3 diffs)

branches/EnhancedProgress/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

@@ -40 +40 @@
     private readonly ISymbolicDataAnalysisSolutionImpactValuesCalculator impactCalculator;
 
-    private readonly IProgress progress = new Progress();
+    private readonly IProgress progress = new Progress() { CanBeCanceled = true, CanBeStopped = true };
 
     private enum TreeState { Valid, Invalid }
@@ -183 +183 @@
       treeChart.Tree = tree.Root.SubtreeCount > 1 ? new SymbolicExpressionTree(tree.Root) : new SymbolicExpressionTree(tree.Root.GetSubtree(0).GetSubtree(0));
 
-      progress.Start("Calculate Impact and Replacement Values ...");
+      progress.Start("Calculate Impact and Replacement Values ...", 0);
       var impactAndReplacementValues = await Task.Run(() => CalculateImpactAndReplacementValues(tree));
       await Task.Delay(500); // wait for progressbar to finish animation
@@ -298 +298 @@
 
     private async void btnOptimizeConstants_Click(object sender, EventArgs e) {
-      progress.Start("Optimizing Constants ...");
+      progress.Start("Optimizing Constants ...", 0);
       var tree = (ISymbolicExpressionTree)Content.Model.SymbolicExpressionTree.Clone();
       var newTree = await Task.Run(() => OptimizeConstants(tree, progress));