Changeset 12515 for branches/HiveStatistics/sources/HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs

Timestamp:

06/25/15 18:21:19 (9 years ago)

Author:

dglaser

Message:

#2388: Merged trunk into HiveStatistics branch

Location:

branches/HiveStatistics/sources/HeuristicLab.Optimization

Files:

• . (modified) (1 prop)
• 3.3/MetaOptimizers/BatchRun.cs (modified) (5 diffs)

branches/HiveStatistics/sources/HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs

@@ -36 +36 @@
   /// </summary>
   [Item("Batch Run", "A run in which an optimizer is executed a given number of times.")]
-  [Creatable("Testing & Analysis")]
+  [Creatable(CreatableAttribute.Categories.TestingAndAnalysis, Priority = 110)]
   [StorableClass]
   public sealed class BatchRun : NamedItem, IOptimizer, IStorableContent {
@@ -237 +237 @@
         batchRunAction = BatchRunAction.Prepare;
         // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-        try { Optimizer.Prepare(clearRuns); } catch (InvalidOperationException) { }
+        try { Optimizer.Prepare(clearRuns); }
+        catch (InvalidOperationException) { }
       } else {
         ExecutionState = ExecutionState.Stopped;
@@ -249 +250 @@
       if (Optimizer.ExecutionState == ExecutionState.Stopped) Optimizer.Prepare();
       // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-      try { Optimizer.Start(); } catch (InvalidOperationException) { }
+      try { Optimizer.Start(); }
+      catch (InvalidOperationException) { }
     }
     public void Pause() {
@@ -258 +260 @@
       if (Optimizer.ExecutionState != ExecutionState.Started) return;
       // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-      try { Optimizer.Pause(); } catch (InvalidOperationException) { }
+      try { Optimizer.Pause(); }
+      catch (InvalidOperationException) { }
     }
     public void Stop() {
@@ -270 +273 @@
       }
       // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-      try { Optimizer.Stop(); } catch (InvalidOperationException) { }
+      try { Optimizer.Stop(); }
+      catch (InvalidOperationException) { }
     }