Changeset 14128 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/Insertion/InsertionMove.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/Insertion/InsertionMove.cs (modified) (7 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/Insertion/InsertionMove.cs

@@ -32 +32 @@
   [Item("Insertion Move", "A move on a Sequence vector that is specified by two group-assignment-indexes.")]
   [StorableClass]
-  public class InsertionMove : SequenceMove, IPackingMove {
+  public class InsertionMove : SequenceMove {
     [Storable]
     public int Index1 { get; protected set; }
@@ -45 +45 @@
       this.Index2 = original.Index2;
     }
-    public InsertionMove(int index1, int index2, PackingSequenceEncoding PackingSequence)
-      : base(PackingSequence) {
+    public InsertionMove(int index1, int index2, Permutation packingSequence)
+      : base(packingSequence) {
       Index1 = index1;
       Index2 = index2;
@@ -55 +55 @@
     }
 
-    public override IPackingSolutionEncoding GetSolutionAfterMove() {
-      PackingSequenceEncoding newSolution = new PackingSequenceEncoding();
-
-      Permutation original = PackingSequence.PackingSequence;
-      Permutation resultingPermutation = (Permutation)PackingSequence.PackingSequence.Clone();
+    public override Permutation GetSolutionAfterMove() {
+      Permutation original = PackingSequence;
+      Permutation resultingPermutation = (Permutation)PackingSequence.Clone();
       int cutIndex, insertIndex, number;
 
@@ -68 +66 @@
       int i = 0;  // index in new permutation
       int j = 0;  // index in old permutation
-      while (i < PackingSequence.PackingSequence.Length) {
+      while (i < PackingSequence.Length) {
         if (j == cutIndex) {
           j++;
@@ -83 +81 @@
       }
 
-      newSolution.PackingSequence = resultingPermutation;
-      return newSolution;
+      return resultingPermutation;
     }
 
@@ -92 +89 @@
 
     public override SequenceMoveAttribute GetAttribute(double quality) {
-      return new InsertionMoveAttribute(Index1, Index2, PackingSequence.PackingSequence[Index1], PackingSequence.PackingSequence[Index2], quality);
+      return new InsertionMoveAttribute(Index1, Index2, PackingSequence[Index1], PackingSequence[Index2], quality);
     }
 
@@ -103 +100 @@
         } else
           if (Index1 == attr.Index1 && Index2 == attr.Index2)
-          return true;
+            return true;
       }
       return false;