Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/SimilarityCalculators

Timestamp:

03/28/19 16:54:20 (6 years ago)

Author:

abeham

Message:

#2521: merged changes from r15684 to trunk HEAD (r16716) and resolved all merge conflicts

• it doesn't build

Location:

branches/2521_ProblemRefactoring

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting/3.4/SimilarityCalculators/VRPSimilarityCalculator.cs (modified) (4 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/SimilarityCalculators/VRPSimilarityCalculator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization.Operators;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
@@ -38 +38 @@
   /// </remarks>
   [Item("VRPSimilarityCalculator", "An operator which performs similarity calculation between two VRP solutions.")]
-  [StorableClass]
+  [StorableType("16011E6B-62F5-4165-9F8D-E4BA5191FB7E")]
   public sealed class VRPSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
     protected override bool IsCommutative { get { return true; } }
@@ -45 +45 @@
     public IVRPProblemInstance ProblemInstance { get; set; }
 
-    private VRPSimilarityCalculator(bool deserializing) : base(deserializing) { }
+    [StorableConstructor]
+    private VRPSimilarityCalculator(StorableConstructorFlag _) : base(_) { }
     private VRPSimilarityCalculator(VRPSimilarityCalculator original, Cloner cloner)
       : base(original, cloner) {