Changeset 7197 for trunk/sources/HeuristicLab.Optimization/3.3/Experiment.cs

Timestamp:

12/16/11 16:32:40 (12 years ago)

Author:

ascheibe

Message:

#1714 also take paused optimizers into account when an optimizer is stopped

File:

• trunk/sources/HeuristicLab.Optimization/3.3/Experiment.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimization/3.3/Experiment.cs

@@ -336 +336 @@
     private void optimizer_Stopped(object sender, EventArgs e) {
       if (experimentStopped && Optimizers.All(o => o.ExecutionState == ExecutionState.Stopped || o.ExecutionState == ExecutionState.Prepared)) OnStopped();
-      else if (Optimizers.Any(o => o.ExecutionState == ExecutionState.Stopped) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started)) OnStopped();
+      else if (Optimizers.Any(o => o.ExecutionState == ExecutionState.Stopped) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started) && Optimizers.All(o => o.ExecutionState != ExecutionState.Paused)) OnStopped();
       else if (Optimizers.Any(o => o.ExecutionState == ExecutionState.Paused) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started)) OnPaused();
       else if (experimentStarted && !experimentStopped && Optimizers.Any(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused))) {