Changeset 16462 for branches/2520_PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators

Timestamp:

12/28/18 16:10:48 (6 years ago)

Author:

jkarder

Message:

#2520: worked on reintegration of new persistence

• added nuget references to HEAL.Fossil
• added StorableType attributes to many classes
• changed signature of StorableConstructors
• removed some classes in old persistence
• removed some unnecessary usings

Location:

branches/2520_PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators

Files:

• InsertionManipulator.cs (modified) (2 diffs)
• InversionManipulator.cs (modified) (2 diffs)
• MultiPermutationManipulator.cs (modified) (2 diffs)
• ScrambleManipulator.cs (modified) (2 diffs)
• Swap2Manipulator.cs (modified) (2 diffs)
• Swap3Manipulator.cs (modified) (2 diffs)
• TranslocationInversionManipulator.cs (modified) (2 diffs)
• TranslocationManipulator.cs (modified) (2 diffs)

branches/2520_PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/InsertionManipulator.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 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() { }

branches/2520_PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/InversionManipulator.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -32 +32 @@
   /// </remarks>
   [Item("InversionManipulator", "An operator which inverts a randomly chosen part of a permutation. It is implemented as described in Eiben, A.E. and Smith, J.E. 2003. Introduction to Evolutionary Computation. Natural Computing Series, Springer-Verlag Berlin Heidelberg.")]
-  [StorableClass]
+  [StorableType("F43DF081-19FB-4082-B136-EC1A77E0468A")]
   public class InversionManipulator : PermutationManipulator {
     [StorableConstructor]
-    protected InversionManipulator(bool deserializing) : base(deserializing) { }
+    protected InversionManipulator(StorableConstructorFlag _) : base(_) { }
     protected InversionManipulator(InversionManipulator original, Cloner cloner) : base(original, cloner) { }
     public InversionManipulator() : base() { }

branches/2520_PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/MultiPermutationManipulator.cs

@@ -28 +28 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
   [Item("MultiPermutationManipulator", "Randomly selects and applies one of its manipulators every time it is called.")]
-  [StorableClass]
+  [StorableType("21EA3717-C907-490B-82E7-34A0B1A94EB0")]
   public class MultiPermutationManipulator : StochasticMultiBranch<IPermutationManipulator>, IPermutationManipulator, IStochasticOperator {
     public override bool CanChangeName {
@@ -47 +47 @@
 
     [StorableConstructor]
-    protected MultiPermutationManipulator(bool deserializing) : base(deserializing) { }
+    protected MultiPermutationManipulator(StorableConstructorFlag _) : base(_) { }
     protected MultiPermutationManipulator(MultiPermutationManipulator original, Cloner cloner) : base(original, cloner) { }
     public MultiPermutationManipulator()

branches/2520_PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/ScrambleManipulator.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -33 +33 @@
   /// </remarks>
   [Item("ScrambleManipulator", "An operator which manipulates a permutation array by randomly scrambling the elements in a randomly chosen interval. It is implemented as described in Syswerda, G. (1991). Schedule Optimization Using Genetic Algorithms. In Davis, L. (Ed.) Handbook of Genetic Algorithms, Van Nostrand Reinhold, New York, pp 332-349.")]
-  [StorableClass]
+  [StorableType("C324E297-C54E-4A18-BF41-3F0EF9595762")]
   public class ScrambleManipulator : PermutationManipulator {
     [StorableConstructor]
-    protected ScrambleManipulator(bool deserializing) : base(deserializing) { }
+    protected ScrambleManipulator(StorableConstructorFlag _) : base(_) { }
     protected ScrambleManipulator(ScrambleManipulator original, Cloner cloner) : base(original, cloner) { }
     public ScrambleManipulator() : base() { }

branches/2520_PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/Swap2Manipulator.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -32 +32 @@
   /// </remarks>
   [Item("Swap2Manipulator", "An operator which manipulates a permutation array by swapping to randomly chosen elements. It is implemented as described in Eiben, A.E. and Smith, J.E. 2003. Introduction to Evolutionary Computation. Natural Computing Series, Springer-Verlag Berlin Heidelberg.")]
-  [StorableClass]
+  [StorableType("0909F09A-B27B-4962-8A7D-B4561A37D324")]
   public class Swap2Manipulator : PermutationManipulator {
     [StorableConstructor]
-    protected Swap2Manipulator(bool deserializing) : base(deserializing) { }
+    protected Swap2Manipulator(StorableConstructorFlag _) : base(_) { }
     protected Swap2Manipulator(Swap2Manipulator original, Cloner cloner) : base(original, cloner) { }
     public Swap2Manipulator() : base() { }

branches/2520_PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/Swap3Manipulator.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -34 +34 @@
   /// </remarks>
   [Item("Swap3Manipulator", "An operator which manipulates a permutation array by swaping three randomly chosen elements. It is implemented such that first 3 positions are randomly chosen in the interval [0;N) with N = length of the permutation with all positions being distinct from each other. Then position 1 is put in place of position 3, position 2 is put in place of position 1 and position 3 is put in place of position 2.")]
-  [StorableClass]
+  [StorableType("3907489F-54DF-4774-85E6-E89CE055B56C")]
   public class Swap3Manipulator : PermutationManipulator {
     [StorableConstructor]
-    protected Swap3Manipulator(bool deserializing) : base(deserializing) { }
+    protected Swap3Manipulator(StorableConstructorFlag _) : base(_) { }
     protected Swap3Manipulator(Swap3Manipulator original, Cloner cloner) : base(original, cloner) { }
     public Swap3Manipulator() : base() { }

branches/2520_PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/TranslocationInversionManipulator.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -33 +33 @@
   /// </remarks>
   [Item("TranslocationInversionManipulator", "An operator which inverts a randomly chosen part of a permutation and inserts it at a random position. It is implemented as described in Fogel, D.B. 1993. Applying Evolutionary Programming to Selected TSP Problems, Cybernetics and Systems, 22, pp. 27-36.")]
-  [StorableClass]
+  [StorableType("00E282D0-60ED-4A6B-B409-9CAB380DA670")]
   public class TranslocationInversionManipulator : PermutationManipulator {
     [StorableConstructor]
-    protected TranslocationInversionManipulator(bool deserializing) : base(deserializing) { }
+    protected TranslocationInversionManipulator(StorableConstructorFlag _) : base(_) { }
     protected TranslocationInversionManipulator(TranslocationInversionManipulator original, Cloner cloner) : base(original, cloner) { }
     public TranslocationInversionManipulator() : base() { }

branches/2520_PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/TranslocationManipulator.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -33 +33 @@
   /// </remarks>
   [Item("TranslocationManipulator", "An operator which Manipulates a permutation array by moving a randomly chosen interval of elements to another (randomly chosen) position in the array. It is implemented as described in Michalewicz, Z. 1992. Genetic Algorithms + Data Structures = Evolution Programs, Springer Verlag, Berlin Heidelberg.")]
-  [StorableClass]
+  [StorableType("AB07D415-33F1-46C0-83FA-F7C1151B8AC8")]
   public class TranslocationManipulator : PermutationManipulator {
     [StorableConstructor]
-    protected TranslocationManipulator(bool deserializing) : base(deserializing) { }
+    protected TranslocationManipulator(StorableConstructorFlag _) : base(_) { }
     protected TranslocationManipulator(TranslocationManipulator original, Cloner cloner) : base(original, cloner) { }
     public TranslocationManipulator() : base() { }