Changeset 15327 for trunk/sources/HeuristicLab.Optimization

Timestamp:

08/17/17 12:51:06 (7 years ago)

Author:

pfleck

Message:

#2823 Fixed potential early return of sync Start method.

File:

• trunk/sources/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs (modified) (5 diffs)

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

@@ -111 +111 @@
     private bool experimentStarted = false;
     private bool experimentStopped = false;
+    private ManualResetEventSlim allOptimizerFinished; // this indicates that all started optimizers have been paused or stopped
 
     public Experiment()
@@ -195 +196 @@
       experimentStarted = true;
       experimentStopped = false;
+      allOptimizerFinished = new ManualResetEventSlim(false);
+
       IOptimizer optimizer;
       while ((optimizer = Optimizers.FirstOrDefault(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused))) != null) {
@@ -201 +204 @@
         if (ExecutionState == ExecutionState.Paused || ExecutionState == ExecutionState.Stopped) break;
       }
+
+      allOptimizerFinished.Wait();
     }
     public async Task StartAsync() { await StartAsync(CancellationToken.None); }
@@ -368 +373 @@
     private void optimizer_Paused(object sender, EventArgs e) {
       lock (locker)
-        if (Optimizers.All(x => x.ExecutionState != ExecutionState.Started)) OnPaused();
+        if (Optimizers.All(x => x.ExecutionState != ExecutionState.Started)) {
+          OnPaused();
+          allOptimizerFinished.Set();
+        }
     }
     private void optimizer_Prepared(object sender, EventArgs e) {
@@ -381 +389 @@
       lock (locker) {
         if (experimentStopped) {
-          if (Optimizers.All(x => (x.ExecutionState == ExecutionState.Stopped) || (x.ExecutionState == ExecutionState.Prepared))) OnStopped();
+          if (Optimizers.All(x => (x.ExecutionState == ExecutionState.Stopped) || (x.ExecutionState == ExecutionState.Prepared))) {
+            OnStopped();
+            allOptimizerFinished.Set();
+          }
         } else {
           if (experimentStarted && Optimizers.Any(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused))) return;
-          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();
+          else if (Optimizers.All(x => x.ExecutionState == ExecutionState.Stopped)) {
+            OnStopped();
+            allOptimizerFinished.Set();
+          } else if (Optimizers.Any(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused)) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started)) {
+            OnPaused();
+            allOptimizerFinished.Set();
+          }
         }
       }