Changeset 16565 for trunk/HeuristicLab.Optimization/3.3/MetaOptimizers

Timestamp:

01/28/19 13:41:42 (6 years ago)

Author:

gkronber

Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization (modified) (1 prop)
• HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs (modified) (4 diffs)
• HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs (modified) (4 diffs)
• HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs (modified) (4 diffs)

trunk/HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -29 +29 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
+  [StorableType("3d385be2-5c83-43f2-a693-f984acac44f6")]
   internal enum BatchRunAction { None, Prepare, Start, Pause, Stop };
 
@@ -39 +40 @@
   [Item("Batch Run", "A run in which an optimizer is executed a given number of times.")]
   [Creatable(CreatableAttribute.Categories.TestingAndAnalysis, Priority = 110)]
-  [StorableClass]
+  [StorableType("E85407E0-18EC-4198-8321-9CF030FDF6D7")]
   public sealed class BatchRun : NamedItem, IOptimizer, IStorableContent {
     public string Filename { get; set; }
@@ -199 +200 @@
     }
     [StorableConstructor]
-    private BatchRun(bool deserializing) : base(deserializing) { }
+    private BatchRun(StorableConstructorFlag _) : base(_) { }
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {

trunk/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -29 +29 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
@@ -37 +37 @@
   [Item("Experiment", "An experiment which contains multiple algorithms, batch runs or other experiments.")]
   [Creatable(CreatableAttribute.Categories.TestingAndAnalysis, Priority = 100)]
-  [StorableClass]
+  [StorableType("A8A4536B-54C1-4A17-AB58-A6006F7F394B")]
   public sealed class Experiment : NamedItem, IOptimizer, IStorableContent {
     public string Filename { get; set; }
@@ -161 +161 @@
     }
     [StorableConstructor]
-    private Experiment(bool deserializing) : base(deserializing) { }
+    private Experiment(StorableConstructorFlag _) : base(_) { }
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {

trunk/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -31 +31 @@
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
@@ -39 +39 @@
   [Item("Timelimit Run", "A run in which an optimizer is executed a certain maximum time.")]
   [Creatable(CreatableAttribute.Categories.TestingAndAnalysis, Priority = 115)]
-  [StorableClass]
+  [StorableType("85A1AB82-689F-4925-B888-B3886707BE88")]
   public sealed class TimeLimitRun : NamedItem, IOptimizer, IStorableContent, INotifyPropertyChanged {
     public string Filename { get; set; }
@@ -152 +152 @@
 
     [StorableConstructor]
-    private TimeLimitRun(bool deserializing) : base(deserializing) { }
+    private TimeLimitRun(StorableConstructorFlag _) : base(_) { }
     private TimeLimitRun(TimeLimitRun original, Cloner cloner)
       : base(original, cloner) {