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

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

Files:

• DirectedPath.cs (modified) (2 diffs)
• PRProblemInstanceAnalyzer.cs (modified) (2 diffs)
• ProblemInstanceAnalyzer.cs (modified) (3 diffs)
• QAPPRProblemInstanceAnalyzer.cs (modified) (1 diff)

branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemInstanceAnalysis/DirectedPath.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("Directed Path", "")]
-  [StorableClass]
+  [StorableType("5B1A790B-918B-486E-A1B7-3B9C21FAB901")]
   public class DirectedPath<T> : Item where T : class, IDeepCloneable {
     [Storable]
@@ -38 +38 @@
 
     [StorableConstructor]
-    protected DirectedPath(bool deserializing) : base(deserializing) { }
+    protected DirectedPath(StorableConstructorFlag _) : base(_) { }
     protected DirectedPath(DirectedPath<T> original, Cloner cloner)
       : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemInstanceAnalysis/PRProblemInstanceAnalyzer.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("Path-Relinking Problem Instance Analyzer", "Tries to identify the current problem instance being solved by analyzing the output of path-relinking heuristics.")]
-  [StorableClass]
+  [StorableType("DF0066FA-022A-465E-95EE-1D829B471423")]
   public abstract class PrProblemInstanceAnalyzer<T> : ProblemInstanceAnalyzer where T : class, IDeepCloneable {
 
@@ -38 +37 @@
 
     [StorableConstructor]
-    protected PrProblemInstanceAnalyzer(bool deserializing) : base(deserializing) { }
+    protected PrProblemInstanceAnalyzer(StorableConstructorFlag _) : base(_) { }
     protected PrProblemInstanceAnalyzer(PrProblemInstanceAnalyzer<T> original, Cloner cloner)
       : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemInstanceAnalysis/ProblemInstanceAnalyzer.cs

@@ -23 +23 @@
 using System.Globalization;
 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;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("Problem Instance Similarity Analyzer", "Base class for analyzing whether certain obtained characteristics match the characteristics of already known problem instances.")]
-  [StorableClass]
+  [StorableType("D2D6949C-4EBE-42E5-842E-62CD5B5F28C5")]
   public abstract class ProblemInstanceAnalyzer : SingleSuccessorOperator, IAnalyzer {
 
@@ -58 +58 @@
 
     [StorableConstructor]
-    protected ProblemInstanceAnalyzer(bool deserializing) : base(deserializing) { }
+    protected ProblemInstanceAnalyzer(StorableConstructorFlag _) : base(_) { }
 
     protected ProblemInstanceAnalyzer(ProblemInstanceAnalyzer original, Cloner cloner)

branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemInstanceAnalysis/QAPPRProblemInstanceAnalyzer.cs

@@ -21 +21 @@
 
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.PermutationEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("QAP Path-Relinking Problem Instance Analyzer", "")]
-  [StorableClass]
+  [StorableType("9A603F8E-8BA9-4FF4-9694-14ED01E68657")]
   public sealed class QAPPRProblemInstanceAnalyzer : PrProblemInstanceAnalyzer<Permutation> {
 
     [StorableConstructor]
-    private QAPPRProblemInstanceAnalyzer(bool deserializing) : base(deserializing) { }
+    private QAPPRProblemInstanceAnalyzer(StorableConstructorFlag _) : base(_) { }
     private QAPPRProblemInstanceAnalyzer(QAPPRProblemInstanceAnalyzer original, Cloner cloner) : base(original, cloner) { }
     public QAPPRProblemInstanceAnalyzer() { }