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

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

Files:

• . (modified) (1 prop)
• 3.3/SolutionCreators/GQAPSolutionCreator.cs (modified) (4 diffs)
• 3.3/SolutionCreators/GQAPStochasticSolutionCreator.cs (modified) (3 diffs)
• 3.3/SolutionCreators/GreedyRandomizedSolutionCreator.cs (modified) (4 diffs)
• 3.3/SolutionCreators/RandomButFeasibleSolutionCreator.cs (modified) (3 diffs)
• 3.3/SolutionCreators/SlackMinimizationSolutionCreator.cs (modified) (3 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/GQAPSolutionCreator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -26 +27 @@
 using HeuristicLab.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
   [Item("GQAPSolutionCreator", "Base class for solution creators of the Generalized Quadratic Assignment Problem.")]
-  [StorableClass]
+  [StorableType("1FD56558-5E7C-470C-8E7C-B3CEF7DB1D61")]
   public abstract class GQAPSolutionCreator : SingleSuccessorOperator, IProblemInstanceAwareGQAPOperator, IGQAPSolutionCreator {
 
@@ -51 +52 @@
 
     [StorableConstructor]
-    protected GQAPSolutionCreator(bool deserializing) : base(deserializing) { }
+    protected GQAPSolutionCreator(StorableConstructorFlag _) : base(_) { }
     protected GQAPSolutionCreator(GQAPSolutionCreator original, Cloner cloner)
       : base(original, cloner) { }

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/GQAPStochasticSolutionCreator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -26 +26 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
   [Item("GQAPStochasticSolutionCreator", "Base class for stochastic solution creators of the Generalized Quadratic Assignment Problem.")]
-  [StorableClass]
+  [StorableType("D7789768-032F-4EAB-ADED-FF4DD5A23B99")]
   public abstract class GQAPStochasticSolutionCreator : GQAPSolutionCreator, IStochasticOperator {
 
@@ -37 +38 @@
 
     [StorableConstructor]
-    protected GQAPStochasticSolutionCreator(bool deserializing) : base(deserializing) { }
+    protected GQAPStochasticSolutionCreator(StorableConstructorFlag _) : base(_) { }
     protected GQAPStochasticSolutionCreator(GQAPStochasticSolutionCreator original, Cloner cloner)
       : base(original, cloner) { }

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/GreedyRandomizedSolutionCreator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -31 +31 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Random;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
@@ -37 +38 @@
   /// </summary>
   [Item("GreedyRandomizedSolutionCreator", "Creates a solution according to the procedure described in Mateus, G., Resende, M., and Silva, R. 2011. GRASP with path-relinking for the generalized quadratic assignment problem. Journal of Heuristics 17, Springer Netherlands, pp. 527-565.")]
-  [StorableClass]
+  [StorableType("44919EFC-AF47-4F0D-8EE4-F5AECBF776CA")]
   public class GreedyRandomizedSolutionCreator : GQAPStochasticSolutionCreator {
 
@@ -48 +49 @@
 
     [StorableConstructor]
-    protected GreedyRandomizedSolutionCreator(bool deserializing) : base(deserializing) { }
+    protected GreedyRandomizedSolutionCreator(StorableConstructorFlag _) : base(_) { }
     protected GreedyRandomizedSolutionCreator(GreedyRandomizedSolutionCreator original, Cloner cloner)
       : base(original, cloner) { }

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/RandomButFeasibleSolutionCreator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -31 +31 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Random;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
   [Item("RandomButFeasibleSolutionCreator", "Creates a random, but feasible solution to the Generalized Quadratic Assignment Problem.")]
-  [StorableClass]
+  [StorableType("3C194DAF-81A9-4FA3-AE7F-45951FC33DE1")]
   public class RandomFeasibleSolutionCreator : GQAPStochasticSolutionCreator {
 
@@ -45 +46 @@
 
     [StorableConstructor]
-    protected RandomFeasibleSolutionCreator(bool deserializing) : base(deserializing) { }
+    protected RandomFeasibleSolutionCreator(StorableConstructorFlag _) : base(_) { }
     protected RandomFeasibleSolutionCreator(RandomFeasibleSolutionCreator original, Cloner cloner) : base(original, cloner) { }
     public RandomFeasibleSolutionCreator()

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/SlackMinimizationSolutionCreator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -31 +31 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Random;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
   [Item("SlackMinimizationSolutionCreator", "A heuristic that creates a solution to the Generalized Quadratic Assignment Problem by minimizing the amount of slack.")]
-  [StorableClass]
+  [StorableType("02676A57-A686-4FDB-B912-B3792C749669")]
   public class SlackMinimizationSolutionCreator : GQAPStochasticSolutionCreator {
 
@@ -51 +52 @@
 
     [StorableConstructor]
-    protected SlackMinimizationSolutionCreator(bool deserializing) : base(deserializing) { }
+    protected SlackMinimizationSolutionCreator(StorableConstructorFlag _) : base(_) { }
     protected SlackMinimizationSolutionCreator(SlackMinimizationSolutionCreator original, Cloner cloner) : base(original, cloner) { }
     public SlackMinimizationSolutionCreator()