Changeset 4663 for branches/CloningRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves

Timestamp:

10/29/10 16:41:43 (14 years ago)

Author:

abeham

Message:

#922

• Refactored HeuristicLab.Encodings.BinaryVectorEncoding

Location:

branches/CloningRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves

Files:

• OneBitflipMove/ExhaustiveOneBitflipMoveGenerator.cs (modified) (1 diff)
• OneBitflipMove/OneBitflipMove.cs (modified) (2 diffs)
• OneBitflipMove/OneBitflipMoveAttribute.cs (modified) (3 diffs)
• OneBitflipMove/OneBitflipMoveGenerator.cs (modified) (2 diffs)
• OneBitflipMove/OneBitflipMoveMaker.cs (modified) (3 diffs)
• OneBitflipMove/OneBitflipMoveTabuChecker.cs (modified) (3 diffs)
• OneBitflipMove/OneBitflipMoveTabuMaker.cs (modified) (2 diffs)
• OneBitflipMove/StochasticOneBitflipMultiMoveGenerator.cs (modified) (2 diffs)
• OneBitflipMove/StochasticOneBitflipSingleMoveGenerator.cs (modified) (2 diffs)
• OneIndexMove.cs (modified) (2 diffs)

branches/CloningRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/ExhaustiveOneBitflipMoveGenerator.cs

