Changeset 4722 for trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveAttribute.cs

Timestamp:

11/06/10 01:56:04 (13 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/Moves/OneBitflipMove/OneBitflipMoveAttribute.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveAttribute.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {
-  [Item("OneBitflipMoveAttribute", "Base class for specifying a move attribute.")]
+  [Item("OneBitflipMoveAttribute", "Describes the attributes (move quality and index) of a single bitflip move.")]
   [StorableClass]
   public class OneBitflipMoveAttribute : Item {
@@ -33 +33 @@
     public int Index { get; protected set; }
 
-    public OneBitflipMoveAttribute()
-      : this(-1, 0) {
+    [StorableConstructor]
+    protected OneBitflipMoveAttribute(bool deserializing) : base(deserializing) { }
+    protected OneBitflipMoveAttribute(OneBitflipMoveAttribute original, Cloner cloner)
+      : base(original, cloner) {
+      this.MoveQuality = original.MoveQuality;
+      this.Index = original.Index;
     }
-
+    public OneBitflipMoveAttribute() : this(-1, 0) { }
     public OneBitflipMoveAttribute(int index, double moveQuality)
       : base() {
@@ -44 +48 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      OneBitflipMoveAttribute clone = (OneBitflipMoveAttribute)base.Clone(cloner);
-      clone.MoveQuality = MoveQuality;
-      clone.Index = Index;
-      return clone;
+      return new OneBitflipMoveAttribute(this, cloner);
     }
   }