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

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

Files:

• QAPCharacteristicCalculator.cs (modified) (1 diff)
• QAPDirectedWalk.cs (modified) (3 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/QAP/QAPCharacteristicCalculator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+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.QuadraticAssignment;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("QAP Characteristic Calculator", "")]
-  [StorableClass]
+  [StorableType("18101912-1163-4FBD-95F6-3417345150E2")]
   public sealed class QAPCharacteristicCalculator : CharacteristicCalculator {
 
     [StorableConstructor]
-    private QAPCharacteristicCalculator(bool deserializing) : base(deserializing) { }
+    private QAPCharacteristicCalculator(StorableConstructorFlag _) : base(_) { }
     private QAPCharacteristicCalculator(QAPCharacteristicCalculator original, Cloner cloner) : base(original, cloner) { }
     public QAPCharacteristicCalculator() {

branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/QAP/QAPDirectedWalk.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -26 +31 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.QuadraticAssignment;
 using HeuristicLab.Random;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("Directed Walk (QAP-specific)", "")]
-  [StorableClass]
+  [StorableType("D10EE9C0-3719-4427-98CE-F4A981DB1C58")]
   public class QAPDirectedWalk : CharacteristicCalculator {
     
@@ -76 +76 @@
 
     [StorableConstructor]
-    private QAPDirectedWalk(bool deserializing) : base(deserializing) { }
+    private QAPDirectedWalk(StorableConstructorFlag _) : base(_) { }
     private QAPDirectedWalk(QAPDirectedWalk original, Cloner cloner) : base(original, cloner) { }
     public QAPDirectedWalk() {