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

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

Files:

• CharacteristicCalculator.cs (modified) (2 diffs)
• GQAP/GQAPCharacteristicCalculator.cs (modified) (1 diff)
• GQAP/GQAPDirectedWalk.cs (modified) (4 diffs)
• QAP/QAPCharacteristicCalculator.cs (modified) (1 diff)
• QAP/QAPDirectedWalk.cs (modified) (3 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/CharacteristicCalculator.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System.Collections.Generic;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("Characteristic Calculator", "")]
-  [StorableClass]
+  [StorableType("389790FF-2F4F-4526-9500-876926CF2E28")]
   public abstract class CharacteristicCalculator : ParameterizedNamedItem, ICharacteristicCalculator {
 
@@ -40 +40 @@
 
     [StorableConstructor]
-    protected CharacteristicCalculator(bool deserializing) : base(deserializing) { }
+    protected CharacteristicCalculator(StorableConstructorFlag _) : base(_) { }
     protected CharacteristicCalculator(CharacteristicCalculator original, Cloner cloner)
       : base(original, cloner) {

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() {

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() {