- Timestamp:
- 12/20/11 11:45:18 (12 years ago)
- Location:
- branches/HeuristicLab.TimeSeries
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.TimeSeries
-
branches/HeuristicLab.TimeSeries/HeuristicLab.Optimization/3.3/Experiment.cs
r6767 r7213 39 39 public string Filename { get; set; } 40 40 41 public static new Image StaticItemImage { 42 get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; } 43 } 41 44 public override Image ItemImage { 42 45 get { … … 45 48 else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.ExperimentPaused; 46 49 else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VSImageLibrary.ExperimentStopped; 47 else return HeuristicLab.Common.Resources.VSImageLibrary.Event;50 else return base.ItemImage; 48 51 } 49 52 } … … 336 339 private void optimizer_Stopped(object sender, EventArgs e) { 337 340 if (experimentStopped && Optimizers.All(o => o.ExecutionState == ExecutionState.Stopped || o.ExecutionState == ExecutionState.Prepared)) OnStopped(); 338 else if (Optimizers.A ll(o => o.ExecutionState == ExecutionState.Stopped)) 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(); 339 342 else if (Optimizers.Any(o => o.ExecutionState == ExecutionState.Paused) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started)) OnPaused(); 340 343 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.