@@ -23 +23 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {
   [Item("ExhaustiveBitflipMoveGenerator", "Generates all possible one bitflip moves from a given binaryVector.")]
   [StorableClass]
-  public class ExhaustiveOneBitflipMoveGenerator : OneBitflipMoveGenerator, IExhaustiveMoveGenerator {
+  public sealed class ExhaustiveOneBitflipMoveGenerator : OneBitflipMoveGenerator, IExhaustiveMoveGenerator {
+    [StorableConstructor]
+    private ExhaustiveOneBitflipMoveGenerator(bool deserializing) : base(deserializing) { }
+    private ExhaustiveOneBitflipMoveGenerator(ExhaustiveOneBitflipMoveGenerator original, Cloner cloner) : base(original, cloner) { }
+    public ExhaustiveOneBitflipMoveGenerator() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ExhaustiveOneBitflipMoveGenerator(this, cloner);
+    }
+
     public static OneBitflipMove[] Apply(BinaryVector binaryVector) {
       int length = binaryVector.Length;

branches/CloningRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMove.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {
@@ -27 +28 @@
   [StorableClass]
   public class OneBitflipMove : OneIndexMove {
-    public OneBitflipMove()
-      : base() {
-    }
+    [StorableConstructor]
+    protected OneBitflipMove(bool deserializing) : base(deserializing) { }
+    protected OneBitflipMove(OneBitflipMove original, Cloner cloner) : base(original, cloner) { }
+    public OneBitflipMove() : base() { }
+    public OneBitflipMove(int index) : this(index, null) { }
+    public OneBitflipMove(int index, BinaryVector binaryVector) : base(index, binaryVector) { }
 
-    public OneBitflipMove(int index)
-      : base(index, null) {
-    }
-
-    public OneBitflipMove(int index, BinaryVector binaryVector)
-      : base(index, binaryVector) {
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new OneBitflipMove(this, cloner);
     }
   }

branches/CloningRefactoring/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);
     }
   }

branches/CloningRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveGenerator.cs

@@ -25 +25 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {
@@ -43 +44 @@
     }
 
+    [StorableConstructor]
+    protected OneBitflipMoveGenerator(bool deserializing) : base(deserializing) { }
+    protected OneBitflipMoveGenerator(OneBitflipMoveGenerator original, Cloner cloner) : base(original, cloner) { }
     public OneBitflipMoveGenerator()
       : base() {

branches/CloningRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveMaker.cs

@@ -26 +26 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {
@@ -47 +48 @@
     }
 
+    [StorableConstructor]
+    protected OneBitflipMoveMaker(bool deserializing) : base(deserializing) { }
+    protected OneBitflipMoveMaker(OneBitflipMoveMaker original, Cloner cloner) : base(original, cloner) { }
     public OneBitflipMoveMaker()
       : base() {
@@ -53 +57 @@
       Parameters.Add(new LookupParameter<OneBitflipMove>("OneBitflipMove", "The move to evaluate."));
       Parameters.Add(new LookupParameter<BinaryVector>("BinaryVector", "The solution as BinaryVector."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new OneBitflipMoveMaker(this, cloner);
     }
 

branches/CloningRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveTabuChecker.cs

@@ -26 +26 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {
@@ -61 +62 @@
     }
 
+    [StorableConstructor]
+    protected OneBitflipMoveTabuChecker(bool deserializing) : base(deserializing) { }
+    protected OneBitflipMoveTabuChecker(OneBitflipMoveTabuChecker original, Cloner cloner) : base(original, cloner) { }
     public OneBitflipMoveTabuChecker()
       : base() {
@@ -70 +74 @@
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, else if it is a minimization problem."));
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The quality of the current move."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new OneBitflipMoveTabuChecker(this, cloner);
     }
 

branches/CloningRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveTabuMaker.cs

@@ -24 +24 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {
@@ -36 +37 @@
     }
 
+    [StorableConstructor]
+    protected OneBitflipMoveTabuMaker(bool deserializing) : base(deserializing) { }
+    protected OneBitflipMoveTabuMaker(OneBitflipMoveTabuMaker original, Cloner cloner) : base(original, cloner) { }
     public OneBitflipMoveTabuMaker()
       : base() {
       Parameters.Add(new LookupParameter<BinaryVector>("BinaryVector", "The solution as BinaryVector."));
       Parameters.Add(new LookupParameter<OneBitflipMove>("OneBitflipMove", "The move that was made."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new OneBitflipMoveTabuMaker(this, cloner);
     }
 

branches/CloningRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/StochasticOneBitflipMultiMoveGenerator.cs

@@ -25 +25 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {
@@ -42 +43 @@
     }
 
+    [StorableConstructor]
+    protected StochasticOneBitflipMultiMoveGenerator(bool deserializing) : base(deserializing) { }
+    protected StochasticOneBitflipMultiMoveGenerator(StochasticOneBitflipMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
     public StochasticOneBitflipMultiMoveGenerator()
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator."));
       Parameters.Add(new ValueLookupParameter<IntValue>("SampleSize", "The number of moves to generate."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new StochasticOneBitflipMultiMoveGenerator(this, cloner);
     }
 

branches/CloningRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/StochasticOneBitflipSingleMoveGenerator.cs

@@ -24 +24 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {
@@ -33 +34 @@
     }
 
+    [StorableConstructor]
+    protected StochasticOneBitflipSingleMoveGenerator(bool deserializing) : base(deserializing) { }
+    protected StochasticOneBitflipSingleMoveGenerator(StochasticOneBitflipSingleMoveGenerator original, Cloner cloner) : base(original, cloner) { }
     public StochasticOneBitflipSingleMoveGenerator()
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new StochasticOneBitflipSingleMoveGenerator(this, cloner);
     }
 

branches/CloningRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneIndexMove.cs

@@ -33 +33 @@
     public BinaryVector BinaryVector { get; protected set; }
 
-    public OneIndexMove()
-      : base() {
-      Index = -1;
-      BinaryVector = null;
+    [StorableConstructor]
+    protected OneIndexMove(bool deserializing) : base(deserializing) { }
+    protected OneIndexMove(OneIndexMove original, Cloner cloner)
+      : base(original, cloner) {
+      this.Index = original.Index;
+      if (original.BinaryVector != null)
+        this.BinaryVector = cloner.Clone(original.BinaryVector);
     }
-
+    public OneIndexMove() : this(-1, null) { }
     public OneIndexMove(int index, BinaryVector binaryVector)
       : base() {
@@ -46 +49 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      OneIndexMove clone = (OneIndexMove)base.Clone(cloner);
-      clone.Index = Index;
-      if (BinaryVector != null)
-        clone.BinaryVector = (BinaryVector)BinaryVector.Clone(cloner);
-      return clone;
+      return new OneIndexMove(this, cloner);
     }
   }