Performance - Base Convert & Permutation

graphita · Feb 17, 2023 · f2f2d47 · f2f2d47
1 parent e42f210
commit f2f2d47
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 28 deletions.
diff --git a/src/BaseConvert.php b/src/BaseConvert.php
@@ -157,10 +157,7 @@ public function getDestinationCharactersMap(): array
  */
  private function getDigit(int|string $character, array $characters = []): false|int|string|null
  {
- if (count($characters)) {
- return array_search($character, $characters) ?? null;
- }
- return $character;
+ return array_search($character, $characters) ?? $character;
  }
 
  /**
@@ -170,10 +167,7 @@ private function getDigit(int|string $character, array $characters = []): false|
  */
  private function getCharacter(int $digit, array $characters = []): mixed
  {
- if (count($characters)) {
- return $characters[$digit] ?? null;
- }
- return $digit;
+ return $characters[$digit] ?? $digit;
  }
 
  /**
@@ -227,21 +221,16 @@ public function calculate(): static
  }
 
  $resultArray = [];
- while ($sourceNumber >= $this->getDestinationBase()) {
- $resultDigit = $sourceNumber % $this->getDestinationBase();
- if (count($this->getDestinationCharactersMap())) {
- $resultDigit = $this->getCharacter($resultDigit, $this->getDestinationCharactersMap());
- }
- $resultArray[] = $resultDigit;
-
- $sourceNumber = floor($sourceNumber / $this->getDestinationBase());
+ $destinationBase = $this->getDestinationBase();
+ while ($sourceNumber >= $destinationBase) {
+ $resultArray[] = $this->getCharacter($sourceNumber % $destinationBase, $this->getDestinationCharactersMap());
+ $sourceNumber = floor($sourceNumber / $destinationBase);
  }
  $resultArray[] = $this->getCharacter($sourceNumber, $this->getDestinationCharactersMap());
 
- if ($this->getMinDigits()) {
- while (count($resultArray) < $this->getMinDigits()) {
- $resultArray[] = $this->getCharacter(0, $this->getDestinationCharactersMap());
- }
+ if ($this->getMinDigits() && count($resultArray) < $this->getMinDigits() ) {
+ $prefixArray = array_fill(0, $this->getMinDigits() - count($resultArray), $this->getCharacter(0, $this->getDestinationCharactersMap()));
+ $resultArray = array_merge($resultArray, $prefixArray);
  }
 
  $this->resultArray = array_reverse($resultArray);

diff --git a/src/Permutation.php b/src/Permutation.php
@@ -119,16 +119,16 @@ public function calculate(): static
  $this->possibilities = [];
  if ($this->countItems()) {
  $totalPossibilities = pow($this->countItems(), $this->getSelection());
+ $baseConverter = new BaseConvert();
+ $baseConverter->to($this->countItems())->setMinDigits($this->getSelection())->toCharacters($this->getItems());
  for ($possibilityId = 0; $possibilityId < $totalPossibilities; $possibilityId++) {
- $itemIndexes = BaseConvert::convert($possibilityId)->to($this->countItems())->setMinDigits($this->getSelection())->calculate()->getResultArray();
- if (!$this->canRepetitions() && count($itemIndexes) !== count(array_unique($itemIndexes))) {
- continue;
+ if (!$this->canRepetitions()) {
+ $possibilityArray = $baseConverter->from($possibilityId)->calculate()->getResultArray();
+ if( count($possibilityArray) != count(array_unique($possibilityArray)) ){
+ continue;
+ }
  }
- $possibility = [];
- foreach ($itemIndexes as $itemIndex) {
- $possibility[] = $this->getItem($itemIndex);
- }
- $this->possibilities[] = $possibility;
+ $this->possibilities[] = $baseConverter->from($possibilityId)->calculate()->getResult();
  }
  }
  return $this;