Fix issue #30

Thanks to @IBBoard for the tests and the report
dvdoug · Oct 10, 2015 · c263b69 · c263b69
1 parent 12c727c
commit c263b69
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 2 deletions.
diff --git a/BoxList.php b/BoxList.php
@@ -18,7 +18,15 @@ class BoxList extends \SplMinHeap {
  * @see \SplMinHeap::compare()
  */
  public function compare($aBoxA, $aBoxB) {
- return $aBoxB->getInnerVolume() - $aBoxA->getInnerVolume();
+ if ($aBoxB->getInnerVolume() > $aBoxA->getInnerVolume()) {
+ return 1;
+ }
+ else if ($aBoxB->getInnerVolume() < $aBoxA->getInnerVolume()) {
+ return -1;
+ }
+ else {
+ return 0;
+ }
  }
 
  }
diff --git a/ItemList.php b/ItemList.php
@@ -18,7 +18,15 @@ class ItemList extends \SplMaxHeap {
  * @see \SplMaxHeap::compare()
  */
  public function compare($aItemA, $aItemB) {
- return $aItemA->getVolume() - $aItemB->getVolume();
+ if ($aItemA->getVolume() > $aItemB->getVolume()) {
+ return 1;
+ }
+ else if ($aItemA->getVolume() < $aItemB->getVolume()) {
+ return -1;
+ }
+ else {
+ return 0;
+ }
  }
 
  /**

diff --git a/tests/BoxListTest.php b/tests/BoxListTest.php
@@ -26,4 +26,43 @@ function testCompare() {
  }
  self::assertEquals(array($box1,$box3,$box2), $sorted);
  }
+
+ function testIssue14A() {
+ $box1 = new TestBox('Small', 21, 21, 3, 1, 20, 20, 2, 100);
+ $box2 = new TestBox('Large', 1301, 1301, 1301, 1, 1300, 1300, 1300, 1000);
+ $box3 = new TestBox('Medium', 101, 101, 11, 5, 100, 100, 10, 500);
+ $list = new BoxList;
+ $list->insert($box1);
+ $list->insert($box2);
+ $list->insert($box3);
+ $sorted = [];
+ while (!$list->isEmpty()) {
+ $sorted[] = $list->extract();
+ }
+ self::assertEquals(array($box1,$box3,$box2), $sorted);
+ }
+
+ function testIssue14B() {
+ $box1 = new TestBox('Small', 21, 21, 3, 1, 20, 20, 2, 100);
+ $box2 = new TestBox('Large', 1301, 1301, 1301, 1, 1300, 1300, 1300, 1000);
+ $box3 = new TestBox('Medium', 101, 101, 11, 5, 100, 100, 10, 500);
+ $list = new BoxList;
+ $list->insert($box3);
+ $list->insert($box2);
+ $list->insert($box1);
+ $sorted = [];
+ while (!$list->isEmpty()) {
+ $sorted[] = $list->extract();
+ }
+ self::assertEquals(array($box1,$box3,$box2), $sorted);
+ $list = new BoxList;
+ $list->insert($box2);
+ $list->insert($box1);
+ $list->insert($box3);
+ $sorted = [];
+ while (!$list->isEmpty()) {
+ $sorted[] = $list->extract();
+ }
+ self::assertEquals(array($box1,$box3,$box2), $sorted);
+ }
  }