Changeset 9440 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Dimensions

Timestamp:

05/04/13 17:51:14 (11 years ago)

Author:

jhelm

Message:

#1966: Implemented new encoding (MultiComponentVector/MCV); Implemented move-operators for MCV and GV encodings; Implemented new decoding-methods for PS, GV and MCV encodings (ExtremePoint-based packing);

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Dimensions

Files:

• PackingDimensions.cs (modified) (3 diffs)
• ThreeDimensionalPacking.cs (modified) (2 diffs)
• TwoDimensionalPacking.cs (modified) (2 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Dimensions/PackingDimensions.cs

@@ -37 +37 @@
     /// </summary>
     public Int32 AssignedBin { get; set; }
+    /// <summary>
+    /// Determins if the positioned item is to be rotate by 90 degrees or not.
+    /// </summary>
+    public Boolean Rotated { get; set; }
 
     [StorableConstructor]
@@ -43 +47 @@
       : base(original, cloner) {
         AssignedBin = original.AssignedBin;
+        Rotated = original.Rotated;
     }
 
-    public PackingDimensions(Int32 assignedBin) {
+    public PackingDimensions(Int32 assignedBin, Boolean rotated) {
       this.AssignedBin = assignedBin;
+      this.Rotated = rotated;
     }
 
@@ -52 +58 @@
       StringBuilder sb = new StringBuilder();
       sb.Append("[");
-      sb.Append("AssignedBin: ");
-      sb.Append(AssignedBin);
+      sb.Append(AssignedBin + "-");
+      sb.Append(Rotated);
       sb.Append("]");
       return sb.ToString();
     }
+
+    public override bool Equals(object obj) {
+      var pd = obj as PackingDimensions;
+      if (pd != null)
+        return (pd.AssignedBin == this.AssignedBin && pd.Rotated == this.Rotated);
+      else return false;
+    }
+
+    public override int GetHashCode() {
+      return 31 * AssignedBin * (Rotated ? 3 : 7);
+    }
   }
 }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Dimensions/ThreeDimensionalPacking.cs

@@ -49 +49 @@
     }
 
-    public ThreeDimensionalPacking(int assignedBin, int x, int y, int z) : base(assignedBin) {
+    public ThreeDimensionalPacking(int assignedBin, int x, int y, int z) : this(assignedBin, x, y, z, false) {}
+    public ThreeDimensionalPacking(int assignedBin, int x, int y, int z, bool rotated)
+      : base(assignedBin, rotated) {
       this.X = x;
       this.Y = y;
@@ -67 +69 @@
       return sb.ToString();
     }
+
+
+    public override bool Equals(object obj) {
+      var tdp = obj as ThreeDimensionalPacking;
+      if (tdp != null)
+        return (tdp.X == this.X && tdp.Y == this.Y && tdp.Z == this.Z);
+      else return false;
+    }
+
+    public override int GetHashCode() {
+      return base.GetHashCode() + 13 * X + 17 * Y + 23 * Z;
+    }
   }
 }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Dimensions/TwoDimensionalPacking.cs

@@ -45 +45 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       return new TwoDimensionalPacking(this, cloner);
-    }   
+    }
 
-    public TwoDimensionalPacking(int assignedBin, int x, int y) : base(assignedBin) {
+    public TwoDimensionalPacking(int assignedBin, int x, int y) : this(assignedBin, x, y, false) { }
+    public TwoDimensionalPacking(int assignedBin, int x, int y, bool rotated)
+      : base(assignedBin, rotated) {
       this.X = x;
       this.Y = y;
@@ -63 +65 @@
       return sb.ToString();
     }
+
+
+    public override bool Equals(object obj) {
+      var tdp = obj as TwoDimensionalPacking;
+      if (tdp != null)
+        return (tdp.X == this.X && tdp.Y == this.Y);
+      else return false;
+    }
+
+    public override int GetHashCode() {
+      return base.GetHashCode() + 13 * X + 17 * Y;
+    }
   }
 }