Changeset 15560 for trunk/sources/HeuristicLab.Optimization

Timestamp:

12/22/17 16:34:50 (7 years ago)

Author:

pfleck

Message:

#2822:

• Fixed bug that multiple of the same event was triggreed.
• Set experimentStarted to false if experiment is paused/prepared/stopped.

File:

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

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

@@ -235 +235 @@
         }
 
-        Task.WaitAll(startedOptimizers.Values.ToArray()); // retreive exeptions of the asyncrounously started optimizer
+        Task.WaitAll(startedOptimizers.Values.ToArray()); // retrieve exeptions of the asyncrounously started optimizer
       }
     }
@@ -289 +289 @@
     public event EventHandler Prepared;
     private void OnPrepared() {
+      if (ExecutionState == ExecutionState.Prepared) return;
       ExecutionState = ExecutionState.Prepared;
       EventHandler handler = Prepared;
@@ -295 +296 @@
     public event EventHandler Started;
     private void OnStarted() {
+      if (ExecutionState == ExecutionState.Started) return;
       ExecutionState = ExecutionState.Started;
       EventHandler handler = Started;
@@ -301 +303 @@
     public event EventHandler Paused;
     private void OnPaused() {
+      if (ExecutionState == ExecutionState.Paused) return;
       ExecutionState = ExecutionState.Paused;
       EventHandler handler = Paused;
@@ -307 +310 @@
     public event EventHandler Stopped;
     private void OnStopped() {
+      if (ExecutionState == ExecutionState.Stopped) return;
       ExecutionState = ExecutionState.Stopped;
       EventHandler handler = Stopped;
@@ -427 +431 @@
       lock (locker) {
         // 1. experiment is running & further startable optimizers are available => continue executing
-        if (experimentStarted && StartableOptimizers.Any()) return;
+        if (experimentStarted && StartableOptimizers.Any())
+          return;
 
         // 2. any optimizer is running => continue executing
-        else if (Optimizers.Any(x => x.ExecutionState == ExecutionState.Started))
+        if (Optimizers.Any(x => x.ExecutionState == ExecutionState.Started))
           return;
 
+        experimentStarted = false;
         // 3. any optimizer is paused => experiment paused
-        else if (Optimizers.Any(x => x.ExecutionState == ExecutionState.Paused))
+        if (Optimizers.Any(x => x.ExecutionState == ExecutionState.Paused))
           OnPaused();