Changeset 17681

Timestamp:

07/18/20 06:51:42 (4 years ago)

Author:

gkronber

Message:

#3075: merged r17646:17648 from trunk to branch

Location:

branches/3075_aifeynman_instances

Files:

• . (modified) (1 prop)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionCSharpFormatter.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/RegressionInstanceProviderView.cs (modified) (2 diffs)

branches/3075_aifeynman_instances/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs

@@ -179 +179 @@
 
     private void UpdateProgressValue() {
+      if (Disposing || IsDisposed) return;
       if (InvokeRequired) {
         Invoke((Action)UpdateProgressValue);

branches/3075_aifeynman_instances/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionCSharpFormatter.cs

@@ -154 +154 @@
           strBuilder.Append(" / Math.Sqrt(1 + Math.Pow(");
           FormatRecursively(node.GetSubtree(1), strBuilder);
-          strBuilder.Append(" , 2) )");
+          strBuilder.Append(" , 2) ) )");
         } else {
           throw new NotSupportedException("Formatting of symbol: " + node.Symbol + " not supported for C# symbolic expression tree formatter.");

branches/3075_aifeynman_instances/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/RegressionInstanceProviderView.cs

@@ -49 +49 @@
           var content = activeView.Content;
           // lock active view and show progress bar
+          IProgress progress = null;
           try {
-            var progress = Progress.Show(content, "Loading problem instance.");
+            progress = Progress.Show(content, "Loading problem instance.");
 
-            Content.ProgressChanged += (o, args) => { progress.ProgressValue = args.ProgressPercentage / 100.0; };
+            Content.ProgressChanged += (o, args) => {
+              lock (progress) {
+                if (progress.ProgressState == ProgressState.Started)
+                  progress.ProgressValue = args.ProgressPercentage / 100.0;
+              }
+            };
 
             instance = Content.ImportData(importTypeDialog.Path, importTypeDialog.ImportType, importTypeDialog.CSVFormat);
@@ -59 +65 @@
             return;
           } finally {
-            Progress.Hide(content);
+            lock (progress) {
+              Progress.Hide(content);
+            }
           }