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

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/GRASP

Files:

• GRASP.cs (modified) (3 diffs)
• GRASPContext.cs (modified) (2 diffs)

branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASP/GRASP.cs

@@ -30 +30 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
@@ -41 +42 @@
   [Item("GRASP+PR (GQAP)", "The algorithm implements the Greedy Randomized Adaptive Search Procedure (GRASP) with Path Relinking as described in Mateus, G., Resende, M., and Silva, R. 2011. GRASP with path-relinking for the generalized quadratic assignment problem. Journal of Heuristics 17, Springer Netherlands, pp. 527-565.")]
   [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms)]
-  [StorableClass]
+  [StorableType("1FF6B7FC-58CA-4F89-BCAF-31CFC0B0546C")]
   public sealed class GRASP : StochasticAlgorithm<GRASPContext, IntegerVectorEncoding> {
 
@@ -123 +124 @@
 
     [StorableConstructor]
-    private GRASP(bool deserializing) : base(deserializing) { }
+    private GRASP(StorableConstructorFlag _) : base(_) { }
     private GRASP(GRASP original, Cloner cloner)
       : base(original, cloner) {

branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASP/GRASPContext.cs

@@ -25 +25 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
   [Item("GRASP+PR (GQAP) Context", "Context for GRASP+PR (GQAP).")]
-  [StorableClass]
+  [StorableType("40C0A979-FFDB-43E0-89A0-6553BD3EB9DB")]
   public sealed class GRASPContext : PopulationContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
     
@@ -50 +51 @@
     
     [StorableConstructor]
-    private GRASPContext(bool deserializing) : base(deserializing) { }
+    private GRASPContext(StorableConstructorFlag _) : base(_) { }
     private GRASPContext(GRASPContext original, Cloner cloner)
       : base(original, cloner) {