Changeset 16462 for branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/MetaOptimizers

Timestamp:

12/28/18 16:10:48 (6 years ago)

Author:

jkarder

Message:

#2520: worked on reintegration of new persistence

• added nuget references to HEAL.Fossil
• added StorableType attributes to many classes
• changed signature of StorableConstructors
• removed some classes in old persistence
• removed some unnecessary usings

Location:

branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/MetaOptimizers

Files:

• BatchRun.cs (modified) (3 diffs)
• Experiment.cs (modified) (3 diffs)
• TimeLimitRun.cs (modified) (3 diffs)

branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs

@@ -29 +29 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Optimization {
@@ -39 +39 @@
   [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 +199 @@
     }
     [StorableConstructor]
-    private BatchRun(bool deserializing) : base(deserializing) { }
+    private BatchRun(StorableConstructorFlag _) : base(_) { }
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {

branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs

@@ -29 +29 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 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() {

branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs

@@ -31 +31 @@
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 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) {