bool-hybrid-array 9.10.10__py3-none-any.whl → 9.10.11__py3-none-any.whl

bool_hybrid_array/__init__.py

@@ -2,14 +2,15 @@ import sys
 from types import ModuleType
 from . import core
 from .core import __builtins__,builtins
-__version__ = "9.10.10"
+from . import int_array
+__version__ = "9.10.11"
 public_objects = []
 for name in dir(core):
     if not name.startswith("_"):
         obj = getattr(core, name)
         if isinstance(obj, (type, ModuleType)) or callable(obj):
             public_objects.append(name)
-__all__ = public_objects + ["__version__","__builtins__","core","builtins","__dict__"]
+__all__ = public_objects + ["__version__","__builtins__","core","builtins","__dict__","int_array"]
 globals().update({
     name: getattr(core, name)
     for name in public_objects

bool_hybrid_array/__main__.py

@@ -264,4 +264,9 @@ try:numba_opt()
 except:print("请先安装numba库！！！")
 
 
+#int_array模块（9.10.10新增）：
+
+arr = int_array.IntHybridArray([100,-27623,18276,-32165])
+
+
 

bool_hybrid_array/int_array/__init__.py

@@ -1,7 +1,7 @@
-from .bool_hybrid_array import *
+from __future__ import annotations
+from ..core import *
 import builtins
 
-
 class IntBitTag(BHA_Bool, metaclass=ResurrectMeta):
     def __str__(self):
         return "'-1'" if (hasattr(self, 'is_sign_bit') and self.is_sign_bit and self) else "'1'" if self else "'0'"
@@ -37,13 +37,17 @@ class IntHybridArray(BoolHybridArray):
                         carry = 0 if num_bits[j] else 1
             bool_data.append(sign_bit)
             bool_data.extend(num_bits)
-        temp_arr = BoolHybridArr(bool_data, Type=IntBitTag)
-        super().__init__(temp_arr.split_index, temp_arr.size, temp_arr.is_sparse, temp_arr.Type, False)
-        for idx in range(temp_arr.size):
-            self[idx] = temp_arr[idx].value
-        for i in range(0, self.size, self.bit_length):
+        self.total_bits = len(bool_data)
+        super().__init__(0, self.total_bits, False, IntBitTag, False)
+        for idx in range(self.total_bits):
+            if idx < self.size:
+                super().__setitem__(idx, bool_data[idx])
+            else:
+                super().append(bool_data[idx])
+        for i in range(0, self.total_bits, self.bit_length):
             if i < self.size:
-                self[i].is_sign_bit = True
+                bit_tag = super().__getitem__(i)
+                bit_tag.is_sign_bit = True
 
     def to_int(self, bit_chunk):
         sign_bit = bit_chunk[0].value
@@ -72,21 +76,22 @@ class IntHybridArray(BoolHybridArray):
             start, stop, step = key.indices(len(self))
             result = []
             for i in range(start, stop, step):
-                block_idx = i // self.bit_length
-                bit_idx_in_block = i % self.bit_length
-                block_start = block_idx * self.bit_length
+                block_start = i * self.bit_length
                 block_end = block_start + self.bit_length
-                bit_chunk = [self[j] for j in range(block_start, block_end)]
+                if block_end > self.size:
+                    raise IndexError("索引超出范围")
+                bit_chunk = [super().__getitem__(j) for j in range(block_start, block_end)]
                 num = self.to_int(bit_chunk)
                 result.append(num)
             return IntHybridArray(result, self.bit_length)
         key = key if key >= 0 else key + len(self)
         if not (0 <= key < len(self)):
             raise IndexError("索引超出范围")
-        block_idx = key // self.bit_length
-        block_start = block_idx * self.bit_length
+        block_start = key * self.bit_length
         block_end = block_start + self.bit_length
-        bit_chunk = [self[j] for j in range(block_start, block_end)]
+        if block_end > self.size:
+            raise IndexError("索引超出范围")
+        bit_chunk = [super().__getitem__(j) for j in range(block_start, block_end)]
         return self.to_int(bit_chunk)
 
     def __setitem__(self, key, value):
@@ -95,16 +100,36 @@ class IntHybridArray(BoolHybridArray):
             start, stop, step = key.indices(len(self))
             values = list(value) if isinstance(value, (list, tuple, IntHybridArray)) else [value] * ((stop - start + step - 1) // step)
             idx = 0
-            for i in range(start, stop, step):
-                self[i] = values[idx % len(values)]
+            for int_idx in range(start, stop, step):
+                block_start = int_idx * self.bit_length
+                block_end = block_start + self.bit_length
+                if block_end > self.size:
+                    raise IndexError("索引超出范围")
+                num = values[idx % len(values)]
+                if num >= 0:
+                    sign_bit = False
+                    num_bits = [bool((num >> i) & 1) for i in range(self.bit_length - 1)]
+                else:
+                    sign_bit = True
+                    abs_num = abs(num)
+                    num_bits = [not bool((abs_num >> i) & 1) for i in range(self.bit_length - 1)]
+                    carry = 1
+                    for j in range(len(num_bits)):
+                        if carry:
+                            num_bits[j] = not num_bits[j]
+                            carry = 0 if num_bits[j] else 1
+                bool_data = [sign_bit] + num_bits
+                for bit_idx in range(self.bit_length):
+                    super().__setitem__(block_start + bit_idx, bool_data[bit_idx])
                 idx += 1
             return
         key = key if key >= 0 else key + len(self)
         if not (0 <= key < len(self)):
             raise IndexError("索引超出范围")
-        block_idx = key // self.bit_length
-        block_start = block_idx * self.bit_length
-        bool_data = []
+        block_start = key * self.bit_length
+        block_end = block_start + self.bit_length
+        if block_end > self.size:
+            raise IndexError("索引超出范围")
         num = value
         if num >= 0:
             sign_bit = False
@@ -118,28 +143,19 @@ class IntHybridArray(BoolHybridArray):
                 if carry:
                     num_bits[j] = not num_bits[j]
                     carry = 0 if num_bits[j] else 1
-        bool_data.append(sign_bit)
-        bool_data.extend(num_bits)
-        for idx in range(self.bit_length):
-            self[block_start + idx] = bool_data[idx]
+        bool_data = [sign_bit] + num_bits
+        for bit_idx in range(self.bit_length):
+            super().__setitem__(block_start + bit_idx, bool_data[bit_idx])
 
     def __iter__(self):
-        for i in range(0, self.size, self.bit_length):
-            bit_chunk = [self[j] for j in range(i, i + self.bit_length)]
+        for i in range(0, self.total_bits, self.bit_length):
+            if i + self.bit_length > self.size:
+                break
+            bit_chunk = [super().__getitem__(j) for j in range(i, i + self.bit_length)]
             yield self.to_int(bit_chunk)
 
     def __str__(self):
         return f"IntHybridArray([{', '.join(map(str, self))}])"
 
     def __len__(self):
-        return self.size // self.bit_length
-builtins.IntHybridArray = IntHybridArray
-if __name__ == "__main__":
-    test = [0, 10, -5, 31, 32768, -65536]
-    arr = IntHybridArray(test)
-    print(arr)
-    print(arr[2])
-    arr[3] = -100
-    print(arr)
-    print(list(arr))
-    print(arr[1:4])
+        return self.total_bits // self.bit_length

{bool_hybrid_array-9.10.10.dist-info → bool_hybrid_array-9.10.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bool-hybrid-array
-Version: 9.10.10
+Version: 9.10.11
 Summary: 一个高效的布尔数组（密集+稀疏混合存储，节省内存）
 Home-page: https://github.com/BKsell/bool-hybrid-array
 Author: 蔡靖杰
@@ -541,6 +541,7 @@ arr = int_array.IntHybridArray([100,-27623,18276,-32165])
 * **9.10.8**：给Create_BHA新增了mmap优化
 * **9.10.9**：修复9.10.8版本中的NameError错误
 * **9.10.10**：新增int_array模块
+* **9.10.11**：修复NameError: name 'int_array' is not defined. Did you mean: 'bytearray'?的错误
 
 
 

bool_hybrid_array-9.10.11.dist-info/RECORD

@@ -0,0 +1,10 @@
+bool_hybrid_array/__init__.py,sha256=IqtYvdH7w00YYmTgbQ9Q2DKMKIQoGM9728UQ0JOSox8,793
+bool_hybrid_array/__main__.py,sha256=xb4p6L-JlVWor0CVVKqjoxKVH3YvA8pfRTBG4AFHqQU,7833
+bool_hybrid_array/core.py,sha256=zcqPqb6AhUFqzb0PPXQtisXpXc2Zd50Xsh8ooOvpwO0,36526
+bool_hybrid_array/秘密.md,sha256=Ii2NvXmv-Ktu04zJsGLcQZvlzT4gOatByE4B2wTK1Ks,48
+bool_hybrid_array/int_array/__init__.py,sha256=1ysgXyfJcmSPK4Fs3Qd7JGlESwXyYn9WsPVaI6LtrxA,6872
+bool_hybrid_array-9.10.11.dist-info/licenses/LICENSE,sha256=Sg4rnGXkBDYkwJCWyxdWp5H60rhVAxpNvFh_l3JWZdY,1070
+bool_hybrid_array-9.10.11.dist-info/METADATA,sha256=LY4eVuUqmSFXk_ay6uzbZ0YmKW2SSxaIFMBF13xg4TY,22008
+bool_hybrid_array-9.10.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bool_hybrid_array-9.10.11.dist-info/top_level.txt,sha256=vk-TD77wuVQsN1rJ6uVWZX4sC_wya_WplRDwQKJoBZM,18
+bool_hybrid_array-9.10.11.dist-info/RECORD,,

bool_hybrid_array-9.10.10.dist-info/RECORD

@@ -1,10 +0,0 @@
-bool_hybrid_array/__init__.py,sha256=Ge5xU9hWokXo6_tOEychWsFtuCSM2ttCbTXIAVpAsBc,757
-bool_hybrid_array/__main__.py,sha256=pE9jECC2i2_13HJnI3qPav1YaggfUs-gdScabvRpD9I,7728
-bool_hybrid_array/core.py,sha256=zcqPqb6AhUFqzb0PPXQtisXpXc2Zd50Xsh8ooOvpwO0,36526
-bool_hybrid_array/秘密.md,sha256=Ii2NvXmv-Ktu04zJsGLcQZvlzT4gOatByE4B2wTK1Ks,48
-bool_hybrid_array/int_array/__init__.py,sha256=S1bG3kmeRqNkAbChCudxP_zAWBVbMJwvOKi39kYt-Rw,5766
-bool_hybrid_array-9.10.10.dist-info/licenses/LICENSE,sha256=Sg4rnGXkBDYkwJCWyxdWp5H60rhVAxpNvFh_l3JWZdY,1070
-bool_hybrid_array-9.10.10.dist-info/METADATA,sha256=5v3IJIUYsCVkXhjgzWDsS_8H4T8XZF9L0c6z96X4Y6M,21905
-bool_hybrid_array-9.10.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bool_hybrid_array-9.10.10.dist-info/top_level.txt,sha256=vk-TD77wuVQsN1rJ6uVWZX4sC_wya_WplRDwQKJoBZM,18
-bool_hybrid_array-9.10.10.dist-info/RECORD,,