Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/02/11 04:05:04 (12 years ago)
Author:
swagner
Message:

Worked on cancellation and refactored code (#1333)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/ParallelEngine/HeuristicLab.ParallelEngine/3.3/ParallelEngine.cs

    r5185 r5187  
    9292          } else {
    9393            for (int i = coll.Count - 1; i >= 0; i--)
    94               if (coll[i] != null) ExecutionStack.Push(coll[i]);
     94              if (coll[i] != null) executionStack.Push(coll[i]);
    9595          }
    9696        } else if (next is IAtomicOperation) {
     
    101101          catch (Exception ex) {
    102102            executionStack.Push(operation);
    103             throw new OperatorExecutionException(operation.Operator, ex);
     103            if (ex is OperationCanceledException) throw ex;
     104            else throw new OperatorExecutionException(operation.Operator, ex);
    104105          }
    105106          if (next != null) executionStack.Push(next);
     107
     108          if (operation.Operator.Breakpoint) {
     109            string message = string.Format("Breakpoint: {0}", operation.Operator.Name != string.Empty ? operation.Operator.Name : operation.Operator.ItemName);
     110            Log.LogMessage(message);
     111            throw new OperationCanceledException(message);
     112          }
    106113        }
    107114      }
Note: See TracChangeset for help on using the changeset viewer.