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

Timestamp:

06/09/13 12:58:39 (11 years ago)

Author:

jhelm

Message:

#1966: Bugfixing; Refactoring; Performancetuning;

Location:

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

Files:

• CuboidPackingShape.cs (modified) (3 diffs)
• RectangularPackingShape.cs (modified) (3 diffs)

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

@@ -57 +57 @@
 
     public override bool EnclosesPoint(ThreeDimensionalPacking myPosition, ThreeDimensionalPacking checkedPoint) {
-      var c = new CuboidDiagonal(myPosition, this);
-      return (c.x1 <= checkedPoint.X &&
-                c.x2 >= checkedPoint.X &&
-                c.y1 <= checkedPoint.Y &&
-                c.y2 >= checkedPoint.Y &&
-                c.z1 <= checkedPoint.Z &&
-                c.z2 >= checkedPoint.Z);
+      return (myPosition.X <= checkedPoint.X &&
+                (myPosition.X + (myPosition.Rotated ? Depth : Width) - 1) >= checkedPoint.X &&
+                myPosition.Y <= checkedPoint.Y &&
+                (myPosition.Y + Height - 1) >= checkedPoint.Y &&
+                myPosition.Z <= checkedPoint.Z &&
+                (myPosition.Z + (myPosition.Rotated ? Width : Depth) - 1) >= checkedPoint.Z);
     }
     public override bool Encloses(ThreeDimensionalPacking checkedPosition, PackingShape<ThreeDimensionalPacking> checkedShape) {
@@ -87 +86 @@
     }
     private bool Overlaps(CuboidDiagonal c1, CuboidDiagonal c2) {
-      return !(c1.x1 >= c2.x2 ||
-               c1.y1 >= c2.y2 ||  
-               c1.z1 >= c2.z2 ||
-               c1.x2 <= c2.x1 ||
-               c1.y2 <= c2.y1 ||
-               c1.z2 <= c2.z1);
+      return !(c1.x1 > c2.x2 ||
+               c1.y1 > c2.y2 ||  
+               c1.z1 > c2.z2 ||
+               c1.x2 < c2.x1 ||
+               c1.y2 < c2.y1 ||
+               c1.z2 < c2.z1);
     }
 
@@ -175 +174 @@
         y1 = myPosition.Y;
         z1 = myPosition.Z;
-        x2 = myPosition.X + (myPosition.Rotated ? myShape.Depth : myShape.Width);
-        y2 = myPosition.Y + myShape.Height;
-        z2 = myPosition.Z + (myPosition.Rotated ? myShape.Width : myShape.Depth);
+        x2 = myPosition.X + (myPosition.Rotated ? myShape.Depth : myShape.Width) - 1;
+        y2 = myPosition.Y + myShape.Height - 1;
+        z2 = myPosition.Z + (myPosition.Rotated ? myShape.Width : myShape.Depth) - 1;
       }
     }

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

@@ -52 +52 @@
 
     public override bool EnclosesPoint(TwoDimensionalPacking myPosition, TwoDimensionalPacking checkedPoint) {
-      var r = new RectangleDiagonal(myPosition, this);
-      return (r.x1 <= checkedPoint.X &&
-                r.x2 >= checkedPoint.X &&
-                r.y1 <= checkedPoint.Y &&
-                r.y2 >= checkedPoint.Y);
+      return (myPosition.X <= checkedPoint.X &&
+                (myPosition.X + (myPosition.Rotated ? Height : Width) - 1) >= checkedPoint.X &&
+                myPosition.Y <= checkedPoint.Y &&
+                (myPosition.Y + (myPosition.Rotated ? Width : Height) - 1) >= checkedPoint.Y);
     }
     public override bool Encloses(TwoDimensionalPacking checkedPosition, PackingShape<TwoDimensionalPacking> checkedShape) {
@@ -78 +77 @@
     }
     private bool Overlaps(RectangleDiagonal r1, RectangleDiagonal r2) {
-      return !(r1.x1 >= r2.x2 ||
-               r1.y1 >= r2.y2 ||
-               r1.x2 <= r2.x1 ||
-               r1.y2 <= r2.y1);
+      return !(r1.x1 > r2.x2 ||
+               r1.y1 > r2.y2 ||
+               r1.x2 < r2.x1 ||
+               r1.y2 < r2.y1);
     }
 
@@ -150 +149 @@
         x1 = myPosition.X;
         y1 = myPosition.Y;
-        x2 = myPosition.X + (myPosition.Rotated ? myShape.Height : myShape.Width);
-        y2 = myPosition.Y + (myPosition.Rotated ? myShape.Width : myShape.Height);
+        x2 = myPosition.X + (myPosition.Rotated ? myShape.Height : myShape.Width) - 1;
+        y2 = myPosition.Y + (myPosition.Rotated ? myShape.Width : myShape.Height) - 1;
       }
     }