Remove premature optimisation that limits depths of each layer to tha…

…t of the first packed item (fixes #13)
dvdoug · Aug 10, 2014 · 569c0a6 · 569c0a6
1 parent 0c97ff6
commit 569c0a6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Packer.php b/Packer.php
@@ -250,7 +250,7 @@ public function packIntoBox(Box $aBox, ItemList $aItems) {
 
  $itemToPack = $aItems->top();
 
- if ($itemToPack->getDepth() > ($layerDepth ?: $remainingDepth) || $itemToPack->getWeight() > $remainingWeight) {
+ if ($itemToPack->getDepth() > $remainingDepth || $itemToPack->getWeight() > $remainingWeight) {
  break;
  }
 

diff --git a/tests/PackerTest.php b/tests/PackerTest.php
@@ -350,6 +350,18 @@ public function testIssue9() {
  self::assertEquals(1, $packedBoxes->count());
  }
 
+ public function testIssue13() {
+ $packer = new Packer();
+ $packer->addBox(new TestBox('Le petite box', 12, 12, 12, 10, 10, 10, 10, 1000));
+
+ $packer->addItem(new TestItem('Item 1', 5, 3, 2, 2));
+ $packer->addItem(new TestItem('Item 2', 5, 3, 2, 2));
+ $packer->addItem(new TestItem('Item 3', 3, 3, 3, 3));
+ $packedBoxes = $packer->pack();
+
+ self::assertEquals(1, $packedBoxes->count());
+ }
+
 
  /**
  * @dataProvider getSamples