Merge pull request #47 from zumba/optimization

Optimized conversion to bitmask
zumba · Apr 3, 2024 · 229a424 · 229a424
2 parents 76e11b1 + 8ac60a9
commit 229a424
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/Map.php b/src/Map.php
@@ -221,12 +221,17 @@ protected function reduceToBitmask($list)
     {
         $this->logger->debug('Swivel - reducing to bitmask.', compact('list'));
 
-        return !is_array($list) ? $list : array_reduce($list, function ($mask, $index) {
-            if ((int)$index == 0) {
-                return $mask;
+        if (!is_array($list)) {
+            return $list;
+        }
+
+        $mask = 0;
+        foreach ($list as $value) {
+            if ($value > 0) {
+                $mask |= (1 << ((int)$value - 1));
             }
-            return $mask | (1 << ($index - 1));
-        }, 0);
+        }
+        return $mask;
     }
 
     /**

diff --git a/test/Tests/MapTest.php b/test/Tests/MapTest.php
@@ -134,6 +134,10 @@ public function parseProvider()
                 ['a' => [6, 7], 'a.b' => [7]],
                 ['a' => Bucket::SIXTH | Bucket::SEVENTH, 'a.b' => Bucket::SEVENTH],
             ],
+            [
+                ['a' => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]],
+                ['a' => Bucket::ALL],
+            ],
             [
                 ['a' => Bucket::FIRST],
                 ['a' => Bucket::FIRST],