Special case same object as a fast way to detect identical dimensions

dvdoug · Jan 30, 2020 · 041630f · 041630f
1 parent f0f88cb
commit 041630f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/OrientatedItemFactory.php b/src/OrientatedItemFactory.php
@@ -162,11 +162,15 @@ public function getPossibleOrientations(
 
  $isSame = false;
  if ($prevItem) {
- $itemADimensions = [$item->getWidth(), $item->getLength(), $item->getDepth()];
- $itemBDimensions = [$prevItem->getWidth(), $prevItem->getLength(), $prevItem->getDepth()];
- sort($itemADimensions);
- sort($itemBDimensions);
- $isSame = ($itemADimensions === $itemBDimensions);
+ if ($item === $prevItem->getItem()) {
+ $isSame = true;
+ } else {
+ $itemADimensions = [$item->getWidth(), $item->getLength(), $item->getDepth()];
+ $itemBDimensions = [$prevItem->getWidth(), $prevItem->getLength(), $prevItem->getDepth()];
+ sort($itemADimensions);
+ sort($itemBDimensions);
+ $isSame = ($itemADimensions === $itemBDimensions);
+ }
  }
 
  //Special case items that are the same as what we just packed - keep orientation

diff --git a/src/VolumePacker.php b/src/VolumePacker.php
@@ -449,6 +449,9 @@ protected function getCurrentPackedDepth()
  */
  protected static function isSameDimensions(Item $itemA, Item $itemB)
  {
+ if ($itemA === $itemB) {
+ return true;
+ }
  $itemADimensions = [$itemA->getWidth(), $itemA->getLength(), $itemA->getDepth()];
  $itemBDimensions = [$itemB->getWidth(), $itemB->getLength(), $itemB->getDepth()];
  sort($itemADimensions);