Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/InsertionManipulator.cs

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.Encodings.PermutationEncoding (modified) (1 prop)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/InsertionManipulator.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/InsertionManipulator.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.
@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -32 +32 @@
   /// </remarks>
   [Item("InsertionManipulator", "An operator which moves randomly one element to another position in the permutation (Insertion is a special case of Translocation). It is implemented as described in Fogel, D.B. (1988). An Evolutionary Approach to the Traveling Salesman Problem, Biological Cybernetics, 60, pp. 139-144.")]
-  [StorableClass]
+  [StorableType("E8C09728-ACB7-491B-B87C-BE8E2B5A5B0B")]
   public class InsertionManipulator : PermutationManipulator {
     [StorableConstructor]
-    protected InsertionManipulator(bool deserializing) : base(deserializing) { }
+    protected InsertionManipulator(StorableConstructorFlag _) : base(_) { }
     protected InsertionManipulator(InsertionManipulator original, Cloner cloner) : base(original, cloner) { }
     public InsertionManipulator() : base() { }