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

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.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/CPLEX

Files:

• CplexContext.cs (modified) (1 diff)
• CplexSolver.cs (modified) (4 diffs)
• GQAP-FY.cs (modified) (2 diffs)
• GQAP-KB.cs (modified) (2 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/CPLEX/CplexContext.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.CPLEX {
   [Item("CPLEX Context", "A context for CPLEX solvers.")]
-  [StorableClass]
+  [StorableType("9A91A380-A6C3-4294-80D7-163AA13D600B")]
   public class CplexContext : SingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
     
     [StorableConstructor]
-    protected CplexContext(bool deserializing) : base(deserializing) { }
+    protected CplexContext(StorableConstructorFlag _) : base(_) { }
     protected CplexContext(CplexContext original, Cloner cloner)
       : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/CPLEX/CplexSolver.cs

@@ -22 +22 @@
 using System;
 using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27 +28 @@
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using ILOG.CPLEX;
 using ILOG.OPL;
@@ -33 +33 @@
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.CPLEX {
   [Item("CPLEX Solver (GQAP)", "Base class")]
-  [StorableClass]
+  [StorableType("09AC71C5-20C7-4AC0-9E5A-405BA5075552")]
   public abstract class CplexSolver : ContextAlgorithm<CplexContext, IntegerVectorEncoding> {
     public override bool SupportsPause {
@@ -49 +49 @@
 
     [StorableConstructor]
-    protected CplexSolver(bool deserializing) : base(deserializing) { }
+    protected CplexSolver(StorableConstructorFlag _) : base(_) { }
     protected CplexSolver(CplexSolver original, Cloner cloner)
     : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/CPLEX/GQAP-FY.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using ILOG.CPLEX;
 using ILOG.OPL;
@@ -28 +28 @@
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.CPLEX {
   [Item("FY-Linearization CPLEX (GQAP)", "")]
-  [StorableClass]
+  [StorableType("C10D185E-B007-4C9F-9EFC-6EE1D44A3DE1")]
   [Creatable(CreatableAttribute.Categories.Algorithms)]
   public sealed class GQAP_FY : CplexSolver {
     
     [StorableConstructor]
-    private GQAP_FY(bool deserializing) : base(deserializing) { }
+    private GQAP_FY(StorableConstructorFlag _) : base(_) { }
     private GQAP_FY(GQAP_FY original, Cloner cloner)
     : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/CPLEX/GQAP-KB.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using ILOG.CPLEX;
 using ILOG.OPL;
@@ -28 +28 @@
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.CPLEX {
   [Item("KB-Linearization CPLEX (GQAP)", "")]
-  [StorableClass]
+  [StorableType("649D3DB6-3E54-46E7-BB12-5F26417D6E40")]
   [Creatable(CreatableAttribute.Categories.Algorithms)]
   public sealed class GQAP_KB : CplexSolver {
     
     [StorableConstructor]
-    private GQAP_KB(bool deserializing) : base(deserializing) { }
+    private GQAP_KB(StorableConstructorFlag _) : base(_) { }
     private GQAP_KB(GQAP_KB original, Cloner cloner)
     : base(original, cloner) {