Changeset 16728 for branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC

Timestamp:

03/31/19 14:40:15 (5 years ago)

Author:

abeham

Message:

#1614: updated to new persistence and .NET 4.6.1

• merged changes in #3000
• merged changes in #2936

Location:

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC

Files:

• LAHC.cs (modified) (3 diffs)
• LAHCContext.cs (modified) (2 diffs)
• pLAHC.cs (modified) (3 diffs)
• pLAHCContext.cs (modified) (2 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/LAHC.cs

@@ -23 +23 @@
 using System.Linq;
 using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -29 +30 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LAHC {
   [Item("LAHC (GQAP)", "Late-acceptance hill climber for the GQAP.")]
   [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms)]
-  [StorableClass]
+  [StorableType("41FABEE1-506A-45FE-A6D3-57932036AEC8")]
   public sealed class LAHC : StochasticAlgorithm<LAHCContext, IntegerVectorEncoding> {
 
@@ -62 +62 @@
 
     [StorableConstructor]
-    private LAHC(bool deserializing) : base(deserializing) { }
+    private LAHC(StorableConstructorFlag _) : base(_) { }
     private LAHC(LAHC original, Cloner cloner)
       : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/LAHCContext.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LAHC {
   [Item("LAHC Context", "Context for late-acceptance hill climber")]
-  [StorableClass]
+  [StorableType("546B6C06-D986-49AA-BDEB-B664D2A9DA8C")]
   public sealed class LAHCContext : SingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
     [Storable]
@@ -59 +59 @@
     
     [StorableConstructor]
-    private LAHCContext(bool deserializing) : base(deserializing) { }
+    private LAHCContext(StorableConstructorFlag _) : base(_) { }
     private LAHCContext(LAHCContext original, Cloner cloner)
     : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/pLAHC.cs

@@ -22 +22 @@
 using System;
 using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +29 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LAHC {
   [Item("pLAHC-s (GQAP)", "Parameterless Late-acceptance hill climber for the GQAP.")]
   [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms)]
-  [StorableClass]
+  [StorableType("90A97927-D784-4F73-9215-ADC75A9F6C9D")]
   public sealed class PLAHCS : StochasticAlgorithm<PLAHCContext, IntegerVectorEncoding> {
 
@@ -72 +72 @@
 
     [StorableConstructor]
-    private PLAHCS(bool deserializing) : base(deserializing) { }
+    private PLAHCS(StorableConstructorFlag _) : base(_) { }
     private PLAHCS(PLAHCS original, Cloner cloner)
       : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/pLAHCContext.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LAHC {
   [Item("pLAHC-s Context", "Context for parameterless late-acceptance hill climber with seeding.")]
-  [StorableClass]
+  [StorableType("3C550AB5-8FEC-42DA-9200-ABC98A1C20EA")]
   public sealed class PLAHCContext : SingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
     [Storable]
@@ -73 +73 @@
     
     [StorableConstructor]
-    private PLAHCContext(bool deserializing) : base(deserializing) { }
+    private PLAHCContext(StorableConstructorFlag _) : base(_) { }
     private PLAHCContext(PLAHCContext original, Cloner cloner)
     : base(original, cloner) {