Changeset 15204 for branches/Async/HeuristicLab.Algorithms.DataAnalysis/3.4

Timestamp:

07/11/17 21:58:59 (7 years ago)

Author:

jkarder

Message:

#2258: worked on execution of cross-validation

File:

• branches/Async/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs (modified) (10 diffs)

branches/Async/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs

@@ -40 +40 @@
   [StorableClass]
   public sealed class CrossValidation : ParameterizedNamedItem, IAlgorithm, IStorableContent {
-    private SemaphoreSlim ticket;
-    private ManualResetEventSlim signal;
+    private SemaphoreSlim availableWorkers; // limits the number of concurrent algorithm executions
+    private ManualResetEventSlim allAlgorithmsFinished; // this indicates that all started algorithms have been paused or stopped
 
     public CrossValidation()
@@ -311 +311 @@
 
       OnStarted();
-      ticket = new SemaphoreSlim(NumberOfWorkers.Value);
-      signal = new ManualResetEventSlim(false);
+      availableWorkers = new SemaphoreSlim(NumberOfWorkers.Value, NumberOfWorkers.Value);
+      allAlgorithmsFinished = new ManualResetEventSlim(false);
 
       //start prepared or paused cloned algorithms
       foreach (IAlgorithm clonedAlgorithm in clonedAlgorithms) {
-        if (pausePending || stopPending) break;
+        if (pausePending || stopPending || ExecutionState != ExecutionState.Started) break;
         if (clonedAlgorithm.ExecutionState == ExecutionState.Prepared ||
             clonedAlgorithm.ExecutionState == ExecutionState.Paused) {
-          ticket.Wait();
+          availableWorkers.Wait();
           lock (locker) {
-            if (pausePending || stopPending) break;
+            if (pausePending || stopPending || ExecutionState != ExecutionState.Started) break;
             clonedAlgorithm.StartAsync(cancellationToken);
           }
@@ -327 +327 @@
       }
 
-      signal.Wait();
-      if (pausePending) OnPaused();
-      else OnStopped();
+      allAlgorithmsFinished.Wait();
     }
 
@@ -343 +341 @@
       if (!pausePending) {
         pausePending = true;
-        var toPause = clonedAlgorithms.Where(x => x.ExecutionState == ExecutionState.Started);
-        if (toPause.Any()) {
+        lock (locker) {
+          var toPause = clonedAlgorithms.Where(x => x.ExecutionState == ExecutionState.Started);
           foreach (var optimizer in toPause) {
             // a race-condition may occur when the optimizer has changed the state by itself in the meantime
@@ -350 +348 @@
           }
         }
-        if (ExecutionState != ExecutionState.Paused) OnPaused();
       }
     }
@@ -361 +358 @@
       if (!stopPending) {
         stopPending = true;
-        var toStop = clonedAlgorithms.Where(x => x.ExecutionState == ExecutionState.Started || x.ExecutionState == ExecutionState.Paused);
-        if (toStop.Any()) {
+        lock (locker) {
+          var toStop = clonedAlgorithms.Where(x => x.ExecutionState == ExecutionState.Started || x.ExecutionState == ExecutionState.Paused);
           foreach (var optimizer in toStop) {
             // a race-condition may occur when the optimizer has changed the state by itself in the meantime
@@ -368 +365 @@
           }
         }
-        if (ExecutionState != ExecutionState.Stopped) OnStopped();
       }
     }
@@ -656 +652 @@
     }
     private void ClonedAlgorithm_ExceptionOccurred(object sender, EventArgs<Exception> e) {
+      Pause();
       OnExceptionOccurred(e.Value);
     }
@@ -674 +671 @@
     private void ClonedAlgorithm_Paused(object sender, EventArgs e) {
       lock (locker) {
-        if (ExecutionState != ExecutionState.Paused) {
-          if (clonedAlgorithms.All(alg => alg.ExecutionState != ExecutionState.Started)) {
-            pausePending = true;
-            signal.Set();
-            ticket.Release();
-          }
+        availableWorkers.Release();
+        if (clonedAlgorithms.All(alg => alg.ExecutionState != ExecutionState.Started)) {
+          OnPaused();
+          allAlgorithmsFinished.Set();
         }
       }
@@ -686 +681 @@
     private void ClonedAlgorithm_Stopped(object sender, EventArgs e) {
       lock (locker) {
-        if (ExecutionState != ExecutionState.Stopped) {
-          if (clonedAlgorithms.All(alg => alg.ExecutionState == ExecutionState.Stopped || stopPending && alg.ExecutionState == ExecutionState.Prepared)) {
-            stopPending = true;
-            signal.Set();
-          }
-          ticket.Release();
+        // if the algorithm was in paused state, its worker has already been released
+        if (availableWorkers.CurrentCount < NumberOfWorkers.Value)
+          availableWorkers.Release();
+        if (clonedAlgorithms.All(alg => alg.ExecutionState == ExecutionState.Stopped)) {
+          OnStopped();
+          allAlgorithmsFinished.Set();
+        } else if (stopPending && clonedAlgorithms.All(alg => alg.ExecutionState == ExecutionState.Prepared || alg.ExecutionState == ExecutionState.Stopped)) {
+          OnStopped();
+          allAlgorithmsFinished.Set();
         }
       }