Changeset 7268 for branches/HeuristicLab.TimeSeries/HeuristicLab.Optimization/3.3/Experiment.cs

Timestamp:

01/03/12 11:22:21 (13 years ago)

Author:

gkronber

Message:

#1081: merged r7214:7266 from trunk into time series branch.

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization/3.3/Experiment.cs (modified) (4 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Optimization/3.3/Experiment.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -175 +175 @@
 
       if (clearRuns) runs.Clear();
+
+      experimentStarted = false;
+      experimentStopped = false;
       foreach (IOptimizer optimizer in Optimizers.Where(x => x.ExecutionState != ExecutionState.Started))
         if (clearRuns || optimizer.ExecutionState != ExecutionState.Prepared)
@@ -206 +209 @@
       experimentStarted = false;
       experimentStopped = true;
-      foreach (IOptimizer optimizer in Optimizers.Where(x => (x.ExecutionState == ExecutionState.Started) || (x.ExecutionState == ExecutionState.Paused)))
-        optimizer.Stop();
+      if (Optimizers.Any(x => (x.ExecutionState == ExecutionState.Started) || (x.ExecutionState == ExecutionState.Paused))) {
+        foreach (IOptimizer optimizer in Optimizers.Where(x => (x.ExecutionState == ExecutionState.Started) || (x.ExecutionState == ExecutionState.Paused)))
+          optimizer.Stop();
+      } else {
+        OnStopped();
+      }
     }
 
@@ -326 +333 @@
     }
     private void optimizer_Paused(object sender, EventArgs e) {
-      if (Optimizers.All(x => x.ExecutionState != ExecutionState.Started))
-        OnPaused();
+      if (Optimizers.All(x => x.ExecutionState != ExecutionState.Started)) OnPaused();
     }
     private void optimizer_Prepared(object sender, EventArgs e) {
-      if (ExecutionState == ExecutionState.Stopped)
-        OnPrepared();
+      if (Optimizers.All(x => x.ExecutionState == ExecutionState.Prepared)) OnPrepared();
+      else if (Optimizers.All(x => x.ExecutionState != ExecutionState.Started)) OnPaused();
     }
     private void optimizer_Started(object sender, EventArgs e) {
-      if (ExecutionState != ExecutionState.Started)
-        OnStarted();
+      if (ExecutionState != ExecutionState.Started) OnStarted();
     }
     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();
-      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))) {
-        Optimizers.First(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused)).Start();
+      if (experimentStopped) {
+        if (Optimizers.All(x => (x.ExecutionState == ExecutionState.Stopped) || (x.ExecutionState == ExecutionState.Prepared))) OnStopped();
+      } else {
+        if (experimentStarted && Optimizers.Any(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused))) {
+          Optimizers.First(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused)).Start();
+        } else if (Optimizers.All(x => x.ExecutionState == ExecutionState.Stopped)) OnStopped();
+        else if (Optimizers.Any(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused)) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started)) OnPaused();
       }
     }