Changeset 7238 for trunk/sources

Timestamp:

12/27/11 13:35:32 (13 years ago)

Author:

ascheibe

Message:

#1714 reverted the changes from r7196 and r7197. If an optimizer in the experiment is stopped and there exists another prepared optimizer, the experiment is now set to prepared. This enables the correct buttons in the experiment view and the remaining optimizers can be executed.

File:

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

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

@@ -338 +338 @@
     }
     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) && Optimizers.All(o => o.ExecutionState != ExecutionState.Paused)) OnStopped();
+      if (!experimentStarted && Optimizers.Any(o => o.ExecutionState == ExecutionState.Prepared) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started && o.ExecutionState != ExecutionState.Paused)) OnPrepared();
+      else if (Optimizers.All(o => o.ExecutionState == ExecutionState.Stopped)) 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))) {