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

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

Files:

• GQAPBinarySolver.cs (modified) (3 diffs)
• GQAPIntegerSolver.cs (modified) (3 diffs)
• GQAPListSolver.cs (modified) (3 diffs)
• LocalSolverContext.cs (modified) (2 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPBinarySolver.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 localsolver;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSolverNet {
   [Item("LocalSolver Binary (GQAP)", "LocalSolver algorithm solving the GQAP using 0-1 decision variables")]
-  [StorableClass]
+  [StorableType("E9040268-4240-4EF7-8E9A-6991D0831D06")]
   [Creatable(CreatableAttribute.Categories.Algorithms)]
   public sealed class GQAPBinarySolver : ContextAlgorithm<LocalSolverContext, IntegerVectorEncoding> {
@@ -56 +56 @@
 
     [StorableConstructor]
-    private GQAPBinarySolver(bool deserializing) : base(deserializing) { }
+    private GQAPBinarySolver(StorableConstructorFlag _) : base(_) { }
     private GQAPBinarySolver(GQAPBinarySolver original, Cloner cloner)
     : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPIntegerSolver.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 localsolver;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSolverNet {
   [Item("LocalSolver Integer (GQAP)", "LocalSolver algorithm solving the GQAP using integer decision variables")]
-  [StorableClass]
+  [StorableType("6D0D77CE-A8DE-41EA-9674-A1D59782D03B")]
   [Creatable(CreatableAttribute.Categories.Algorithms)]
   public sealed class GQAPIntegerSolver : ContextAlgorithm<LocalSolverContext, IntegerVectorEncoding> {
@@ -55 +55 @@
 
     [StorableConstructor]
-    private GQAPIntegerSolver(bool deserializing) : base(deserializing) { }
+    private GQAPIntegerSolver(StorableConstructorFlag _) : base(_) { }
     private GQAPIntegerSolver(GQAPIntegerSolver original, Cloner cloner)
     : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPListSolver.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 localsolver;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSolverNet {
   [Item("LocalSolver List (GQAP)", "LocalSolver algorithm solving the GQAP using list decision variables")]
-  [StorableClass]
+  [StorableType("BBB27FAA-DCFD-4DB4-A465-4A02E1A0EDA9")]
   [Creatable(CreatableAttribute.Categories.Algorithms)]
   public sealed class GQAPListSolver : ContextAlgorithm<LocalSolverContext, IntegerVectorEncoding> {
@@ -55 +55 @@
 
     [StorableConstructor]
-    private GQAPListSolver(bool deserializing) : base(deserializing) { }
+    private GQAPListSolver(StorableConstructorFlag _) : base(_) { }
     private GQAPListSolver(GQAPListSolver original, Cloner cloner)
     : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/LocalSolverContext.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSolverNet {
   [Item("LocalSolver Context", "A context for CPLEX solvers.")]
-  [StorableClass]
+  [StorableType("DAE4D0C7-AFE1-4FCF-9DD5-899E4DC4FD9E")]
   public class LocalSolverContext : SingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
 
@@ -45 +45 @@
 
     [StorableConstructor]
-    protected LocalSolverContext(bool deserializing) : base(deserializing) { }
+    protected LocalSolverContext(StorableConstructorFlag _) : base(_) { }
     protected LocalSolverContext(LocalSolverContext original, Cloner cloner)
       : base(original, cloner) {