Don't infinite loop - that's bad (fixes #14)

dvdoug · Aug 13, 2014 · 8417542 · 8417542
1 parent 1d86816
commit 8417542
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Packer.php b/Packer.php
@@ -303,7 +303,7 @@ public function packIntoBox(Box $aBox, ItemList $aItems) {
  }
  }
  else {
- if ($remainingWidth >= min($itemWidth, $itemLength) && $layerDepth > 0) {
+ if ($remainingWidth >= min($itemWidth, $itemLength) && $layerDepth > 0 && $layerWidth > 0 && $layerLength > 0) {
  $this->logger->log(LogLevel::DEBUG, "No more fit in lengthwise, resetting for new row");
  $remainingLength += $layerLength;
  $remainingWidth -= $layerWidth;

diff --git a/tests/PackerTest.php b/tests/PackerTest.php
@@ -373,6 +373,18 @@ public function testIssue13() {
  self::assertEquals(1, $packedBoxes->count());
  }
 
+ public function testIssue14() {
+ $packer = new Packer();
+ $packer->addBox(new TestBox('29x1x23Box', 29, 1, 23, 0, 29, 1, 23, 100));
+ $packer->addItem(new TestItem('13x1x10Item', 13, 1, 10, 1));
+ $packer->addItem(new TestItem('9x1x6Item', 9, 1, 6, 1));
+ $packer->addItem(new TestItem('9x1x6Item', 9, 1, 6, 1));
+ $packer->addItem(new TestItem('9x1x6Item', 9, 1, 6, 1));
+ $packedBoxes = $packer->pack();
+
+ self::assertEquals(1, $packedBoxes->count());
+ }
+
 
  /**
  * @dataProvider getSamples