Changeset 1851 for trunk/sources/HeuristicLab.SequentialEngine

Timestamp:

05/19/09 13:18:46 (16 years ago)

Author:

gkronber

Message:

Reverted r1847 after discussion with swagner. Instead each operator should decide independently what happens after abort and adapt the returned next operation accordingly. #633 (Engines do not handle abortion of operators correctly)

File:

• trunk/sources/HeuristicLab.SequentialEngine/3.2/SequentialEngine.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.SequentialEngine/3.2/SequentialEngine.cs

@@ -33 +33 @@
   public class SequentialEngine : EngineBase, IEditable {
     private IOperator currentOperator;
-    private IOperation currentOperation;
 
     /// <summary>
@@ -58 +57 @@
     public override void Abort() {
       base.Abort();
-      if (currentOperator != null && currentOperator.SupportsAbort) {
+      if (currentOperator != null)
         currentOperator.Abort();
-        myExecutionStack.Push(currentOperation);
-      }
     }
 
@@ -72 +69 @@
     /// If the execution was successful <see cref="EngineBase.OnOperationExecuted"/> is called.</remarks>
     protected override void ProcessNextOperation() {
-      currentOperation = myExecutionStack.Pop();
-      if (currentOperation is AtomicOperation) {
-        AtomicOperation atomicOperation = (AtomicOperation)currentOperation;
+      IOperation operation = myExecutionStack.Pop();
+      if (operation is AtomicOperation) {
+        AtomicOperation atomicOperation = (AtomicOperation)operation;
         IOperation next = null;
         try {
@@ -90 +87 @@
         OnOperationExecuted(atomicOperation);
         if (atomicOperation.Operator.Breakpoint) Abort();
-      } else if (currentOperation is CompositeOperation) {
-        CompositeOperation compositeOperation = (CompositeOperation)currentOperation;
+      } else if (operation is CompositeOperation) {
+        CompositeOperation compositeOperation = (CompositeOperation)operation;
         for (int i = compositeOperation.Operations.Count - 1; i >= 0; i--)
           myExecutionStack.Push(compositeOperation.Operations[i]);