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

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/Shapes

Files:

• CuboidPackingShape.cs (modified) (2 diffs)
• RectangularPackingShape.cs (modified) (1 diff)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Shapes/CuboidPackingShape.cs

@@ -53 +53 @@
 
     #region Helpers
-    public int MultipliedMeasures { get { return Height * Width * Depth; } }
+    public int MultipliedMeasures { get { return Width * Height * Depth; } }
    
     public override bool Encloses(ThreeDimensionalPacking checkedPosition, PackingShape<ThreeDimensionalPacking> checkedShape) {
@@ -162 +162 @@
         y1 = myPosition.Y;
         z1 = myPosition.Z;
-        x2 = myPosition.X + myShape.Width;
+        x2 = myPosition.X + (myPosition.Rotated ? myShape.Depth : myShape.Width);
         y2 = myPosition.Y + myShape.Height;
-        z2 = myPosition.Z + myShape.Depth;
+        z2 = myPosition.Z + (myPosition.Rotated ? myShape.Width : myShape.Depth);
       }
     }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Shapes/RectangularPackingShape.cs

@@ -142 +142 @@
         x1 = myPosition.X;
         y1 = myPosition.Y;
-        x2 = myPosition.X + myShape.Width;
-        y2 = myPosition.Y + myShape.Height;
+        x2 = myPosition.X + (myPosition.Rotated ? myShape.Height : myShape.Width);
+        y2 = myPosition.Y + (myPosition.Rotated ? myShape.Width : myShape.Height);
       }
     }