Changeset 1847 for trunk

Timestamp:

05/18/09 23:14:57 (16 years ago)

Author:

gkronber

Message:

Fixed #633 for the SequentialEngine by:

• introducing a boolean property into IOperator that indicates if an operator supports abortion.
• pushing the current operation back onto the execution stack of the SequentialEngine when the current operator can be aborted.

Location:

trunk/sources

Files:

• HeuristicLab.Core/3.2/Interfaces/IOperator.cs (modified) (1 diff)
• HeuristicLab.Core/3.2/OperatorBase.cs (modified) (1 diff)
• HeuristicLab.SequentialEngine/3.2/SequentialEngine.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Core/3.2/Interfaces/IOperator.cs

@@ -60 +60 @@
     /// </summary>
     ICollection<IVariable> Variables { get; }
-
+    /// <summary>
+    /// Gets information whether abortion of the operator is supported.
+    /// </summary>
+    bool SupportsAbort { get; }
     /// <summary>
     /// Adds the given sub operator to the current instance.

trunk/sources/HeuristicLab.Core/3.2/OperatorBase.cs

@@ -89 +89 @@
     public virtual ICollection<IVariable> Variables {
       get { return myVariables.Values; }
+    }
+    /// <inheritdoc/>
+    /// The default is false.
+    public virtual bool SupportsAbort {
+      get { return false; }
     }
 

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

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