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

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

Files:

• ESContext.cs (modified) (2 diffs)
• ESGQAPSolution.cs (modified) (2 diffs)
• EvolutionStrategy.cs (modified) (3 diffs)
• OSGA.cs (modified) (3 diffs)
• OSGAContext.cs (modified) (2 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Evolutionary/ESContext.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.Evolutionary {
   [Item("Evolution Strategy (GQAP) Context", "Context for Evolution Strategies (GQAP).")]
-  [StorableClass]
+  [StorableType("8A811131-337D-4CF6-A938-FFA08BF50B40")]
   public sealed class ESContext : PopulationContext<ISingleObjectiveSolutionScope<ESGQAPSolution>> {
     
@@ -52 +52 @@
     
     [StorableConstructor]
-    private ESContext(bool deserializing) : base(deserializing) { }
+    private ESContext(StorableConstructorFlag _) : base(_) { }
     private ESContext(ESContext original, Cloner cloner)
       : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Evolutionary/ESGQAPSolution.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.Evolutionary {
   [Item("ES-specific GQAP Solution", "GQAP Solution that holds a strategy parameter")]
-  [StorableClass]
+  [StorableType("00A9856C-5E25-4F12-B3B0-6A9FF855B8A9")]
   public class ESGQAPSolution : GQAPSolution {
 
@@ -43 +43 @@
 
     [StorableConstructor]
-    protected ESGQAPSolution(bool deserializing) : base(deserializing) { }
+    protected ESGQAPSolution(StorableConstructorFlag _) : base(_) { }
     protected ESGQAPSolution(ESGQAPSolution original, Cloner cloner)
     : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Evolutionary/EvolutionStrategy.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -30 +31 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.Evolutionary {
+  [StorableType("d568d524-1f84-461c-adf5-573d8e472063")]
   public enum ESSelection { Plus = 0, Comma = 1 }
 
   [Item("Evolution Strategy (GQAP)", "The algorithm implements a simple evolution strategy (ES).")]
   [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms)]
-  [StorableClass]
+  [StorableType("A1590185-F2E3-4163-896E-28EEC93A5CDF")]
   public sealed class EvolutionStrategy : StochasticAlgorithm<ESContext, IntegerVectorEncoding> {
 
@@ -93 +94 @@
 
     [StorableConstructor]
-    private EvolutionStrategy(bool deserializing) : base(deserializing) { }
+    private EvolutionStrategy(StorableConstructorFlag _) : base(_) { }
     private EvolutionStrategy(EvolutionStrategy original, Cloner cloner)
       : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Evolutionary/OSGA.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.Evolutionary {
   [Item("OSGA (GQAP)", "The algorithm implements a strict offspring selection genetic algorithm (OSGA).")]
   [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms)]
-  [StorableClass]
+  [StorableType("3BCF54DD-CECB-4027-AF2F-1764E6318B78")]
   public sealed class OSGA : StochasticAlgorithm<OSGAContext, IntegerVectorEncoding> {
 
@@ -71 +71 @@
 
     [StorableConstructor]
-    private OSGA(bool deserializing) : base(deserializing) { }
+    private OSGA(StorableConstructorFlag _) : base(_) { }
     private OSGA(OSGA original, Cloner cloner)
       : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Evolutionary/OSGAContext.cs

@@ -21 +21 @@
 
 using System.Linq;
+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.Evolutionary {
   [Item("OSGA (GQAP) Context", "Context for OSGA (GQAP).")]
-  [StorableClass]
+  [StorableType("65ADDF53-91A6-4C8C-9DDE-B330E87AB32B")]
   public sealed class OSGAContext : PopulationContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
     
@@ -72 +72 @@
     
     [StorableConstructor]
-    private OSGAContext(bool deserializing) : base(deserializing) { }
+    private OSGAContext(StorableConstructorFlag _) : base(_) { }
     private OSGAContext(OSGAContext original, Cloner cloner)
       : base(original, cloner) {