Changeset 16728 for branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/GQAP

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.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/GQAP

Files:

• GQAPCharacteristicCalculator.cs (modified) (1 diff)
• GQAPDirectedWalk.cs (modified) (4 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/GQAP/GQAPCharacteristicCalculator.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.GeneralizedQuadraticAssignment;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("GQAP Characteristic Calculator", "")]
-  [StorableClass]
+  [StorableType("B587BC90-028E-4E8F-A4A6-5CD6677D5369")]
   public sealed class GQAPCharacteristicCalculator : CharacteristicCalculator {
 
     [StorableConstructor]
-    private GQAPCharacteristicCalculator(bool deserializing) : base(deserializing) { }
+    private GQAPCharacteristicCalculator(StorableConstructorFlag _) : base(_) { }
     private GQAPCharacteristicCalculator(GQAPCharacteristicCalculator original, Cloner cloner) : base(original, cloner) { }
     public GQAPCharacteristicCalculator() {

branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/GQAP/GQAPDirectedWalk.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -29 +30 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.GeneralizedQuadraticAssignment;
 using HeuristicLab.Random;
@@ -35 +35 @@
 namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("Directed Walk (GQAP-specific)", "")]
-  [StorableClass]
+  [StorableType("333209A4-8EE7-4944-8A23-CBF120627DBE")]
   public class GQAPDirectedWalk : CharacteristicCalculator {
     
@@ -75 +75 @@
 
     [StorableConstructor]
-    private GQAPDirectedWalk(bool deserializing) : base(deserializing) { }
+    private GQAPDirectedWalk(StorableConstructorFlag _) : base(_) { }
     private GQAPDirectedWalk(GQAPDirectedWalk original, Cloner cloner) : base(original, cloner) { }
     public GQAPDirectedWalk() {