Changeset 11924


Ignore:
Timestamp:
02/05/15 18:57:26 (7 years ago)
Author:
mkommend
Message:

#1668: Merged r11790, r11815 and r11878 into stable.

Location:
stable
Files:
4 edited
3 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Optimization

  • stable/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r11920 r11924  
    130130      <DependentUpon>AlgorithmView.cs</DependentUpon>
    131131    </Compile>
     132    <Compile Include="BasicAlgorithmView.cs">
     133      <SubType>UserControl</SubType>
     134    </Compile>
     135    <Compile Include="BasicAlgorithmView.Designer.cs">
     136      <DependentUpon>BasicAlgorithmView.cs</DependentUpon>
     137    </Compile>
    132138    <Compile Include="BatchRunView.cs">
    133139      <SubType>UserControl</SubType>
  • stable/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs

    r11790 r11924  
    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);
     
    8785
    8886    public override void Pause() {
    89       throw new NotSupportedException("Pause is not supported in simple Algorithms.");
     87      throw new NotSupportedException("Pause is not supported in basic algorithms.");
    9088    }
    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();
  • stable/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r11920 r11924  
    120120  </ItemGroup>
    121121  <ItemGroup>
     122    <Compile Include="Algorithms\BasicAlgorithm.cs" />
    122123    <Compile Include="Interfaces\ILocalImprovementAlgorithmOperator.cs" />
    123124    <Compile Include="Interfaces\ISingleObjectivePathRelinker.cs" />
Note: See TracChangeset for help on using the changeset viewer.