Changeset 4722 for trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/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.BinaryVectorEncoding/3.3/Manipulators/SinglePositionBitflipManipulator.cs (modified) (2 diffs)
• HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Manipulators/SomePositionsBitflipManipulator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Manipulators/SinglePositionBitflipManipulator.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -32 +33 @@
   [Item("SinglePositionBitflipManipulator", "Flips exactly one bit of a binary vector. It is implemented as described in Michalewicz, Z. 1999. Genetic Algorithms + Data Structures = Evolution Programs. Third, Revised and Extended Edition, Spring-Verlag Berlin Heidelberg.")]
   [StorableClass]
-  public class SinglePositionBitflipManipulator : BinaryVectorManipulator {
+  public sealed class SinglePositionBitflipManipulator : BinaryVectorManipulator {
+
+    [StorableConstructor]
+    private SinglePositionBitflipManipulator(bool deserializing) : base(deserializing) { }
+    private SinglePositionBitflipManipulator(SinglePositionBitflipManipulator original, Cloner cloner) : base(original, cloner) { }
+    public SinglePositionBitflipManipulator() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new SinglePositionBitflipManipulator(this, cloner);
+    }
+
     /// <summary>
     /// Performs the single position bitflip mutation on a binary vector.

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Manipulators/SomePositionsBitflipManipulator.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -34 +35 @@
   [Item("SomePositionsBitflipManipulator", "Flips some bits of a binary vector, each position is flipped with a probability of pm. 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, p. 43.")]
   [StorableClass]
-  public class SomePositionsBitflipManipulator : BinaryVectorManipulator {
+  public sealed class SomePositionsBitflipManipulator : BinaryVectorManipulator {
     /// <summary>
     /// Mmutation probability for each position.
@@ -42 +43 @@
     }
 
+    [StorableConstructor]
+    private SomePositionsBitflipManipulator(bool deserializing) : base(deserializing) { }
+    private SomePositionsBitflipManipulator(SomePositionsBitflipManipulator original, Cloner cloner) : base(original, cloner) { }
     /// <summary>
     /// Initializes a new instance of <see cref="NPointCrossover"/>
     /// </summary>
-    public SomePositionsBitflipManipulator() {
+    public SomePositionsBitflipManipulator()
+      : base() {
       Parameters.Add(new ValueLookupParameter<DoubleValue>("MutationProbability", "The mutation probability for each position", new DoubleValue(0.2)));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new SomePositionsBitflipManipulator(this, cloner);
     }