Changeset 1851

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)

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)
• HeuristicLab.SupportVectorMachines/3.2/SupportVectorCreator.cs (modified) (2 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>
@@ -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]);

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SupportVectorCreator.cs

@@ -34 +34 @@
     private object locker = new object();
     private bool abortRequested = false;
-
-    public override bool SupportsAbort {
-      get {
-        return true;
-      }
-    }
 
     public SupportVectorCreator()
@@ -103 +97 @@
         rangeTransformData.Data = rangeTransform;
         scope.AddVariable(new Variable(scope.TranslateName("SVMRangeTransform"), rangeTransformData));
+        return null;
+      } else {
+        return new AtomicOperation(this, scope);
       }
-      return null;
     }