dvdoug / BoxPacker

BoxList.php

Braces +2 added lines, -4 removed lines

@@ -20,11 +20,9 @@
     public function compare($aBoxA, $aBoxB) {
       if ($aBoxB->getInnerVolume() > $aBoxA->getInnerVolume()) {
         return 1;
-      }
-      else if ($aBoxB->getInnerVolume() < $aBoxA->getInnerVolume()) {
+      } else if ($aBoxB->getInnerVolume() < $aBoxA->getInnerVolume()) {
         return -1;
-      }
-      else {
+      } else {
         return 0;
       }
     }

PackedBoxList.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
         $boxVolume += $box->getBox()->getInnerVolume();
 
         /** @var Item $item */
-        foreach (clone $box->getItems() as $item ) {
+        foreach (clone $box->getItems() as $item) {
           $itemVolume += $item->getVolume();
         }
       }

Packer.php

Spacing +23 added lines, -23 removed lines

@@ -144,7 +144,7 @@ 
         //Find best box of iteration, and remove packed items from unpacked list
         $bestBox = $packedBoxesIteration->top();
         $unPackedItems = $this->items->asArray();
-        foreach(clone $bestBox->getItems() as $packedItem) {
+        foreach (clone $bestBox->getItems() as $packedItem) {
           foreach ($unPackedItems as $unpackedKey => $unpackedItem) {
             if ($packedItem === $unpackedItem) {
               unset($unPackedItems[$unpackedKey]);
@@ -173,7 +173,7 @@ 
     public function redistributeWeight(PackedBoxList $aPackedBoxes) {
 
       $targetWeight = $aPackedBoxes->getMeanWeight();
-      $this->logger->log(LogLevel::DEBUG,  "repacking for weight distribution, weight variance {$aPackedBoxes->getWeightVariance()}, target weight {$targetWeight}");
+      $this->logger->log(LogLevel::DEBUG, "repacking for weight distribution, weight variance {$aPackedBoxes->getWeightVariance()}, target weight {$targetWeight}");
 
       $packedBoxes = new PackedBoxList;
 
@@ -194,19 +194,19 @@ 
 
       do { //Keep moving items from most overweight box to most underweight box
         $tryRepack = false;
-        $this->logger->log(LogLevel::DEBUG,  'boxes under/over target: ' . count($underWeightBoxes) . '/' . count($overWeightBoxes));
+        $this->logger->log(LogLevel::DEBUG, 'boxes under/over target: ' . count($underWeightBoxes) . '/' . count($overWeightBoxes));
 
         foreach ($underWeightBoxes as $u => $underWeightBox) {
-          $this->logger->log(LogLevel::DEBUG,  'Underweight Box ' . $u);
+          $this->logger->log(LogLevel::DEBUG, 'Underweight Box ' . $u);
           foreach ($overWeightBoxes as $o => $overWeightBox) {
-            $this->logger->log(LogLevel::DEBUG,  'Overweight Box ' . $o);
+            $this->logger->log(LogLevel::DEBUG, 'Overweight Box ' . $o);
             $overWeightBoxItems = $overWeightBox->getItems()->asArray();
 
             //For each item in the heavier box, try and move it to the lighter one
             foreach ($overWeightBoxItems as $oi => $overWeightBoxItem) {
-              $this->logger->log(LogLevel::DEBUG,  'Overweight Item ' . $oi);
+              $this->logger->log(LogLevel::DEBUG, 'Overweight Item ' . $oi);
               if ($underWeightBox->getWeight() + $overWeightBoxItem->getWeight() > $targetWeight) {
-                $this->logger->log(LogLevel::DEBUG,  'Skipping item for hindering weight distribution');
+                $this->logger->log(LogLevel::DEBUG, 'Skipping item for hindering weight distribution');
                 continue; //skip if moving this item would hinder rather than help weight distribution
               }
 
@@ -216,21 +216,21 @@ 
               $newLighterBoxPacker = new Packer(); //we may need a bigger box
               $newLighterBoxPacker->setBoxes($this->boxes);
               $newLighterBoxPacker->setItems($newItemsForLighterBox);
-              $this->logger->log(LogLevel::INFO,  "[ATTEMPTING TO PACK LIGHTER BOX]");
+              $this->logger->log(LogLevel::INFO, "[ATTEMPTING TO PACK LIGHTER BOX]");
               $newLighterBox = $newLighterBoxPacker->doVolumePacking()->extract();
 
               if ($newLighterBox->getItems()->count() === $newItemsForLighterBox->count()) { //new item fits
-                $this->logger->log(LogLevel::DEBUG,  'New item fits');
+                $this->logger->log(LogLevel::DEBUG, 'New item fits');
                 unset($overWeightBoxItems[$oi]); //now packed in different box
 
                 $newHeavierBoxPacker = new Packer(); //we may be able to use a smaller box
                 $newHeavierBoxPacker->setBoxes($this->boxes);
                 $newHeavierBoxPacker->setItems($overWeightBoxItems);
 
-                $this->logger->log(LogLevel::INFO,  "[ATTEMPTING TO PACK HEAVIER BOX]");
+                $this->logger->log(LogLevel::INFO, "[ATTEMPTING TO PACK HEAVIER BOX]");
                 $newHeavierBoxes = $newHeavierBoxPacker->doVolumePacking();
                 if (count($newHeavierBoxes) > 1) { //found an edge case in packing algorithm that *increased* box count
-                  $this->logger->log(LogLevel::INFO,  "[REDISTRIBUTING WEIGHT] Abandoning redistribution, because new packing is less efficient than original");
+                  $this->logger->log(LogLevel::INFO, "[REDISTRIBUTING WEIGHT] Abandoning redistribution, because new packing is less efficient than original");
                   return $aPackedBoxes;
                 }
 
@@ -262,7 +262,7 @@ 
      * @return PackedBox packed box
      */
     public function packIntoBox(Box $aBox, ItemList $aItems) {
-      $this->logger->log(LogLevel::DEBUG,  "[EVALUATING BOX] {$aBox->getReference()}");
+      $this->logger->log(LogLevel::DEBUG, "[EVALUATING BOX] {$aBox->getReference()}");
 
       $packedItems = new ItemList;
       $remainingDepth = $aBox->getInnerDepth();
@@ -271,7 +271,7 @@ 
       $remainingLength = $aBox->getInnerLength();
 
       $layerWidth = $layerLength = $layerDepth = 0;
-      while(!$aItems->isEmpty()) {
+      while (!$aItems->isEmpty()) {
 
         $itemToPack = $aItems->top();
 
@@ -280,9 +280,9 @@ 
           continue;
         }
 
-        $this->logger->log(LogLevel::DEBUG,  "evaluating item {$itemToPack->getDescription()}");
-        $this->logger->log(LogLevel::DEBUG,  "remaining width: {$remainingWidth}, length: {$remainingLength}, depth: {$remainingDepth}");
-        $this->logger->log(LogLevel::DEBUG,  "layerWidth: {$layerWidth}, layerLength: {$layerLength}, layerDepth: {$layerDepth}");
+        $this->logger->log(LogLevel::DEBUG, "evaluating item {$itemToPack->getDescription()}");
+        $this->logger->log(LogLevel::DEBUG, "remaining width: {$remainingWidth}, length: {$remainingLength}, depth: {$remainingDepth}");
+        $this->logger->log(LogLevel::DEBUG, "layerWidth: {$layerWidth}, layerLength: {$layerLength}, layerDepth: {$layerDepth}");
 
         $itemWidth = $itemToPack->getWidth();
         $itemLength = $itemToPack->getLength();
@@ -298,13 +298,13 @@ 
           if ($fitsRotatedGap < 0 ||
               ($fitsSameGap >= 0 && $fitsSameGap <= $fitsRotatedGap) ||
               ($itemWidth <= $remainingWidth && !$aItems->isEmpty() && $aItems->top() == $itemToPack && $remainingLength >= 2 * $itemLength)) {
-            $this->logger->log(LogLevel::DEBUG,  "fits (better) unrotated");
+            $this->logger->log(LogLevel::DEBUG, "fits (better) unrotated");
             $remainingLength -= $itemLength;
             $layerLength += $itemLength;
             $layerWidth = max($itemWidth, $layerWidth);
           }
           else {
-            $this->logger->log(LogLevel::DEBUG,  "fits (better) rotated");
+            $this->logger->log(LogLevel::DEBUG, "fits (better) rotated");
             $remainingLength -= $itemWidth;
             $layerLength += $itemWidth;
             $layerWidth = max($itemLength, $layerWidth);
@@ -313,7 +313,7 @@ 
 
           //allow items to be stacked in place within the same footprint up to current layerdepth
           $maxStackDepth = $layerDepth - $itemToPack->getDepth();
-          while(!$aItems->isEmpty()) {
+          while (!$aItems->isEmpty()) {
             $potentialStackItem = $aItems->top();
             if ($potentialStackItem->getDepth() <= $maxStackDepth &&
                 $potentialStackItem->getWeight() <= $remainingWeight &&
@@ -330,7 +330,7 @@ 
         }
         else {
           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");
+            $this->logger->log(LogLevel::DEBUG, "No more fit in lengthwise, resetting for new row");
             $remainingLength += $layerLength;
             $remainingWidth -= $layerWidth;
             $layerWidth = $layerLength = 0;
@@ -338,7 +338,7 @@ 
           }
 
           if ($remainingLength < min($itemWidth, $itemLength) || $layerDepth == 0) {
-            $this->logger->log(LogLevel::DEBUG,  "doesn't fit on layer even when empty");
+            $this->logger->log(LogLevel::DEBUG, "doesn't fit on layer even when empty");
             $aItems->extract();
             continue;
           }
@@ -348,10 +348,10 @@ 
           $remainingDepth -= $layerDepth;
 
           $layerWidth = $layerLength = $layerDepth = 0;
-          $this->logger->log(LogLevel::DEBUG,  "doesn't fit, so starting next vertical layer");
+          $this->logger->log(LogLevel::DEBUG, "doesn't fit, so starting next vertical layer");
         }
       }
-      $this->logger->log(LogLevel::DEBUG,  "done with this box");
+      $this->logger->log(LogLevel::DEBUG, "done with this box");
       return new PackedBox($aBox, $packedItems, $remainingWidth, $remainingLength, $remainingDepth, $remainingWeight);
     }
 

Braces +7 added lines, -14 removed lines

@@ -60,14 +60,12 @@ 
     public function setItems($aItems) {
       if ($aItems instanceof ItemList) {
         $this->items = clone $aItems;
-      }
-      else if (is_array($aItems)) {
+      } else if (is_array($aItems)) {
         $this->items = new ItemList();
         foreach ($aItems as $item) {
           $this->items->insert($item);
         }
-      }
-      else {
+      } else {
         throw new \RuntimeException('Not a valid list of items');
       }
     }
@@ -183,11 +181,9 @@ 
         $boxWeight = $packedBox->getWeight();
         if ($boxWeight > $targetWeight) {
           $overWeightBoxes[] = $packedBox;
-        }
-        else if ($boxWeight < $targetWeight) {
+        } else if ($boxWeight < $targetWeight) {
           $underWeightBoxes[] = $packedBox;
-        }
-        else {
+        } else {
           $packedBoxes->insert($packedBox); //target weight, so we'll keep these
         }
       }
@@ -302,8 +298,7 @@ 
             $remainingLength -= $itemLength;
             $layerLength += $itemLength;
             $layerWidth = max($itemWidth, $layerWidth);
-          }
-          else {
+          } else {
             $this->logger->log(LogLevel::DEBUG,  "fits (better) rotated");
             $remainingLength -= $itemWidth;
             $layerLength += $itemWidth;
@@ -322,13 +317,11 @@ 
               $remainingWeight -= $potentialStackItem->getWeight();
               $maxStackDepth -= $potentialStackItem->getDepth();
               $packedItems->insert($aItems->extract());
-            }
-            else {
+            } else {
               break;
             }
           }
-        }
-        else {
+        } else {
           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;

ItemList.php

Braces +2 added lines, -4 removed lines

@@ -20,11 +20,9 @@
     public function compare($aItemA, $aItemB) {
       if ($aItemA->getVolume() > $aItemB->getVolume()) {
         return 1;
-      }
-      else if ($aItemA->getVolume() < $aItemB->getVolume()) {
+      } else if ($aItemA->getVolume() < $aItemB->getVolume()) {
         return -1;
-      }
-      else {
+      } else {
         return 0;
       }
     }