Changeset 3262 for trunk/sources/HeuristicLab.SequentialEngine

Timestamp:

04/04/10 05:22:47 (14 years ago)

Author:

swagner

Message:

Continued work on algorithm batch processing (#947).

File:

• trunk/sources/HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs (modified) (1 diff)

trunk/sources/HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs

@@ -56 +56 @@
           currentOperator = operation.Operator;
           ExecutionStack.Push(operation.Operator.Execute((IExecutionContext)operation));
-          currentOperator = null;
         }
         catch (Exception ex) {
           ExecutionStack.Push(operation);
           OnExceptionOccurred(ex);
-          Stop();
+          Pause();
         }
         if (operation.Operator.Breakpoint)
-          Stop();
+          Pause();
       }
     }
 
-    protected override void OnCanceledChanged() {
-      if (Canceled && (currentOperator != null))
-        currentOperator.Abort();
+    public override void Pause() {
+      base.Pause();
+      if (currentOperator != null) currentOperator.Abort();
+    }
+    public override void Stop() {
+      base.Stop();
+      if (currentOperator != null) currentOperator.Abort();
     }
   }