- Timestamp:
- 09/14/18 11:36:59 (6 years ago)
- Location:
- branches/2817-BinPackingSpeedup
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2817-BinPackingSpeedup
- Property svn:mergeinfo changed
-
branches/2817-BinPackingSpeedup/HeuristicLab.Core
- Property svn:mergeinfo changed
/stable/HeuristicLab.Core merged: 15587 /trunk/sources/HeuristicLab.Core (added) merged: 15367,15581,15583,15589
- Property svn:mergeinfo changed
-
branches/2817-BinPackingSpeedup/HeuristicLab.Core/3.3/Engine.cs
r15287 r16140 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using System; 23 23 using System.Collections.Generic; 24 using System.Linq;25 24 using System.Threading; 26 25 using HeuristicLab.Common; … … 91 90 } catch (OperationCanceledException) { 92 91 } catch (AggregateException ae) { 93 OnExceptionOccurred(ae.InnerExceptions.SingleOrDefault() ?? ae);92 ae.FlattenAndHandle(new[] { typeof(OperationCanceledException) }, e => OnExceptionOccurred(e)); 94 93 } catch (Exception e) { 95 94 OnExceptionOccurred(e);
Note: See TracChangeset
for help on using the changeset viewer.