Changeset 6024 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization

Timestamp:

04/18/11 23:27:42 (14 years ago)

Author:

cneumuel

Message:

#1215

• improved the way AlgorithmExecutor handles cancellation

Location:

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3

Files:

• AlgorithmExecutor.cs (modified) (3 diffs)
• Evaluators/AlgorithmEvaluator.cs (modified) (1 diff)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/AlgorithmExecutor.cs

@@ -6 +6 @@
 
   public static class AlgorithmExtensions {
-    public static void StartSync(this IAlgorithm algorithm) {
-      var executor = new AlgorithmExecutor(algorithm);
-      executor.StartSync();
-    }
     public static void StartSync(this IAlgorithm algorithm, CancellationToken cancellationToken) {
       var executor = new AlgorithmExecutor(algorithm, cancellationToken);
@@ -23 +19 @@
     private AutoResetEvent waitHandle = new AutoResetEvent(false);
     private CancellationToken cancellationToken;
-    private bool useCancellationToken = false;
-
-    public AlgorithmExecutor(IAlgorithm algorithm) {
-      this.algorithm = algorithm;
-    }
 
     public AlgorithmExecutor(IAlgorithm algorithm, CancellationToken cancellationToken) {
       this.algorithm = algorithm;
       this.cancellationToken = cancellationToken;
-      this.useCancellationToken = true;
     }
 
@@ -38 +28 @@
       algorithm.Stopped += new EventHandler(algorithm_Stopped);
       algorithm.Paused += new EventHandler(algorithm_Paused);
-      
-      if(useCancellationToken && algorithm is EngineAlgorithm && ((EngineAlgorithm)algorithm).Engine is SequentialEngine.SequentialEngine) {
-        ((SequentialEngine.SequentialEngine)((EngineAlgorithm)algorithm).Engine).Start(cancellationToken);
-      } else {
+
+      using (CancellationTokenRegistration registration = cancellationToken.Register(new Action(cancellationToken_Canceled))) {
         algorithm.Start();
+        waitHandle.WaitOne();
+        waitHandle.Dispose();
       }
 
-      waitHandle.WaitOne();
-      waitHandle.Dispose();
       algorithm.Stopped -= new EventHandler(algorithm_Stopped);
       algorithm.Paused -= new EventHandler(algorithm_Paused);
+      if (algorithm.ExecutionState == Core.ExecutionState.Started) {
+        algorithm.Pause();
+      }
+      cancellationToken.ThrowIfCancellationRequested();
     }
 
-    void algorithm_Paused(object sender, EventArgs e) {
+    private void algorithm_Paused(object sender, EventArgs e) {
       waitHandle.Set();
     }
 
-    void algorithm_Stopped(object sender, EventArgs e) {
+    private void algorithm_Stopped(object sender, EventArgs e) {
+      waitHandle.Set();
+    }
+
+    private void cancellationToken_Canceled() {
       waitHandle.Set();
     }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Evaluators/AlgorithmEvaluator.cs

@@ -64 +64 @@
       var sw = new Stopwatch();
       sw.Start();
+      //// prepare and clear is needed, if the algorithm has been started and stopped before (this happens when meta level algorithm is paused)
+      //algorithm.Prepare(); // <--- SHOULD NOT HAPPEN!
+      //algorithm.Runs.Clear();
+
       algorithm.StartSync(CancellationToken);
       sw.Stop();