Changeset 15376


Ignore:
Timestamp:
09/20/17 15:56:34 (5 years ago)
Author:
jkarder
Message:

#2831: changed exception handling in engines

Location:
trunk/sources
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.DebugEngine/3.3/DebugEngine.cs

    r15367 r15376  
    308308          CurrentOperation = null;
    309309        } catch (Exception ex) {
    310           if (ex is OperationCanceledException) throw ex;
     310          if (ex is OperationCanceledException) throw;
    311311          else throw new OperatorExecutionException(operation.Operator, ex);
    312312        }
  • trunk/sources/HeuristicLab.ParallelEngine/3.3/ParallelEngine.cs

    r15368 r15376  
    101101            try {
    102102              Parallel.ForEach(stacks, parallelOptions, Run);
    103             }
    104             catch (Exception ex) {
    105               OperationCollection remaining = new OperationCollection() { Parallel = true };
    106               for (int i = 0; i < stacks.Length; i++) {
    107                 if (stacks[i].Count == 1)
    108                   remaining.Add(stacks[i].Pop());
    109                 if (stacks[i].Count > 1) {
    110                   OperationCollection ops = new OperationCollection();
    111                   while (stacks[i].Count > 0)
    112                     ops.Add(stacks[i].Pop());
    113                   remaining.Add(ops);
    114                 }
    115               }
    116               if (remaining.Count > 0) executionStack.Push(remaining);
     103            } catch (OperationCanceledException) {
     104              RepairStack(executionStack, stacks);
     105              throw;
     106            } catch (AggregateException) {
     107              RepairStack(executionStack, stacks);
    117108              throw;
    118109            }
     
    128119          catch (Exception ex) {
    129120            executionStack.Push(operation);
    130             if (ex is OperationCanceledException) throw ex;
     121            if (ex is OperationCanceledException) throw;
    131122            else throw new OperatorExecutionException(operation.Operator, ex);
    132123          }
     
    135126      }
    136127    }
     128
     129    private static void RepairStack(Stack<IOperation> executionStack, Stack<IOperation>[] parallelExecutionStacks) {
     130      OperationCollection remaining = new OperationCollection() { Parallel = true };
     131      for (int i = 0; i < parallelExecutionStacks.Length; i++) {
     132        if (parallelExecutionStacks[i].Count == 1)
     133          remaining.Add(parallelExecutionStacks[i].Pop());
     134        if (parallelExecutionStacks[i].Count > 1) {
     135          OperationCollection ops = new OperationCollection();
     136          while (parallelExecutionStacks[i].Count > 0)
     137            ops.Add(parallelExecutionStacks[i].Pop());
     138          remaining.Add(ops);
     139        }
     140      }
     141      if (remaining.Count > 0) executionStack.Push(remaining);
     142    }
    137143  }
    138144}
  • trunk/sources/HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs

    r15368 r15376  
    6262          catch (Exception ex) {
    6363            ExecutionStack.Push(operation);
    64             if (ex is OperationCanceledException) throw ex;
     64            if (ex is OperationCanceledException) throw;
    6565            else throw new OperatorExecutionException(operation.Operator, ex);
    6666          }
Note: See TracChangeset for help on using the changeset viewer.