Changeset 5187 for branches/ParallelEngine/HeuristicLab.ParallelEngine

Timestamp:

01/02/11 04:05:04 (13 years ago)

Author:

swagner

Message:

Worked on cancellation and refactored code (#1333)

File:

• branches/ParallelEngine/HeuristicLab.ParallelEngine/3.3/ParallelEngine.cs (modified) (2 diffs)

branches/ParallelEngine/HeuristicLab.ParallelEngine/3.3/ParallelEngine.cs

@@ -92 +92 @@
           } else {
             for (int i = coll.Count - 1; i >= 0; i--)
-              if (coll[i] != null) ExecutionStack.Push(coll[i]);
+              if (coll[i] != null) executionStack.Push(coll[i]);
           }
         } else if (next is IAtomicOperation) {
@@ -101 +101 @@
           catch (Exception ex) {
             executionStack.Push(operation);
-            throw new OperatorExecutionException(operation.Operator, ex);
+            if (ex is OperationCanceledException) throw ex;
+            else throw new OperatorExecutionException(operation.Operator, ex);
           }
           if (next != null) executionStack.Push(next);
+
+          if (operation.Operator.Breakpoint) {
+            string message = string.Format("Breakpoint: {0}", operation.Operator.Name != string.Empty ? operation.Operator.Name : operation.Operator.ItemName);
+            Log.LogMessage(message);
+            throw new OperationCanceledException(message);
+          }
         }
       }