Changeset 16712 for branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Algorithms

Timestamp:

03/25/19 17:26:02 (6 years ago)

Author:

gkronber

Message:

#2936: adapted branch to new persistence (works with HL trunk r16711)

Location:

branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Algorithms

Files:

• ContextAlgorithm.cs (modified) (2 diffs)
• StochasticAlgorithm.cs (modified) (2 diffs)

branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Algorithms/ContextAlgorithm.cs

@@ -31 +31 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
   [Item("Context-based Algorithm", "Algorithms that make use of contexts to facilitate applying operators.")]
-  [StorableClass]
+  [StorableType("F4D85B12-B512-4CC5-B220-69C01E2C8DBB")]
   public abstract class ContextAlgorithm<TContext, TEncoding> : BasicAlgorithm
     where TContext : class, IContext, new()
@@ -110 +111 @@
 
     [StorableConstructor]
-    protected ContextAlgorithm(bool deserializing) : base(deserializing) { }
+    protected ContextAlgorithm(StorableConstructorFlag _) : base(_) { }
     protected ContextAlgorithm(ContextAlgorithm<TContext, TEncoding> original, Cloner cloner)
       : base(original, cloner) {

branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Algorithms/StochasticAlgorithm.cs

@@ -28 +28 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Random;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
   [Item("Stochastic Algorithm", "Stochastic context-based algorithms to facilitate applying operators.")]
-  [StorableClass]
+  [StorableType("75B72520-ECBC-42F7-8560-448940825847")]
   public abstract class StochasticAlgorithm<TContext, TEncoding> : ContextAlgorithm<TContext, TEncoding>
     where TContext : class, IStochasticContext, new()
@@ -57 +58 @@
 
     [StorableConstructor]
-    protected StochasticAlgorithm(bool deserializing) : base(deserializing) { }
+    protected StochasticAlgorithm(StorableConstructorFlag _) : base(_) { }
     protected StochasticAlgorithm(StochasticAlgorithm<TContext, TEncoding> original, Cloner cloner)
       : base(original, cloner) {