- Timestamp:
- 05/04/17 17:19:35 (8 years ago)
- Location:
- branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/MetaOptimizers
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs
r14185 r14927 27 27 using HeuristicLab.Core; 28 28 using HeuristicLab.Data; 29 using HeuristicLab.Persistence .Default.CompositeSerializers.Storable;29 using HeuristicLab.Persistence; 30 30 31 31 namespace HeuristicLab.Optimization { … … 37 37 [Item("Batch Run", "A run in which an optimizer is executed a given number of times.")] 38 38 [Creatable(CreatableAttribute.Categories.TestingAndAnalysis, Priority = 110)] 39 [Storable Class]39 [StorableType("99c15ae1-95a6-490e-813f-7a43c09e7c74")] 40 40 public sealed class BatchRun : NamedItem, IOptimizer, IStorableContent { 41 41 public string Filename { get; set; } … … 237 237 batchRunAction = BatchRunAction.Prepare; 238 238 // a race-condition may occur when the optimizer has changed the state by itself in the meantime 239 try { Optimizer.Prepare(clearRuns); } 240 catch (InvalidOperationException) { } 239 try { Optimizer.Prepare(clearRuns); } catch (InvalidOperationException) { } 241 240 } else { 242 241 ExecutionState = ExecutionState.Stopped; … … 250 249 if (Optimizer.ExecutionState == ExecutionState.Stopped) Optimizer.Prepare(); 251 250 // a race-condition may occur when the optimizer has changed the state by itself in the meantime 252 try { Optimizer.Start(); } 253 catch (InvalidOperationException) { } 251 try { Optimizer.Start(); } catch (InvalidOperationException) { } 254 252 } 255 253 public void Pause() { … … 260 258 if (Optimizer.ExecutionState != ExecutionState.Started) return; 261 259 // a race-condition may occur when the optimizer has changed the state by itself in the meantime 262 try { Optimizer.Pause(); } 263 catch (InvalidOperationException) { } 260 try { Optimizer.Pause(); } catch (InvalidOperationException) { } 264 261 } 265 262 public void Stop() { … … 273 270 } 274 271 // a race-condition may occur when the optimizer has changed the state by itself in the meantime 275 try { Optimizer.Stop(); } 276 catch (InvalidOperationException) { } 272 try { Optimizer.Stop(); } catch (InvalidOperationException) { } 277 273 } 278 274 -
branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs
r14185 r14927 28 28 using HeuristicLab.Common; 29 29 using HeuristicLab.Core; 30 using HeuristicLab.Persistence .Default.CompositeSerializers.Storable;30 using HeuristicLab.Persistence; 31 31 32 32 namespace HeuristicLab.Optimization { … … 36 36 [Item("Experiment", "An experiment which contains multiple algorithms, batch runs or other experiments.")] 37 37 [Creatable(CreatableAttribute.Categories.TestingAndAnalysis, Priority = 100)] 38 [Storable Class]38 [StorableType("4caf8199-dc27-407b-bea9-085857f25029")] 39 39 public sealed class Experiment : NamedItem, IOptimizer, IStorableContent { 40 40 public string Filename { get; set; } … … 181 181 foreach (IOptimizer optimizer in Optimizers.Where(x => x.ExecutionState != ExecutionState.Started)) { 182 182 // a race-condition may occur when the optimizer has changed the state by itself in the meantime 183 try { optimizer.Prepare(clearRuns); } 184 catch (InvalidOperationException) { } 183 try { optimizer.Prepare(clearRuns); } catch (InvalidOperationException) { } 185 184 } 186 185 } … … 195 194 if (optimizer != null) { 196 195 // a race-condition may occur when the optimizer has changed the state by itself in the meantime 197 try { optimizer.Start(); } 198 catch (InvalidOperationException) { } 196 try { optimizer.Start(); } catch (InvalidOperationException) { } 199 197 } 200 198 } … … 208 206 foreach (IOptimizer optimizer in Optimizers.Where(x => x.ExecutionState == ExecutionState.Started)) { 209 207 // a race-condition may occur when the optimizer has changed the state by itself in the meantime 210 try { optimizer.Pause(); } 211 catch (InvalidOperationException) { } 208 try { optimizer.Pause(); } catch (InvalidOperationException) { } 212 209 } 213 210 } … … 222 219 foreach (var optimizer in Optimizers.Where(x => (x.ExecutionState == ExecutionState.Started) || (x.ExecutionState == ExecutionState.Paused))) { 223 220 // a race-condition may occur when the optimizer has changed the state by itself in the meantime 224 try { optimizer.Stop(); } 225 catch (InvalidOperationException) { } 221 try { optimizer.Stop(); } catch (InvalidOperationException) { } 226 222 } 227 223 } else { … … 357 353 try { 358 354 ExecutionTime = Optimizers.Aggregate(TimeSpan.Zero, (t, o) => t + o.ExecutionTime); 359 } 360 finally { 355 } finally { 361 356 Monitor.Exit(locker); 362 357 } -
branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs
r14185 r14927 30 30 using HeuristicLab.Common.Resources; 31 31 using HeuristicLab.Core; 32 using HeuristicLab.Persistence .Default.CompositeSerializers.Storable;32 using HeuristicLab.Persistence; 33 33 34 34 namespace HeuristicLab.Optimization { … … 38 38 [Item("Timelimit Run", "A run in which an optimizer is executed a certain maximum time.")] 39 39 [Creatable(CreatableAttribute.Categories.TestingAndAnalysis, Priority = 115)] 40 [Storable Class]40 [StorableType("f06a64ea-1449-4310-9056-5e5626b88d54")] 41 41 public sealed class TimeLimitRun : NamedItem, IOptimizer, IStorableContent, INotifyPropertyChanged { 42 42 public string Filename { get; set; }
Note: See TracChangeset
for help on using the changeset viewer.