Fix logic bug meaning some flipped rects were placed overlapping the …

…edge of the bin.
neekfenwick · Nov 1, 2022 · 43887e0 · 43887e0
1 parent f0291f9
commit 43887e0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/src/Algorithms/BestAreaFit.php b/src/Algorithms/BestAreaFit.php
@@ -36,9 +36,9 @@ public static function findNewPosition(
                 }
             }
 
-            if ($rectangle->getAllowFlip() == FlipType::ForceFlip ||
-                ($bin->isFlipAllowed() && $rectangle->getWidth() > $rectangle->getHeight())) {
-
+            $tryFlip = $rectangle->getAllowFlip() == FlipType::ForceFlip ||
+                ($bin->isFlipAllowed() && $rectangle->getWidth() > $rectangle->getHeight());
+            if ($tryFlip && ($freeRect->getWidth() >= $rectangle->getHeight() && $freeRect->getHeight() >= $rectangle->getWidth())) {
                 $leftoverHoriz = abs($freeRect->getWidth() - $rectangle->getHeight());
                 $leftoverVert = abs($freeRect->getHeight() - $rectangle->getWidth());
                 $shortSideFit = min($leftoverHoriz, $leftoverVert);

diff --git a/src/Algorithms/BestLongSideFit.php b/src/Algorithms/BestLongSideFit.php
@@ -35,8 +35,9 @@ public static function findNewPosition(
                 }
             }
 
-            if ($rectangle->getAllowFlip() == FlipType::ForceFlip ||
-                ($bin->isFlipAllowed() && $rectangle->getWidth() > $rectangle->getHeight())) {
+            $tryFlip = $rectangle->getAllowFlip() == FlipType::ForceFlip ||
+                ($bin->isFlipAllowed() && $rectangle->getWidth() > $rectangle->getHeight());
+            if ($tryFlip && ($freeRect->getWidth() >= $rectangle->getHeight() && $freeRect->getHeight() >= $rectangle->getWidth())) {
                 $leftoverHoriz = abs($freeRect->getWidth() - $rectangle->getHeight());
                 $leftoverVert = abs($freeRect->getHeight() - $rectangle->getWidth());
                 $shortSideFit = min($leftoverHoriz, $leftoverVert);

diff --git a/src/Algorithms/BestShortSideFit.php b/src/Algorithms/BestShortSideFit.php
@@ -35,8 +35,9 @@ public static function findNewPosition(
                 }
             }
 
-            if ($rectangle->getAllowFlip() == FlipType::ForceFlip ||
-                ($bin->isFlipAllowed() && $rectangle->getWidth() > $rectangle->getHeight())) {
+            $tryFlip = $rectangle->getAllowFlip() == FlipType::ForceFlip ||
+                ($bin->isFlipAllowed() && $rectangle->getWidth() > $rectangle->getHeight());
+            if ($tryFlip && ($freeRect->getWidth() >= $rectangle->getHeight() && $freeRect->getHeight() >= $rectangle->getWidth())) {
                 $leftoverHoriz = abs($freeRect->getWidth() - $rectangle->getHeight());
                 $leftoverVert = abs($freeRect->getHeight() - $rectangle->getWidth());
                 $shortSideFit = min($leftoverHoriz, $leftoverVert);
@@ -47,7 +48,7 @@ public static function findNewPosition(
                     $bestNode->setX($freeRect->getX());
                     $bestNode->setY($freeRect->getY());
                     $bestNode->rotate();
-                             
+
                     $bestShortSideFit = $shortSideFit;
                     $bestLongSideFit = $longSideFit;
                 }

diff --git a/src/Algorithms/BottomLeft.php b/src/Algorithms/BottomLeft.php
@@ -30,8 +30,9 @@ public static function findNewPosition(
                 }
             }
 
-            if ($rectangle->getAllowFlip() == FlipType::ForceFlip ||
-                ($bin->isFlipAllowed() && $rectangle->getWidth() > $rectangle->getHeight())) {
+            $tryFlip = $rectangle->getAllowFlip() == FlipType::ForceFlip ||
+                ($bin->isFlipAllowed() && $rectangle->getWidth() > $rectangle->getHeight());
+            if ($tryFlip && ($freeRect->getWidth() >= $rectangle->getHeight() && $freeRect->getHeight() >= $rectangle->getWidth())) {
                 $topSideY = $freeRect->getY() + $rectangle->getWidth();
                 if ($topSideY < $bestY || ($topSideY == $bestY && $freeRect->getX() < $bestX)) {
                     $bestNode = RectangleFactory::fromRectangle($rectangle);