Changeset 14128 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/Swap2/Swap2Move.cs

Timestamp:

07/20/16 14:02:36 (8 years ago)

Author:

gkronber

Message:

#1966: refactoring of bin packing implementation

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/Swap2/Swap2Move.cs (modified) (4 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/Swap2/Swap2Move.cs

@@ -32 +32 @@
   [Item("Swap2 Move", "A move on a Sequence vector that is specified by two group-assignment-indexes.")]
   [StorableClass]
-  public class Swap2Move : SequenceMove, IPackingMove {
+  public class Swap2Move : SequenceMove, IPackingMove<Permutation> {
     [Storable]
     public int Index1 { get; protected set; }
@@ -45 +45 @@
       this.Index2 = original.Index2;
     }
-    public Swap2Move(int index1, int index2, PackingSequenceEncoding PackingSequence)
-      : base(PackingSequence) {
+    public Swap2Move(int index1, int index2, Permutation packingSequence)
+      : base(packingSequence) {
       Index1 = index1;
       Index2 = index2;
@@ -55 +55 @@
     }
 
-    public override IPackingSolutionEncoding GetSolutionAfterMove() {
-      PackingSequenceEncoding newSolution = new PackingSequenceEncoding();
-      newSolution.PackingSequence = (Permutation)PackingSequence.PackingSequence.Clone(new Cloner());
-      newSolution.PackingSequence[Index1] = PackingSequence.PackingSequence[Index2];
-      newSolution.PackingSequence[Index2] = PackingSequence.PackingSequence[Index1];
+    public override Permutation GetSolutionAfterMove() {
+      Permutation newSolution = (Permutation)PackingSequence.Clone(new Cloner());
+      newSolution[Index1] = PackingSequence[Index2];
+      newSolution[Index2] = PackingSequence[Index1];
       return newSolution;
     }
@@ -68 +67 @@
 
     public override SequenceMoveAttribute GetAttribute(double quality) {
-      return new Swap2MoveAttribute(Index1, Index2, PackingSequence.PackingSequence[Index1], PackingSequence.PackingSequence[Index2], quality);
+      return new Swap2MoveAttribute(Index1, Index2, PackingSequence[Index1], PackingSequence[Index2], quality);
     }