Changeset 7196 for trunk/sources/HeuristicLab.Optimization

Timestamp:

12/16/11 16:07:21 (13 years ago)

Author:

ascheibe

Message:

#1714 stopping an optimizer or a batch run inside an experiment now enables the prepare button in the parent if there are no other running optimizers or batch runs in the experiment

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.All(o => o.ExecutionState == ExecutionState.Stopped)) 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.Paused) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started)) OnPaused();
       else if (experimentStarted && !experimentStopped && Optimizers.Any(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused))) {