Changeset 16140 for branches/2817-BinPackingSpeedup/HeuristicLab.DebugEngine

Timestamp:

09/14/18 11:36:59 (6 years ago)

Author:

abeham

Message:

#2817: updated to trunk r15680

Location:

branches/2817-BinPackingSpeedup

Files:

• . (modified) (1 prop)
• HeuristicLab.DebugEngine/3.3/DebugEngine.cs (modified) (3 diffs)
• HeuristicLab.DebugEngine/3.3/ExecutionStack.cs (modified) (1 diff)
• HeuristicLab.DebugEngine/3.3/OperationChangedEventArgs.cs (modified) (1 diff)
• HeuristicLab.DebugEngine/3.3/OperationContent.cs (modified) (1 diff)
• HeuristicLab.DebugEngine/3.3/OperatorTrace.cs (modified) (1 diff)
• HeuristicLab.DebugEngine/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.DebugEngine/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
• HeuristicLab.DebugEngine/3.3/Utils.cs (modified) (1 diff)

branches/2817-BinPackingSpeedup/HeuristicLab.DebugEngine/3.3/DebugEngine.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -181 +181 @@
       } catch (OperationCanceledException) {
       } catch (AggregateException ae) {
-        OnExceptionOccurred(ae.InnerExceptions.SingleOrDefault() ?? ae);
+        ae.FlattenAndHandle(new[] { typeof(OperationCanceledException) }, e => OnExceptionOccurred(e));
       } catch (Exception e) {
         OnExceptionOccurred(e);
@@ -308 +308 @@
           CurrentOperation = null;
         } catch (Exception ex) {
-          if (ex is OperationCanceledException) throw ex;
+          if (ex is OperationCanceledException) throw;
           else throw new OperatorExecutionException(operation.Operator, ex);
         }

branches/2817-BinPackingSpeedup/HeuristicLab.DebugEngine/3.3/ExecutionStack.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/2817-BinPackingSpeedup/HeuristicLab.DebugEngine/3.3/OperationChangedEventArgs.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/2817-BinPackingSpeedup/HeuristicLab.DebugEngine/3.3/OperationContent.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/2817-BinPackingSpeedup/HeuristicLab.DebugEngine/3.3/OperatorTrace.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/2817-BinPackingSpeedup/HeuristicLab.DebugEngine/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -24 +24 @@
 namespace HeuristicLab.DebugEngine {
 
-  [Plugin("HeuristicLab.DebugEngine", "3.3.14.$WCREV$")]
+  [Plugin("HeuristicLab.DebugEngine", "3.3.15.$WCREV$")]
   [PluginFile("HeuristicLab.DebugEngine-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/2817-BinPackingSpeedup/HeuristicLab.DebugEngine/3.3/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32 +32 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2016 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2018 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.14.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.15.$WCREV$")]

branches/2817-BinPackingSpeedup/HeuristicLab.DebugEngine/3.3/Utils.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.