Changeset 9495 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/Moves/ThreeWay/Attributes/ChangePositionMoveAttribute.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/ChangePositionMoveAttribute.cs (modified) (2 diffs)

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

@@ -29 +29 @@
   public class ChangePositionMoveAttribute : MultiComponentVectorMoveAttribute {
     [Storable]
-    public int Index { get; protected set; }
+    public int AffectedGroup { get; protected set; }
+    [Storable]
+    public int Index { get; protected set; }      
+    [Storable]
+    public int ItemID { get; protected set; }
     [Storable]
     public int TargetIndex { get; protected set; }
-    [Storable]
-    public int ItemIndex { get; protected set; }
 
     [StorableConstructor]
@@ -41 +43 @@
         this.Index = original.Index;
         this.TargetIndex = original.TargetIndex;      
-      this.ItemIndex = original.ItemIndex;
+      this.ItemID = original.ItemID;
     }
-    public ChangePositionMoveAttribute() : this(-1, -1, -1, -1) { }
-    public ChangePositionMoveAttribute(int index, int targetIndex, int itemIndex, double moveQuality)
+    public ChangePositionMoveAttribute() : this(-1, -1, -1, -1, -1) { }
+    public ChangePositionMoveAttribute(int affectedGroup, int index, int itemID, int targetIndex, double moveQuality)
       : base(moveQuality) {
+        AffectedGroup = affectedGroup;
         Index = index;
         TargetIndex = targetIndex;
-        ItemIndex = itemIndex;
+        ItemID = itemID;
     }