Changeset 7238


Ignore:
Timestamp:
12/27/11 13:35:32 (8 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Optimization/3.3/Experiment.cs

    r7201 r7238  
    338338    }
    339339    private void optimizer_Stopped(object sender, EventArgs e) {
    340       if (experimentStopped && Optimizers.All(o => o.ExecutionState == ExecutionState.Stopped || o.ExecutionState == ExecutionState.Prepared)) OnStopped();
    341       else if (Optimizers.Any(o => o.ExecutionState == ExecutionState.Stopped) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started) && Optimizers.All(o => o.ExecutionState != ExecutionState.Paused)) OnStopped();
     340      if (!experimentStarted && Optimizers.Any(o => o.ExecutionState == ExecutionState.Prepared) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started && o.ExecutionState != ExecutionState.Paused)) OnPrepared();
     341      else if (Optimizers.All(o => o.ExecutionState == ExecutionState.Stopped)) OnStopped();
    342342      else if (Optimizers.Any(o => o.ExecutionState == ExecutionState.Paused) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started)) OnPaused();
    343343      else if (experimentStarted && !experimentStopped && Optimizers.Any(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused))) {
Note: See TracChangeset for help on using the changeset viewer.