Changeset 15368 for trunk/sources

Timestamp:

09/18/17 12:26:37 (7 years ago)

Author:

jkarder

Message:

#2831:

• disabled breakpoints for the sequential and parallel engines
• fixed exception handling in parallel engine

Location:

trunk/sources

Files:

• HeuristicLab.ParallelEngine/3.3/ParallelEngine.cs (modified) (3 diffs)
• HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs (modified) (1 diff)

trunk/sources/HeuristicLab.ParallelEngine/3.3/ParallelEngine.cs

@@ -102 +102 @@
               Parallel.ForEach(stacks, parallelOptions, Run);
             }
-            catch (OperationCanceledException ex) {
+            catch (Exception ex) {
               OperationCollection remaining = new OperationCollection() { Parallel = true };
               for (int i = 0; i < stacks.Length; i++) {
@@ -115 +115 @@
               }
               if (remaining.Count > 0) executionStack.Push(remaining);
-              throw ex;
+              throw;
             }
           } else {
@@ -132 +132 @@
           }
           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);
-          }
         }
       }

trunk/sources/HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs

@@ -66 +66 @@
           }
           if (next != null) ExecutionStack.Push(next);
-
-          if (operation.Operator.Breakpoint) {
-            Log.LogMessage(string.Format("Breakpoint: {0}", operation.Operator.Name != string.Empty ? operation.Operator.Name : operation.Operator.ItemName));
-            Pause();
-          }
         }
       }