@blackglory/structures 0.10.20 → 0.10.21

package/dist/es2015/index.umd.js

@@ -6222,16 +6222,31 @@
         }
     }
 
+    // http://graphics.stanford.edu/~seander/bithacks.html#ZerosOnRightModLookup
+    const mod37BitPositions = [
+        32, 0, 1, 26, 2, 23, 27, 0, 3, 16,
+        24, 30, 28, 11, 0, 13, 4, 7, 17, 0,
+        25, 22, 31, 15, 29, 10, 12, 6, 0, 21,
+        14, 9, 5, 20, 8, 19, 18
+    ];
+    /**
+     * 该函数在找不到结果时返回32, 与Rust内置函数的表现一致.
+     * https://doc.rust-lang.org/std/primitive.u32.html#method.trailing_zeros
+     */
+    function trailingZeros(value) {
+        return mod37BitPositions[(-value & value) % 37];
+    }
+
     class BitSet {
-        constructor(bitsPerElement = 32) {
+        constructor(bitsPerElement = 31) {
             this.bitsPerElement = bitsPerElement;
             this.array = [];
             this.length = 0;
             this._size = 0;
             es2018Exports$1.assert(Number.isInteger(bitsPerElement), 'The parameter bitsPerElement must be an integer');
             es2018Exports$1.assert(bitsPerElement > 0, 'The parameter bitsPerElement must be greater than 0');
-            // `32`是该数据结构中能够处理的最大值
-            es2018Exports$1.assert(bitsPerElement <= 32, 'The mask of bitsPerElement must be less than or equal to 32');
+            // `31`是该数据结构中能够处理的最大值
+            es2018Exports$1.assert(bitsPerElement <= 31, 'The mask of bitsPerElement must be less than or equal to 31');
         }
         get [Symbol.toStringTag]() {
             return this.constructor.name;
@@ -6244,26 +6259,18 @@
         }
         *values() {
             if (this.length > 0) {
-                const maxArrayLength = Math.ceil(this.length / this.bitsPerElement);
-                const remainder = this.bitsPerElement
-                    - (maxArrayLength * this.bitsPerElement - this.length);
-                const lastIndex = maxArrayLength - 1;
-                for (let index = 0; index < lastIndex; index++) {
+                // maxArrayLength = Math.ceil(this.length / this.bitsPerElement)
+                const maxArrayLength = ~~(this.length / this.bitsPerElement) + 1;
+                for (let index = 0; index < maxArrayLength; index++) {
                     let element = this.array[index];
-                    for (let bit = 0; bit < this.bitsPerElement; bit++) {
-                        if (element & 1) {
-                            yield index * this.bitsPerElement + bit;
-                        }
-                        element >>= 1;
+                    let offset = 0;
+                    let indexOfBit;
+                    while ((indexOfBit = trailingZeros(element)) !== 32) {
+                        yield index * this.bitsPerElement + offset + indexOfBit;
+                        offset += indexOfBit + 1;
+                        element >>= indexOfBit + 1;
                     }
                 }
-                let lastElement = this.array[maxArrayLength - 1];
-                for (let bit = 0; bit < remainder; bit++) {
-                    if (lastElement & 1) {
-                        yield lastIndex * this.bitsPerElement + bit;
-                    }
-                    lastElement >>= 1;
-                }
             }
         }
         _dumpBinaryStrings() {
@@ -6323,6 +6330,7 @@
         }
         // 输入一定是一个小于bitsPerElement的值, 取值范围是[0, bitsPerElement)
         getMask(value) {
+            // return 2 ** value
             return 1 << value;
         }
     }
@@ -6350,14 +6358,16 @@
         }
         *values() {
             if (this.length > 0) {
-                const maxArrayLength = Math.ceil(this.length / this.bitsPerElement);
+                // maxArrayLength = Math.ceil(this.length / this.bitsPerElement)
+                const maxArrayLength = ~~(this.length / this.bitsPerElement) + 1;
                 const remainder = this.bitsPerElement
                     - (maxArrayLength * this.bitsPerElement - this.length);
                 const lastIndex = maxArrayLength - 1;
                 for (let index = 0; index < lastIndex; index++) {
                     let element = this.array.internalTypedArray[index];
                     for (let bit = 0; bit < this.bitsPerElement; bit++) {
-                        if (element & 1) {
+                        // if (isOdd(element)) {
+                        if (element % 2) {
                             yield index * this.bitsPerElement + bit;
                         }
                         element >>= 1;
@@ -6365,7 +6375,8 @@
                 }
                 let lastElement = this.array.internalTypedArray[maxArrayLength - 1];
                 for (let bit = 0; bit < remainder; bit++) {
-                    if (lastElement & 1) {
+                    // if (isOdd(lastElement)) {
+                    if (lastElement % 2) {
                         yield lastIndex * this.bitsPerElement + bit;
                     }
                     lastElement >>= 1;
@@ -6429,6 +6440,7 @@
         }
         // 输入一定是一个小于bitsPerElement的值, 取值范围是[0, bitsPerElement)
         getMask(value) {
+            // return 2 ** value
             return 1 << value;
         }
     }