Changeset 3276 for trunk

Timestamp:

04/06/10 04:12:26 (14 years ago)

Author:

swagner

Message:

Continued work on algorithm batch processing (#947).

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• BatchRun.cs (modified) (1 diff)
• Experiment.cs (modified) (1 diff)

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

@@ -259 +259 @@
     }
     private void Algorithm_Prepared(object sender, EventArgs e) {
-      OnPrepared();
+      if ((ExecutionState == ExecutionState.Paused) || (ExecutionState == ExecutionState.Stopped))
+        OnPrepared();
     }
     private void Algorithm_Started(object sender, EventArgs e) {
       stopPending = false;
-      OnStarted();
+      if (ExecutionState != ExecutionState.Started)
+        OnStarted();
     }
     private void Algorithm_Stopped(object sender, EventArgs e) {
       ExecutionTime += Algorithm.ExecutionTime;
-      OnStopped();
 
       if (!stopPending && (runs.Count < repetitions)) {
         Algorithm.Prepare();
         Algorithm.Start();
+      } else {
+        OnStopped();
       }
     }

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

@@ -278 +278 @@
     }
     private void optimizer_Stopped(object sender, EventArgs e) {
-      bool stop = stopPending;
-
-      if (Optimizers.All(x => (x.ExecutionState != ExecutionState.Started) && (x.ExecutionState != ExecutionState.Paused))) {
-        stopPending = false;
-        OnStopped();
-      }
-
-      if (!stop) {
-        IOptimizer next = Optimizers.FirstOrDefault(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused));
-        if (next != null)
-          next.Start();
+      if (!stopPending && 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.Started) && (x.ExecutionState != ExecutionState.Paused))) {
+          stopPending = false;
+          OnStopped();
+        }
       }
     }