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

Timestamp:

03/31/19 14:40:15 (6 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/LocalSearch

Files:

• IteratedLS.cs (modified) (3 diffs)
• LocalSearchContext.cs (modified) (2 diffs)
• MultistartLS.cs (modified) (3 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSearch/IteratedLS.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.LocalSearch {
   [Item("Iterated Local Search (GQAP)", "Iterated local search for the GQAP.")]
   [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms)]
-  [StorableClass]
+  [StorableType("2C8EE433-B133-4382-8B4F-4EFFA536D759")]
   public sealed class IteratedLS : StochasticAlgorithm<LocalSearchContext, IntegerVectorEncoding> {
 
@@ -61 +61 @@
 
     [StorableConstructor]
-    private IteratedLS(bool deserializing) : base(deserializing) { }
+    private IteratedLS(StorableConstructorFlag _) : base(_) { }
     private IteratedLS(IteratedLS original, Cloner cloner)
       : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSearch/LocalSearchContext.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSearch {
   [Item("Local Search Context", "Context for local search algorithms.")]
-  [StorableClass]
+  [StorableType("1AD51259-7DDB-43C1-A4A0-9E8B652988B1")]
   public sealed class LocalSearchContext : SingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
     [Storable]
@@ -44 +44 @@
     
     [StorableConstructor]
-    private LocalSearchContext(bool deserializing) : base(deserializing) { }
+    private LocalSearchContext(StorableConstructorFlag _) : base(_) { }
     private LocalSearchContext(LocalSearchContext original, Cloner cloner)
     : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSearch/MultistartLS.cs

@@ -22 +22 @@
 using System;
 using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27 +28 @@
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSearch {
   [Item("Multi-start Local Search (GQAP)", "Multi-start local search for the GQAP.")]
   [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms)]
-  [StorableClass]
+  [StorableType("DA79118A-BA6B-4A0F-81E6-752D750BF7F4")]
   public sealed class MultistartLS : StochasticAlgorithm<LocalSearchContext, IntegerVectorEncoding> {
 
@@ -49 +49 @@
 
     [StorableConstructor]
-    private MultistartLS(bool deserializing) : base(deserializing) { }
+    private MultistartLS(StorableConstructorFlag _) : base(_) { }
     private MultistartLS(MultistartLS original, Cloner cloner)
       : base(original, cloner) {