Free cookie consent management tool by TermsFeed Policy Generator

Changeset 11878


Ignore:
Timestamp:
02/03/15 15:11:37 (10 years ago)
Author:
gkronber
Message:

#1668: minor changes to BasicAlgorithm class

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs

    r11815 r11878  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    7070        try {
    7171          t.Wait();
    72         }
    73         catch (AggregateException ex) {
     72        } catch (AggregateException ex) {
    7473          try {
    7574            ex.Flatten().Handle(x => x is OperationCanceledException);
    76           }
    77           catch (AggregateException remaining) {
     75          } catch (AggregateException remaining) {
    7876            if (remaining.InnerExceptions.Count == 1) OnExceptionOccurred(remaining.InnerExceptions[0]);
    7977            else OnExceptionOccurred(remaining);
     
    9189
    9290    public override void Stop() {
    93       //CancellationToken.ThrowIfCancellationRequested() must be called from within the Run method, otherwise stop does nothing
     91      // CancellationToken.ThrowIfCancellationRequested() must be called from within the Run method, otherwise stop does nothing
     92      // alternatively check the IsCancellationRequested property of the cancellation token
    9493      base.Stop();
    9594      CancellationTokenSource.Cancel();
     
    107106      try {
    108107        Run(cancellationToken);
    109       }
    110       finally {
     108      } finally {
    111109        timer.Elapsed -= new System.Timers.ElapsedEventHandler(timer_Elapsed);
    112110        timer.Stop();
Note: See TracChangeset for help on using the changeset viewer.