Changeset 9495 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/Moves/ThreeWay/Attributes/SwapPositionMoveAttribute.cs

Timestamp:

05/15/13 22:23:36 (11 years ago)

Author:

jhelm

Message:

#1966: Did some major refactoring in Decoder-classes; Added MoveEvaluator classes for different encodings and dimensions; Added new crossover-class for MCV encoding;

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/Moves/ThreeWay/Attributes/SwapPositionMoveAttribute.cs (modified) (2 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/Moves/ThreeWay/Attributes/SwapPositionMoveAttribute.cs

@@ -29 +29 @@
   public class SwapPositionMoveAttribute : MultiComponentVectorMoveAttribute {
     [Storable]
+    public int AffectedGroup { get; protected set; }
+    [Storable]
     public int Index1 { get; protected set; }
     [Storable]
     public int Index2 { get; protected set; }
     [Storable]
-    public int ItemIndex1 { get; protected set; }
+    public int ItemID1 { get; protected set; }
     [Storable]
-    public int ItemIndex2 { get; protected set; }
+    public int ItemID2 { get; protected set; }
 
     [StorableConstructor]
@@ -41 +43 @@
     protected SwapPositionMoveAttribute(SwapPositionMoveAttribute original, Cloner cloner)
       : base(original, cloner) {
+        this.AffectedGroup = original.AffectedGroup;
         this.Index1 = original.Index1;
         this.Index2 = original.Index2;
-      this.ItemIndex1 = original.ItemIndex1;
-      this.ItemIndex2 = original.ItemIndex2;
+      this.ItemID1 = original.ItemID1;
+      this.ItemID2 = original.ItemID2;
     }
-    public SwapPositionMoveAttribute() : this(-1, -1, -1, -1, -1) { }
-    public SwapPositionMoveAttribute(int index1, int index2, int itemIndex1, int itemIndex2, double moveQuality)
+    public SwapPositionMoveAttribute() : this(-1, -1, -1, -1, -1, -1) { }
+    public SwapPositionMoveAttribute(int affectedGroup, int index1, int index2, int itemID1, int itemID2, double moveQuality)
       : base(moveQuality) {
+        AffectedGroup = affectedGroup;
         Index1 = index1;
         Index2 = index2;
-        ItemIndex1 = itemIndex1;
-        ItemIndex2 = itemIndex2;
+        ItemID1 = itemID1;
+        ItemID2 = itemID2;
     }