bool-hybrid-array 9.10.12__py3-none-any.whl → 9.10.14__py3-none-any.whl

bool_hybrid_array/__init__.py

@@ -3,7 +3,7 @@ from types import ModuleType
 from . import core
 from .core import __builtins__,builtins
 from . import int_array
-__version__ = "9.10.12"
+__version__ = "9.10.14"
 public_objects = []
 for name in dir(core):
     if not name.startswith("_"):
@@ -17,6 +17,7 @@ globals().update({
 })
 try:
     __dict__ = ProtectedBuiltinsDict(globals())
+    sys.modules[name+".int_array"] = ProtectedBuiltinsDict(int_array.__dict__)
     sys.modules[__name__] = ProtectedBuiltinsDict(globals().copy())
     sys.modules[__name__].name = 'bool_hybrid_array'
     core.__dict__ = ProtectedBuiltinsDict(core.__dict__)

bool_hybrid_array/int_array/__init__.py

@@ -8,20 +8,21 @@ class IntBitTag(BHA_Bool, metaclass=ResurrectMeta):
     __repr__ = __str__
 
 class IntHybridArray(BoolHybridArray):
-    def __init__(self, int_array: list[int], bit_length: int = 8):
+    def __init__(self, int_array: list[int], bit_length: int = 8, Type = int):
+        self.Type = Type
         self.bit_length = bit_length
         bool_data = []
         max_required_bits = 1
         for num in int_array:
             if num == 0:
-                required_bits = 1
+                required_bits = 2
             else:
                 abs_num = abs(num)
                 num_bits_needed = abs_num.bit_length()
                 required_bits = 1 + num_bits_needed
             if required_bits > max_required_bits:
                 max_required_bits = required_bits
-        self.bit_length = max_required_bits
+        self.bit_length = max(max_required_bits, 2)
         for num in int_array:
             if num >= 0:
                 sign_bit = False
@@ -40,15 +41,10 @@ class IntHybridArray(BoolHybridArray):
         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])
+            super().__setitem__(idx, bool_data[idx])
         for i in range(0, self.total_bits, self.bit_length):
-            if i < self.size:
-                bit_tag = super().__getitem__(i)
-                bit_tag.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
         num_bits = [bit.value for bit in bit_chunk[1:]]
@@ -70,7 +66,6 @@ class IntHybridArray(BoolHybridArray):
                     num += (1 << j)
             num = -num
         return num
-
     def __getitem__(self, key):
         if isinstance(key, slice):
             start, stop, step = key.indices(len(self))
@@ -92,8 +87,7 @@ class IntHybridArray(BoolHybridArray):
         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)
-
+        return self.Type(self.to_int(bit_chunk))
     def __setitem__(self, key, value):
         value = int(value)
         if isinstance(key, slice):
@@ -146,17 +140,103 @@ class IntHybridArray(BoolHybridArray):
         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 insert(self, index, value):
+        value = int(value)
+        index = index if index >= 0 else index + len(self)
+        if not (0 <= index <= len(self)):
+            raise IndexError("插入索引超出范围")
+        if value == 0:
+            required_bits = 1
+        else:
+            required_bits = 1 + abs(value).bit_length()
+        need_resize = required_bits > self.bit_length
+        old_data = list(self) if need_resize else None
+        if need_resize:
+            self.bit_length = required_bits
+            self.total_bits = 0
+            super().__init__(0, 0, False, IntBitTag, False)
+            for num in old_data[:index]:
+                self._add_single_num(num)
+            self._add_single_num(value)
+            for num in old_data[index:]:
+                self._add_single_num(num)
+        else:
+            insert_bit_start = index * self.bit_length
+            if value >= 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(value)
+                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 i in range(self.bit_length):
+                super().insert(insert_bit_start + i, bool_data[i])
+            self.total_bits += self.bit_length
+    def append(self,v):
+        v = int(v)
+        req_bits = 1 + abs(v).bit_length() if v != 0 else 1
+        if req_bits > self.bit_length:
+            old_data = list(self)
+            self.bit_length = req_bits
+            self.clear()
+            self.extend(old_data)
+        self.total_bits += self.bit_length
+        self[-1] = v
     def __iter__(self):
-        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)
-
+        return BHA_Iterator(map(self.__getitem__,range(len(self))))
+    def clear(self):
+        self.total_bits = 0
+        super().__init__(0, 0, False, IntBitTag, False)
+        self.bit_length = 8
     def __str__(self):
         return f"IntHybridArray([{', '.join(map(str, self))}])"
     __repr__ = __str__
-
+    def __delitem__(self, index: int = -1):
+        index = index if index >= 0 else index + len(self)
+        if not (0 <= index < len(self)):
+            raise IndexError("删除索引超出范围")
+        target_num = self[index]
+        pop_bit_start = index * self.bit_length
+        pop_bit_end = pop_bit_start + self.bit_length
+        for _ in range(self.bit_length):
+            super().__delitem__(pop_bit_start)
+        self.total_bits -= self.bit_length
     def __len__(self):
