Changeset 8012 for trunk/sources

Timestamp:

06/15/12 21:37:27 (12 years ago)

Author:

abeham

Message:

#1851: fixed cancellation of experiment creation

File:

• trunk/sources/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs

@@ -682 +682 @@
       int counter = 0, totalVariations = GetNumberOfVariations();
       if (instances.Count == 0) {
-        AddParameterVariations(Optimizer, localExperiment, ref counter, totalVariations);
+        try {
+          AddParameterVariations(Optimizer, localExperiment, ref counter, totalVariations);
+        } catch (OperationCanceledException) {
+          e.Cancel = true;
+          localExperiment = null;
+          return;
+        }
         experimentCreationBackgroundWorker.ReportProgress(100, string.Empty);
-
       } else {
         foreach (var provider in instances.Keys) {
           foreach (var descriptor in instances[provider]) {
-            #region Check cancellation request
-            if (experimentCreationBackgroundWorker.CancellationPending) {
-              e.Cancel = true;
-              localExperiment = null;
-              return;
-            }
-            #endregion
             var algorithm = (IAlgorithm)Optimizer.Clone();
             bool failed = false;
             try {
               ProblemInstanceManager.LoadData(provider, descriptor, (IProblemInstanceConsumer)algorithm.Problem);
-            }
-            catch (Exception ex) {
+            } catch (Exception ex) {
               failedInstances.AppendLine(descriptor.Name + ": " + ex.Message);
               failed = true;
             }
             if (!failed) {
-
-              AddParameterVariations(algorithm, localExperiment, ref counter, totalVariations);
+              try {
+                AddParameterVariations(algorithm, localExperiment, ref counter, totalVariations);
+              } catch (OperationCanceledException) {
+                e.Cancel = true;
+                localExperiment = null;
+                return;
+              }
             } else experimentCreationBackgroundWorker.ReportProgress((int)Math.Round((100.0 * counter) / totalVariations), "Loading failed (" + descriptor.Name + ")");
           }
@@ -724 +726 @@
       var variations = experimentCreationBackgroundWorker_CalculateParameterVariations(optimizer);
       foreach (var v in variations) {
+        if (experimentCreationBackgroundWorker.CancellationPending)
+          throw new OperationCanceledException();
         AddOptimizer(v, localExperiment);
         counter++;