Take the idea from #198, but don't duplicate the method

dvdoug · Apr 18, 2020 · cdd458b · cdd458b
1 parent 40661ee
commit cdd458b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/Packer.php b/src/Packer.php
@@ -162,7 +162,7 @@ public function pack(): PackedBoxList
      *
      * @throws NoBoxesAvailableException
      */
-    public function doVolumePacking(bool $singlePassMode = false): PackedBoxList
+    public function doVolumePacking(bool $singlePassMode = false, bool $enforceSingleBox = false): PackedBoxList
     {
         $packedBoxes = new PackedBoxList();
 
@@ -171,7 +171,7 @@ public function doVolumePacking(bool $singlePassMode = false): PackedBoxList
             $packedBoxesIteration = [];
 
             //Loop through boxes starting with smallest, see what happens
-            foreach ($this->getBoxList() as $box) {
+            foreach ($this->getBoxList($enforceSingleBox) as $box) {
                 if ($this->boxesQtyAvailable[$box] > 0) {
                     $volumePacker = new VolumePacker($box, $this->items);
                     $volumePacker->setLogger($this->logger);
@@ -188,8 +188,15 @@ public function doVolumePacking(bool $singlePassMode = false): PackedBoxList
                 }
             }
 
-            //Find best box of iteration, and remove packed items from unpacked list
-            $bestBox = $this->findBestBoxFromIteration($packedBoxesIteration);
+            try {
+                //Find best box of iteration, and remove packed items from unpacked list
+                $bestBox = $this->findBestBoxFromIteration($packedBoxesIteration);
+            } catch (NoBoxesAvailableException $e) {
+                if ($enforceSingleBox) {
+                    return new PackedBoxList();
+                }
+                throw $e;
+            }
 
             /** @var PackedItem $packedItem */
             foreach ($bestBox->getItems() as $packedItem) {
@@ -208,7 +215,7 @@ public function doVolumePacking(bool $singlePassMode = false): PackedBoxList
      * so that the smallest boxes are evaluated first, but this means that time is spent on boxes that cannot possibly
      * hold the entire set of items due to volume limitations. These should be evaluated first.
      */
-    protected function getBoxList(): iterable
+    protected function getBoxList(bool $enforceSingleBox = false): iterable
     {
         $itemVolume = 0;
         /** @var Item $item */
@@ -222,7 +229,7 @@ protected function getBoxList(): iterable
         foreach ($this->boxes as $box) {
             if ($box->getInnerWidth() * $box->getInnerLength() * $box->getInnerDepth() >= $itemVolume) {
                 $preferredBoxes[] = $box;
-            } else {
+            } elseif (!$enforceSingleBox) {
                 $otherBoxes[] = $box;
             }
         }

diff --git a/src/WeightRedistributor.php b/src/WeightRedistributor.php
@@ -168,7 +168,7 @@ private function doVolumeRepack(iterable $items, Box $currentBox): PackedBoxList
         $packer->setBoxQuantity($currentBox, max(PHP_INT_MAX, $this->boxesQtyAvailable[$currentBox] + 1));
         $packer->setItems($items);
 
-        return $packer->doVolumePacking(true);
+        return $packer->doVolumePacking(true, true);
     }
 
     /**