Changeset 15284

Timestamp:

07/25/17 14:16:08 (7 years ago)

Author:

jkarder

Message:

#2258: worked on basic algorithm and cross-validation

Location:

branches/Async

Files:

• HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs (modified) (2 diffs)

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

@@ -381 +381 @@
         pausePending = true;
         lock (locker) {
-          var toPause = clonedAlgorithms.Where(x => x.ExecutionState == ExecutionState.Started);
+          var toPause = clonedAlgorithms.Where(x => x.ExecutionState == ExecutionState.Started).ToList();
           foreach (var optimizer in toPause) {
             // a race-condition may occur when the optimizer has changed the state by itself in the meantime
@@ -399 +399 @@
         stopPending = true;
         lock (locker) {
-          var toStop = clonedAlgorithms.Where(x => x.ExecutionState == ExecutionState.Started || x.ExecutionState == ExecutionState.Paused);
+          var toStop = clonedAlgorithms.Where(x => x.ExecutionState == ExecutionState.Started || x.ExecutionState == ExecutionState.Paused).ToList();
           foreach (var optimizer in toStop) {
             // a race-condition may occur when the optimizer has changed the state by itself in the meantime

branches/Async/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs

@@ -76 +76 @@
       pausePending = false;
       OnStarted();
+
       try {
         Run((object)cancellationTokenSource.Token);
@@ -87 +88 @@
       CancellationTokenSource.Dispose();
       CancellationTokenSource = null;
-      OnStopped();
+      if (pausePending) OnPaused();
+      else OnStopped();
     }