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

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/Evaluation/Evaluation.cs (modified) (3 diffs)
• 3.3/Evaluation/GQAPNMoveEvaluator.cs (modified) (3 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluation/Evaluation.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.
@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
   [Item("GQAP Evaluation", "Class that contains the results of evaluating a solution to the GQAP.")]
-  [StorableClass]
+  [StorableType("765222A4-9184-42FF-9413-886BC9B2EF03")]
   public class Evaluation : Item {
 
@@ -64 +65 @@
     
     [StorableConstructor]
-    protected Evaluation(bool deserializing) : base(deserializing) { }
+    protected Evaluation(StorableConstructorFlag _) : base(_) { }
     protected Evaluation(Evaluation original, Cloner cloner)
       : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluation/GQAPNMoveEvaluator.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.
@@ -29 +29 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
   [Item("N-Move Evaluator", "Evaluates an N-Move.")]
-  [StorableClass]
+  [StorableType("EB4CCB5D-8FAC-4DFD-944E-1AC418AAE091")]
   public class GQAPNMoveEvaluator : SingleSuccessorOperator, IGQAPNMoveEvaluator,
     IQualityAwareGQAPOperator, IProblemInstanceAwareGQAPOperator, IAssignmentAwareGQAPOperator {
@@ -66 +67 @@
 
     [StorableConstructor]
-    protected GQAPNMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected GQAPNMoveEvaluator(StorableConstructorFlag _) : base(_) { }
     protected GQAPNMoveEvaluator(GQAPNMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     public GQAPNMoveEvaluator()