Changeset 11924

Timestamp:

02/05/15 18:57:26 (10 years ago)

Author:

mkommend

Message:

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

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization (modified) (1 prop)
• HeuristicLab.Optimization.Views/3.3/BasicAlgorithmView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/BasicAlgorithmView.Designer.cs)
• HeuristicLab.Optimization.Views/3.3/BasicAlgorithmView.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/BasicAlgorithmView.cs)
• HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs) (4 diffs)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (1 diff)

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

@@ -130 +130 @@
       <DependentUpon>AlgorithmView.cs</DependentUpon>
     </Compile>
+    <Compile Include="BasicAlgorithmView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="BasicAlgorithmView.Designer.cs">
+      <DependentUpon>BasicAlgorithmView.cs</DependentUpon>
+    </Compile>
     <Compile Include="BatchRunView.cs">
       <SubType>UserControl</SubType>

stable/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -70 +70 @@
         try {
           t.Wait();
-        }
-        catch (AggregateException ex) {
+        } catch (AggregateException ex) {
           try {
             ex.Flatten().Handle(x => x is OperationCanceledException);
-          }
-          catch (AggregateException remaining) {
+          } catch (AggregateException remaining) {
             if (remaining.InnerExceptions.Count == 1) OnExceptionOccurred(remaining.InnerExceptions[0]);
             else OnExceptionOccurred(remaining);
@@ -87 +85 @@
 
     public override void Pause() {
-      throw new NotSupportedException("Pause is not supported in simple Algorithms.");
+      throw new NotSupportedException("Pause is not supported in basic algorithms.");
     }
 
     public override void Stop() {
-      //CancellationToken.ThrowIfCancellationRequested() must be called from within the Run method, otherwise stop does nothing
+      // CancellationToken.ThrowIfCancellationRequested() must be called from within the Run method, otherwise stop does nothing
+      // alternatively check the IsCancellationRequested property of the cancellation token
       base.Stop();
       CancellationTokenSource.Cancel();
@@ -107 +106 @@
       try {
         Run(cancellationToken);
-      }
-      finally {
+      } finally {
         timer.Elapsed -= new System.Timers.ElapsedEventHandler(timer_Elapsed);
         timer.Stop();

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

@@ -120 +120 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Algorithms\BasicAlgorithm.cs" />
     <Compile Include="Interfaces\ILocalImprovementAlgorithmOperator.cs" />
     <Compile Include="Interfaces\ISingleObjectivePathRelinker.cs" />