Changeset 5187 for branches

Timestamp:

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

Author:

swagner

Message:

Worked on cancellation and refactored code (#1333)

Location:

branches/ParallelEngine

Files:

• HeuristicLab.Core/3.3/Engine.cs (modified) (1 diff)
• HeuristicLab.ParallelEngine/3.3/ParallelEngine.cs (modified) (2 diffs)
• HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs (modified) (1 diff)

branches/ParallelEngine/HeuristicLab.Core/3.3/Engine.cs

@@ -93 +93 @@
         }
         catch (AggregateException ex) {
-          ex.Flatten().Handle(x => {
-            if (!(x is OperationCanceledException)) OnExceptionOccurred(x);
-            return true;
-          });
+          try {
+            ex.Flatten().Handle(x => x is OperationCanceledException);
+          }
+          catch (AggregateException remaining) {
+            if (remaining.InnerExceptions.Count == 1) OnExceptionOccurred(remaining.InnerExceptions[0]);
+            else OnExceptionOccurred(remaining);
+          }
         }
         cancellationTokenSource.Dispose();
         cancellationTokenSource = null;
-        if (stopRequested) {
-          executionStack.Clear();
-          OnStopped();
-        } else {
-          if (executionStack.Count == 0) OnStopped();
-          else OnPaused();
-        }
+        if (stopRequested) executionStack.Clear();
+        if (executionStack.Count == 0) OnStopped();
+        else OnPaused();
       });
     }

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);
+          }
         }
       }

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

@@ -62 +62 @@
           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);