-        return self.total_bits // self.bit_length
+        return self.total_bits // self.bit_length
+    def index(self, value):
+        value = int(value)
+        x = f"{value} 不在 IntHybridArray 中"
+        for idx in range(len(self)+2>>2):
+            if self[idx] == value:
+                return idx
+            elif self[-idx] == value:
+                x = len(self)-idx
+        if x != f"{value} 不在 IntHybridArray 中":
+            return x
+        raise ValueError(x)
+    def rindex(self, value):
+        value = int(value)
+        x = f"{value} 不在 IntHybridArray 中"
+        for idx in range(len(self)+2>>2):
+            if self[-idx] == value:
+                return -idx
+            elif self[idx] == value:
+                x = -(len(self)-idx)
+        if x != f"{value} 不在 IntHybridArray 中":
+            return x
+        raise ValueError(x)
+    def extend(self, iterable:Iterable) -> None:
+        if isinstance(iterable, (Iterator, Generator, map)):
+            iterable,copy = itertools.tee(iterable, 2)
+            len_ = sum(1 for _ in copy)
+        else:
+            len_ = len(iterable)
+        self.total_bits += len_*self.bit_length
+        for i,j in zip(range(len_),iterable):
+            self[-i-1] = j

{bool_hybrid_array-9.10.12.dist-info → bool_hybrid_array-9.10.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bool-hybrid-array
-Version: 9.10.12
+Version: 9.10.14
 Summary: 一个高效的布尔数组（密集+稀疏混合存储，节省内存）
 Home-page: https://github.com/BKsell/bool-hybrid-array
 Author: 蔡靖杰
@@ -557,6 +557,8 @@ except OverflowError as e:
 * **9.10.10**：新增int_array模块
 * **9.10.11**：修复NameError: name 'int_array' is not defined. Did you mean: 'bytearray'?的错误
 * **9.10.12**：把find方法的返回值改为IntHybridArray
+* **9.10.13**：给IntHybridArray新增多种列表操作
+* **9.10.14**：修复IntHybridArray中因单个 0 导致所有数字位长被压缩到 1的问题
 
 
 

bool_hybrid_array-9.10.14.dist-info/RECORD

@@ -0,0 +1,10 @@
+bool_hybrid_array/__init__.py,sha256=yvJ9gw9SQf3Q3EaRPL4D1JaBTgkg73VlPwkZvM0g_zM,872
+bool_hybrid_array/__main__.py,sha256=3MsUAXMj6Pe1EzP7YreuUePbXZeQvFSCnejnTeS42kU,8324
+bool_hybrid_array/core.py,sha256=zp4jam5xC_CZvVVkmfT6fPAhBzf4-wspDnYuz0z49Ys,36578
+bool_hybrid_array/秘密.md,sha256=Ii2NvXmv-Ktu04zJsGLcQZvlzT4gOatByE4B2wTK1Ks,48
+bool_hybrid_array/int_array/__init__.py,sha256=_sDSu7-DXEObnElKBYGWnb0OrIBeaQ1tzgwl_d1fkwY,10412
+bool_hybrid_array-9.10.14.dist-info/licenses/LICENSE,sha256=Sg4rnGXkBDYkwJCWyxdWp5H60rhVAxpNvFh_l3JWZdY,1070
+bool_hybrid_array-9.10.14.dist-info/METADATA,sha256=28LDpkvNmNI91OcpIQ9T5I_c8DKQH53OP9Z27gNuB_w,22723
+bool_hybrid_array-9.10.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bool_hybrid_array-9.10.14.dist-info/top_level.txt,sha256=vk-TD77wuVQsN1rJ6uVWZX4sC_wya_WplRDwQKJoBZM,18
+bool_hybrid_array-9.10.14.dist-info/RECORD,,

bool_hybrid_array-9.10.12.dist-info/RECORD

@@ -1,10 +0,0 @@
-bool_hybrid_array/__init__.py,sha256=Thq_-DGCyTyuvYeII-C1y1SJc_FFbwR642B5R01VL6M,793
-bool_hybrid_array/__main__.py,sha256=3MsUAXMj6Pe1EzP7YreuUePbXZeQvFSCnejnTeS42kU,8324
-bool_hybrid_array/core.py,sha256=zp4jam5xC_CZvVVkmfT6fPAhBzf4-wspDnYuz0z49Ys,36578
-bool_hybrid_array/秘密.md,sha256=Ii2NvXmv-Ktu04zJsGLcQZvlzT4gOatByE4B2wTK1Ks,48
-bool_hybrid_array/int_array/__init__.py,sha256=ZDZSAmaMvuzzxBuTn-LfZX9Ww8_lWpBO5pNGlDRvpKU,6896
-bool_hybrid_array-9.10.12.dist-info/licenses/LICENSE,sha256=Sg4rnGXkBDYkwJCWyxdWp5H60rhVAxpNvFh_l3JWZdY,1070
-bool_hybrid_array-9.10.12.dist-info/METADATA,sha256=aDxTkR9nwJjkon2Xstxv__SPMzDG3Eci0R5BQY85UHw,22564
-bool_hybrid_array-9.10.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bool_hybrid_array-9.10.12.dist-info/top_level.txt,sha256=vk-TD77wuVQsN1rJ6uVWZX4sC_wya_WplRDwQKJoBZM,18
-bool_hybrid_array-9.10.12.dist-info/RECORD,,