Changeset 16462 for branches/2520_PersistenceReintegration/HeuristicLab.Problems.NK/3.3/InteractionInitializers

Timestamp:

12/28/18 16:10:48 (5 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.Problems.NK/3.3/InteractionInitializers

Files:

• IncreasingBlockSizeInteractionsInitializer.cs (modified) (1 diff)
• LimitedRandomInteractionsInitializer.cs (modified) (2 diffs)
• RandomInteractionsInitializer.cs (modified) (1 diff)
• SortedRandomInteractionsInitializer.cs (modified) (2 diffs)

branches/2520_PersistenceReintegration/HeuristicLab.Problems.NK/3.3/InteractionInitializers/IncreasingBlockSizeInteractionsInitializer.cs

@@ -26 +26 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.NK {
   [Item("IncreasingBlockSizeInteractionsInitializer", "Randomly assignes interactions across all bits but makes sure that different numbers of ineractions are applied to different bits.")]
-  [StorableClass]
+  [StorableType("E4AAEDCA-6A90-45AE-AFD5-B200A50ACAB8")]
   public sealed class IncreasingBlockSizeInteractionsInitializer : ParameterizedNamedItem, IInteractionInitializer {
     [StorableConstructor]
-    private IncreasingBlockSizeInteractionsInitializer(bool serializing) : base(serializing) { }
+    private IncreasingBlockSizeInteractionsInitializer(StorableConstructorFlag _) : base(_) { }
     private IncreasingBlockSizeInteractionsInitializer(IncreasingBlockSizeInteractionsInitializer original, Cloner cloner) : base(original, cloner) { }
     public IncreasingBlockSizeInteractionsInitializer() { }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.NK/3.3/InteractionInitializers/LimitedRandomInteractionsInitializer.cs

@@ -26 +26 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.NK {
   [Item("LimitedRandomInteractionsInitializer", "Randomly assignes interactions across bits in the vicinity of each other respecting the maximum distances if possible.")]
-  [StorableClass]
+  [StorableType("A49E3167-FC04-40F8-A45C-BA8818CE2065")]
   public sealed class LimitedRandomInteractionsInitializer : ParameterizedNamedItem, IInteractionInitializer {
     private class Bounds {
@@ -52 +52 @@
 
     [StorableConstructor]
-    private LimitedRandomInteractionsInitializer(bool serializing) : base(serializing) { }
+    private LimitedRandomInteractionsInitializer(StorableConstructorFlag _) : base(_) { }
     private LimitedRandomInteractionsInitializer(LimitedRandomInteractionsInitializer original, Cloner cloner) : base(original, cloner) { }
     public LimitedRandomInteractionsInitializer() {

branches/2520_PersistenceReintegration/HeuristicLab.Problems.NK/3.3/InteractionInitializers/RandomInteractionsInitializer.cs

@@ -24 +24 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.NK {
   [Item("RandomInteractionsInitializer", "Randomly assignes interactions across all bits")]
-  [StorableClass]
+  [StorableType("ACB3BE45-DB9E-4200-95BF-D22C726B4DAE")]
   public sealed class RandomInteractionsInitializer : ParameterizedNamedItem, IInteractionInitializer {
     [StorableConstructor]
-    private RandomInteractionsInitializer(bool serializing) : base(serializing) { }
+    private RandomInteractionsInitializer(StorableConstructorFlag _) : base(_) { }
     private RandomInteractionsInitializer(RandomInteractionsInitializer original, Cloner cloner) : base(original, cloner) { }
     public RandomInteractionsInitializer() { }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.NK/3.3/InteractionInitializers/SortedRandomInteractionsInitializer.cs

@@ -26 +26 @@
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.NK {
   [Item("SortedRandomInteractionsInitializer", "Randomly assigns interactions across all bits and sorts components according to bit affinity.")]
-  [StorableClass]
+  [StorableType("33F27348-DC65-4DCF-88EC-383379EEEA0C")]
   public sealed class SortedRandomInteractionsInitializer : ParameterizedNamedItem, IInteractionInitializer {
     public IConstrainedValueParameter<IBinaryVectorComparer> ComparerParameter {
@@ -41 +41 @@
 
     [StorableConstructor]
-    private SortedRandomInteractionsInitializer(bool serializing) : base(serializing) { }
+    private SortedRandomInteractionsInitializer(StorableConstructorFlag _) : base(_) { }
     private SortedRandomInteractionsInitializer(SortedRandomInteractionsInitializer original, Cloner cloner) : base(original, cloner) { }
     public SortedRandomInteractionsInitializer() {