Changeset 15368


Ignore:
Timestamp:
09/18/17 12:26:37 (5 years ago)
Author:
jkarder
Message:

#2831:

  • disabled breakpoints for the sequential and parallel engines
  • fixed exception handling in parallel engine
Location:
trunk/sources
Files:
2 edited

Legend:

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

    r14185 r15368  
    102102              Parallel.ForEach(stacks, parallelOptions, Run);
    103103            }
    104             catch (OperationCanceledException ex) {
     104            catch (Exception ex) {
    105105              OperationCollection remaining = new OperationCollection() { Parallel = true };
    106106              for (int i = 0; i < stacks.Length; i++) {
     
    115115              }
    116116              if (remaining.Count > 0) executionStack.Push(remaining);
    117               throw ex;
     117              throw;
    118118            }
    119119          } else {
     
    132132          }
    133133          if (next != null) executionStack.Push(next);
    134 
    135           if (operation.Operator.Breakpoint) {
    136             string message = string.Format("Breakpoint: {0}", operation.Operator.Name != string.Empty ? operation.Operator.Name : operation.Operator.ItemName);
    137             Log.LogMessage(message);
    138             throw new OperationCanceledException(message);
    139           }
    140134        }
    141135      }
  • trunk/sources/HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs

    r14185 r15368  
    6666          }
    6767          if (next != null) ExecutionStack.Push(next);
    68 
    69           if (operation.Operator.Breakpoint) {
    70             Log.LogMessage(string.Format("Breakpoint: {0}", operation.Operator.Name != string.Empty ? operation.Operator.Name : operation.Operator.ItemName));
    71             Pause();
    72           }
    7368        }
    7469      }
Note: See TracChangeset for help on using the changeset viewer.