Changeset 4722 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators

Timestamp:

11/06/10 01:56:04 (14 years ago)

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/InsertionManipulator.cs (modified) (2 diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/InversionManipulator.cs (modified) (2 diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/MultiPermutationManipulator.cs (modified) (3 diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/ScrambleManipulator.cs (modified) (2 diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/Swap2Manipulator.cs (modified) (2 diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/Swap3Manipulator.cs (modified) (2 diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/TranslocationInversionManipulator.cs (modified) (2 diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/TranslocationManipulator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/InsertionManipulator.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -33 +34 @@
   [StorableClass]
   public class InsertionManipulator : PermutationManipulator {
+    [StorableConstructor]
+    protected InsertionManipulator(bool deserializing) : base(deserializing) { }
+    protected InsertionManipulator(InsertionManipulator original, Cloner cloner) : base(original, cloner) { }
+    public InsertionManipulator() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new InsertionManipulator(this, cloner);
+    }
+
     /// <summary>
     /// Moves an randomly chosen element in the specified <paramref name="permutation"/> array 

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/InversionManipulator.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -33 +34 @@
   [StorableClass]
   public class InversionManipulator : PermutationManipulator {
+    [StorableConstructor]
+    protected InversionManipulator(bool deserializing) : base(deserializing) { }
+    protected InversionManipulator(InversionManipulator original, Cloner cloner) : base(original, cloner) { }
+    public InversionManipulator() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new InversionManipulator(this, cloner);
+    }
+
     /// <summary>
     /// Inverts a randomly chosen part of a permutation.

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/MultiPermutationManipulator.cs

@@ -23 +23 @@
 using System.Linq;
 using HeuristicLab.Collections;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Operators;
@@ -46 +47 @@
 
     [StorableConstructor]
-    private MultiPermutationManipulator(bool deserializing) : base(deserializing) { }
+    protected MultiPermutationManipulator(bool deserializing) : base(deserializing) { }
+    protected MultiPermutationManipulator(MultiPermutationManipulator original, Cloner cloner) : base(original, cloner) { }
     public MultiPermutationManipulator()
       : base() {
@@ -55 +57 @@
           Operators.Add((IPermutationManipulator)Activator.CreateInstance(type), true);
       }
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new MultiPermutationManipulator(this, cloner);
     }
 

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/ScrambleManipulator.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -33 +34 @@
   [StorableClass]
   public class ScrambleManipulator : PermutationManipulator {
+    [StorableConstructor]
+    protected ScrambleManipulator(bool deserializing) : base(deserializing) { }
+    protected ScrambleManipulator(ScrambleManipulator original, Cloner cloner) : base(original, cloner) { }
+    public ScrambleManipulator() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ScrambleManipulator(this, cloner);
+    }
+
     /// <summary>
     /// Mixes the elements of the given <paramref name="permutation"/> randomly 

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/Swap2Manipulator.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -33 +34 @@
   [StorableClass]
   public class Swap2Manipulator : PermutationManipulator {
+    [StorableConstructor]
+    protected Swap2Manipulator(bool deserializing) : base(deserializing) { }
+    protected Swap2Manipulator(Swap2Manipulator original, Cloner cloner) : base(original, cloner) { }
+    public Swap2Manipulator() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new Swap2Manipulator(this, cloner);
+    }
+
     /// <summary>
     /// Swaps two randomly chosen elements in the given <paramref name="permutation"/> permutation.

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/Swap3Manipulator.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -35 +36 @@
   [StorableClass]
   public class Swap3Manipulator : PermutationManipulator {
+    [StorableConstructor]
+    protected Swap3Manipulator(bool deserializing) : base(deserializing) { }
+    protected Swap3Manipulator(Swap3Manipulator original, Cloner cloner) : base(original, cloner) { }
+    public Swap3Manipulator() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new Swap3Manipulator(this, cloner);
+    }
+
     /// <summary>
     /// Swaps three randomly chosen elements of the given <paramref name="permutation"/> array.

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/TranslocationInversionManipulator.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -34 +35 @@
   [StorableClass]
   public class TranslocationInversionManipulator : PermutationManipulator {
+    [StorableConstructor]
+    protected TranslocationInversionManipulator(bool deserializing) : base(deserializing) { }
+    protected TranslocationInversionManipulator(TranslocationInversionManipulator original, Cloner cloner) : base(original, cloner) { }
+    public TranslocationInversionManipulator() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new TranslocationInversionManipulator(this, cloner);
+    }
+
     /// <summary>
     /// Moves a randomly chosen interval of elements to another (randomly chosen) position in the given

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/TranslocationManipulator.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -34 +35 @@
   [StorableClass]
   public class TranslocationManipulator : PermutationManipulator {
+    [StorableConstructor]
+    protected TranslocationManipulator(bool deserializing) : base(deserializing) { }
+    protected TranslocationManipulator(TranslocationManipulator original, Cloner cloner) : base(original, cloner) { }
+    public TranslocationManipulator() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new TranslocationManipulator(this, cloner);
+    }
+
     /// <summary>
     /// Moves a randomly chosen interval of elements to another (randomly chosen) position in the given