pythonic-fp-circulararray 5.4.0__py3-none-any.whl → 6.0.1__py3-none-any.whl

pythonic_fp/circulararray/__init__.py

@@ -16,21 +16,22 @@
 Circular Array
 --------------
 
-Package implementing stateful circular array data structures.
+.. admonition:: Stateful circular array data structures.
 
-- O(1) pops and pushes either end
-- O(1) indexing and size determination
-- O(1) size determination
+    +-------------------------------------+-------------------------------------------+
+    | Module                              | Description                               |
+    +=====================================+===========================================+
+    | **pythonic_fp.circulararray.auto**  | Variable storage capacity circular array. |
+    +-------------------------------------+-------------------------------------------+
+    | **pythonic_fp.circulararray.fixed** | Fixed storage capacity circular array.    |
+    +-------------------------------------+-------------------------------------------+
+
+    - O(1) pops and pushes either end
+    - O(1) size determination
+    - O(1) indexing
 
-+-------------------------------------+-------------------------------------------+
-| Module                              | Description                               |
-+=====================================+===========================================+
-| **pythonic_fp.circulararray.auto**  | Variable storage capacity circular array. |
-+-------------------------------------+-------------------------------------------+
-| **pythonic_fp.circulararray.fixed** | Fixed storage capacity circular array.    |
-+-------------------------------------+-------------------------------------------+
 """
 
 __author__ = 'Geoffrey R. Scheller'
-__copyright__ = 'Copyright (c) 2023-2025 Geoffrey R. Scheller'
+__copyright__ = 'Copyright (c) 2023-2026 Geoffrey R. Scheller'
 __license__ = 'Apache License 2.0'

pythonic_fp/circulararray/auto.py

@@ -13,19 +13,16 @@
 # limitations under the License.
 
 """
-Variable Storage Capacity
-=========================
+.. admonition:: Variable storage capacity circular array.**
 
-**Circular array with variable storage capacity.**
-
-- O(1) pops either end
-- O(1) amortized pushes either end
-- O(1) indexing, fully supports slicing
-- auto-resizing more storage capacity when necessary, manually compatible
-- iterable, safely mutates while iterators iterating over previous state
-- comparisons compare identity before equality, like builtins
-- in boolean context, falsy when empty, otherwise truthy
-- function ``ca`` produces auto-resizing circular array from arguments
+    - O(1) pops either end
+    - O(1) amortized pushes either end
+    - O(1) indexing, fully supports slicing
+    - auto-resizing more storage capacity when necessary, manually compatible
+    - iterable, safely mutates while iterators iterating over previous state
+    - comparisons compare identity before equality, like builtins
+    - in boolean context, falsy when empty, otherwise truthy
+    - function ``ca`` produces auto-resizing circular array from arguments
 
 """
 
@@ -41,22 +38,22 @@ nada: Final[NoValue] = NoValue()
 class CA[I]:
     __slots__ = '_items', '_cnt', '_cap', '_front', '_rear'
 
-    @overload
-    def __init__(self) -> None: ...
-    @overload
-    def __init__(self, items: Iterable[I]) -> None: ...
-
-    def __init__(self, items: Iterable[I | NoValue] | NoValue = nada) -> None:
+    def __init__(self, *items: Iterable[I]) -> None:
         """
-        :param items: "Optional" iterable to initial populate circular array.
-        :raises TypeError: When ``items`` not Iterable.
+        :param items: Optionally takes a single iterable to
+                      initially populate the circular array.
+        :raises TypeError: When ``items[0]`` not iterable.
+        :raises ValueError: If more than 1 iterable is given.
         """
-        if items is nada:
-            self._items: list[I | NoValue] = [nada, nada]
-        else:
-            values: list[I | NoValue] = list(cast(Iterable[I | NoValue], items))
+        if (size := len(items)) > 1:
+            msg = f'CA expects at most 1 argument, got {size}'
+            raise ValueError(msg)
+        if size:
+            values: list[I | NoValue] = list(cast(Iterable[I | NoValue], items[0]))
             self._items = [nada] + values + [nada]
-        self._cap = cap = len(self._items)
+        else:
+            self._items = [nada, nada]
+        self._cap = (cap := len(self._items))
         self._cnt = cap - 2
         if cap == 2:
             self._front = 0
@@ -285,6 +282,12 @@ class CA[I]:
         del _ca
 
     def __eq__(self, other: object) -> bool:
+        """
+        :param other: The object to be compared to.
+        :returns: ``True`` if object is another CA whose items compare
+                  as equal to the corresponding items in the CA,
+                  otherwise ``False``.
+        """
         if self is other:
             return True
         if not isinstance(other, type(self)):
@@ -292,10 +295,10 @@ class CA[I]:
 
         (
             front1,
-            count1,
+            cnt1,
             capacity1,
             front2,
-            count2,
+            cnt2,
             capacity2,
         ) = (
             self._front,
@@ -306,10 +309,10 @@ class CA[I]:
             other._cap,
         )
 
-        if count1 != count2:
+        if cnt1 != cnt2:
             return False
 
-        for nn in range(count1):
+        for nn in range(cnt1):
             if (
                 self._items[(front1 + nn) % capacity1]
                 is other._items[(front2 + nn) % capacity2]
@@ -459,7 +462,8 @@ class CA[I]:
     def poplt(self, maximum: int) -> tuple[I, ...]:
         """Pop multiple items from left side of circular array.
 
-        :param maximum: Maximum number of items to pop, may pop less if not enough items.
+        :param maximum: Maximum number of items to pop, may pop less
+                        if not enough items.
         :returns: Tuple of items in the order popped, left to right.
         """
         item_list: list[I] = []
@@ -477,7 +481,8 @@ class CA[I]:
     def poprt(self, maximum: int) -> tuple[I, ...]:
         """Pop multiple items from right side of circular array.
 
-        :param maximum: Maximum number of items to pop, may pop less if not enough items.
+        :param maximum: Maximum number of items to pop, may pop less
+                        if not enough items.
         :returns: Tuple of items in the order popped, right to left.
         """
         item_list: list[I] = []
@@ -526,10 +531,12 @@ class CA[I]:
     def foldl[L](self, f: Callable[[L, I], L], start: L | NoValue = NoValue()) -> L:
         """Fold left with a function and optional starting item.
 
-        :param f: Folding function, first argument to ``f`` is for the accumulator.
+        :param f: Folding function, first argument to ``f`` is for
+                  the accumulator.
         :param start: "Optional" starting item.
         :returns: Reduced value produced by the left fold.
-        :raises ValueError: When circular array empty and no starting item given.
+        :raises ValueError: When circular array empty and no starting
+                            item given.
         """
         if self._cnt == 0:
             if start is nada:
@@ -556,10 +563,12 @@ class CA[I]:
     def foldr[R](self, f: Callable[[I, R], R], start: R | NoValue = nada) -> R:
         """Fold right with a function and an optional starting item.
 
-        :param f: Folding function, second argument to ``f`` is for the accumulator.
-        :param start: "Optional" starting item.
+        :param f: Folding function, second argument to ``f`` is for
+                  the accumulator.
+        :param start: Optional starting item.
         :returns: Reduced value produced by the right fold.
-        :raises ValueError: When circular array empty and no starting item given.
+        :raises ValueError: When circular array empty and no starting
+                            item given.
         """
         if self._cnt == 0:
             if start is nada:
@@ -611,7 +620,8 @@ class CA[I]:
         storage capacity. To just compact the circular array, do not
         provide ``minimum_capacity``.
 
-        :param minimum_capacity: Minimum storage capacity to compact the circular array.
+        :param minimum_capacity: Minimum storage capacity to compact
+                                 the circular array.
         """
         self._compact_storage_capacity()
         if (min_cap := minimum_capacity) > self._cap:

pythonic_fp/circulararray/auto.pyi

@@ -4,10 +4,7 @@ from typing import overload
 __all__ = ['CA', 'ca']
 
 class CA[I]:
-    @overload
-    def __init__(self) -> None: ...
-    @overload
-    def __init__(self, items: Iterable[I]) -> None: ...
+    def __init__(self, *items: Iterable[I]) -> None: ...
     def __iter__(self) -> Iterator[I]: ...
     def __reversed__(self) -> Iterator[I]: ...
     def __bool__(self) -> bool: ...

pythonic_fp/circulararray/fixed.py

@@ -13,18 +13,15 @@
 # limitations under the License.
 
 """
-Fixed Storage Capacity
-======================
+.. admonition:: Fixed storage capacity circular array.**
 
-**Circular array with fixed storage capacity.**
-
-- O(1) pops and pushes either end
-- O(1) indexing, does not support slicing
-- fixed total storage capacity
-- iterable, safely mutates while iterators iterating over previous state
-- comparisons compare identity before equality, like builtins
-- in boolean context, falsy when either empty or full, otherwise truthy
-- function ``caf`` produces fixed capacity circular array from arguments
+    - O(1) pops and pushes either end
+    - O(1) indexing, does not support slicing
+    - fixed total storage capacity
+    - iterable, safely mutates while iterators iterating over previous state
+    - comparisons compare identity before equality, like builtins
+    - in boolean context, falsy when either empty or full, otherwise truthy
+    - function ``caf`` produces fixed capacity circular array from arguments
 
 """
 
@@ -40,44 +37,39 @@ nada: Final[NoValue] = NoValue()
 class CAF[I]:
     __slots__ = '_items', '_cnt', '_cap', '_front', '_rear'
 
-    @overload
-    def __init__(self) -> None: ...
-    @overload
-    def __init__(self, items: Iterable[I]) -> None: ...
-    @overload
-    def __init__(self, items: Iterable[I], capacity: int) -> None: ...
-
-    def __init__(
-        self, items: Iterable[I | NoValue] | NoValue = nada, capacity: int = 2
-    ) -> None:
+    def __init__(self, *items: Iterable[I], cap: int = 2) -> None:
         """
-        :param items: "Optional" iterable to initial populate circular array.
-        :param capacity: Minimum fixed storage capacity of circular array.
-        :raises TypeError: When ``items`` not Iterable,
+        :param items: Optionally takes a single iterable to
+                      initially populate the circular array.
+        :param cap: Minimum fixed storage capacity of circular array.
+        :raises TypeError: When ``items[0]`` not iterable,
+        :raises ValueError: If more than 1 iterable is given.
         """
-        capacity = max(2, capacity)
-        if items is nada:
-            self._items: list[I | NoValue] = [nada] * capacity
-            count = 0
+        cap = max(2, cap)
+        if (size := len(items)) > 1:
+            msg = f'CAF expects at most 1 argument, got {size}'
+            raise ValueError(msg)
+        if size:
+            values: list[I | NoValue] = list(cast(Iterable[I | NoValue], items[0]))
+            cnt = len(values)
+            cap = max(cnt, cap)
+            self._items = values + [nada] * (cap - cnt)
         else:
-            values: list[I | NoValue] = list(cast(Iterable[I | NoValue], items))
-            dlist: list[I | NoValue] = list(values)
-            count = len(dlist)
-            capacity = max(count, capacity)
-            self._items = dlist + [nada] * (capacity - count)
-        self._cap: Final[int] = capacity
-        self._cnt = count
-        if count == 0:
+            self._items = [nada] * cap
+            cnt = 0
+        self._cap: Final[int] = cap
+        self._cnt = cnt
+        if cnt == 0:
             self._front = 0
-            self._rear = capacity - 1
+            self._rear = cap - 1
         else:
             self._front = 0
-            self._rear = count - 1
+            self._rear = cnt - 1
 
     def __iter__(self) -> Iterator[I]:
         if self._cnt > 0:
             (
-                capacity,
+                cap,
                 rear,
                 position,
                 current_state,
@@ -90,13 +82,13 @@ class CAF[I]:
 
             while position != rear:
                 yield cast(I, current_state[position])
-                position = (position + 1) % capacity
+                position = (position + 1) % cap
             yield cast(I, current_state[position])
 
     def __reversed__(self) -> Iterator[I]:
         if self._cnt > 0:
             (
-                capacity,
+                cap,
                 front,
                 position,
                 current_state,
@@ -109,7 +101,7 @@ class CAF[I]:
 
             while position != front:
                 yield cast(I, current_state[position])
-                position = (position - 1) % capacity
+                position = (position - 1) % cap
             yield cast(I, current_state[position])
 
     def __repr__(self) -> str:
@@ -159,7 +151,7 @@ class CAF[I]:
     def __delitem__(self, idx: int) -> None:
         item_list = list(self)
         del item_list[idx]
-        _ca = CAF(item_list, self._cap)
+        _ca = CAF(item_list, cap = self._cap)
         (
             self._items,
             self._cnt,
@@ -174,6 +166,12 @@ class CAF[I]:
         del _ca
 
     def __eq__(self, other: object) -> bool:
+        """
+        :param other: The object to be compared to.
+        :returns: ``True`` if object is another CAF whose items compare
+                  as equal to the corresponding items in the CAF,
+                  otherwise ``False``.
+        """
         if self is other:
             return True
         if not isinstance(other, type(self)):
@@ -181,11 +179,11 @@ class CAF[I]:
 
         (
             front1,
-            count1,
-            capacity1,
+            cnt1,
+            cap1,
             front2,
-            count2,
-            capacity2,
+            cnt2,
+            cap2,
         ) = (
             self._front,
             self._cnt,
@@ -195,18 +193,18 @@ class CAF[I]:
             other._cap,
         )
 
-        if count1 != count2:
+        if cnt1 != cnt2:
             return False
 
-        for nn in range(count1):
+        for nn in range(cnt1):
             if (
-                self._items[(front1 + nn) % capacity1]
-                is other._items[(front2 + nn) % capacity2]
+                self._items[(front1 + nn) % cap1]
+                is other._items[(front2 + nn) % cap2]
             ):
                 continue
             if (
-                self._items[(front1 + nn) % capacity1]
-                != other._items[(front2 + nn) % capacity2]
+                self._items[(front1 + nn) % cap1]
+                != other._items[(front2 + nn) % cap2]
             ):
                 return False
         return True
@@ -352,7 +350,8 @@ class CAF[I]:
     def poplt(self, maximum: int) -> tuple[I, ...]:
         """Pop multiple items from left side of circular array.
 
-        :param maximum: Maximum number of items to pop, may pop less if not enough items.
+        :param maximum: Maximum number of items to pop, may pop less
+                        if not enough items.
         :returns: Tuple of items in the order popped, left to right.
         """
         item_list: list[I] = []
@@ -370,7 +369,8 @@ class CAF[I]:
     def poprt(self, maximum: int) -> tuple[I, ...]:
         """Pop multiple items from right side of circular array.
 
-        :param maximum: Maximum number of items to pop, may pop less if not enough items.
+        :param maximum: Maximum number of items to pop, may pop less
+                        if not enough items.
         :returns: Tuple of items in the order popped, right to left.
         """
         item_list: list[I] = []
@@ -409,7 +409,7 @@ class CAF[I]:
         :param f: Callable from type ``I`` to type ``U``.
         :returns: New fixed capacity circular array instance.
         """
-        return CAF(map(f, self), self._cap)
+        return CAF(map(f, self), cap = self._cap)
 
     @overload
     def foldl[L](self, f: Callable[[I, I], I]) -> I: ...
@@ -419,10 +419,12 @@ class CAF[I]:
     def foldl[L](self, f: Callable[[L, I], L], start: L | NoValue = nada) -> L:
         """Fold left with a function and optional stating item.
 
-        :param f: Folding function, first argument to ``f`` is for the accumulator.
+        :param f: Folding function, first argument to ``f`` is for
+                  the accumulator.
         :param start: Optional starting item.
         :returns: Reduced value produced by the left fold.
-        :raises ValueError: When circular array empty and no starting item given.
+        :raises ValueError: When circular array empty and no starting
+                            item given.
         """
         if self._cnt == 0:
             if start is nada:
@@ -449,10 +451,12 @@ class CAF[I]:
     def foldr[R](self, f: Callable[[I, R], R], start: R | NoValue = nada) -> R:
         """Fold right with a function and an optional starting item.
 
-        :param f: Folding function, second argument to ``f`` is for the accumulator.
+        :param f: Folding function, second argument to ``f`` is for
+                  the accumulator.
         :param start: Optional starting item.
         :returns: Reduced value produced by the right fold.
-        :raises ValueError: When circular array empty and no starting item given.
+        :raises ValueError: When circular array empty and no starting
+                            item given.
         """
         if self._cnt == 0:
             if start is nada:
@@ -500,11 +504,11 @@ class CAF[I]:
         return self._cnt / self._cap
 
 
-def caf[T](*items: T, capacity: int = 2) -> CAF[T]:
+def caf[T](*items: T, cap: int = 2) -> CAF[T]:
     """Produce a circular array from a variable number of arguments.
 
     :param items: Initial items for a new fixed capacity :circular array.
-    :param capacity: The minimum storage capacity to set.
+    :param cap: The minimum storage capacity to set.
     :returns: New fixed storage capacity circular array.
     """
-    return CAF(items, capacity=capacity)
+    return CAF(items, cap=cap)

pythonic_fp/circulararray/fixed.pyi

@@ -4,12 +4,7 @@ from typing import overload
 __all__ = ['CAF', 'caf']
 
 class CAF[I]:
-    @overload
-    def __init__(self) -> None: ...
-    @overload
-    def __init__(self, items: Iterable[I]) -> None: ...
-    @overload
-    def __init__(self, items: Iterable[I], capacity: int) -> None: ...
+    def __init__(self, *items: Iterable[I], cap: int = 2) -> None: ...
     def __iter__(self) -> Iterator[I]: ...
     def __reversed__(self) -> Iterator[I]: ...
     def __bool__(self) -> bool: ...
@@ -41,4 +36,4 @@ class CAF[I]:
     def empty(self) -> None: ...
     def fraction_filled(self) -> float: ...
 
-def caf[T](*items: T, capacity: int = 2) -> CAF[T]: ...
+def caf[T](*items: T, cap: int = 2) -> CAF[T]: ...

{pythonic_fp_circulararray-5.4.0.dist-info → pythonic_fp_circulararray-6.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pythonic-fp-circulararray
-Version: 5.4.0
+Version: 6.0.1
 Summary: Circular Array
 Keywords: auto resizing,circular array,circulararray,dequeue,indexable,pop,push
 Author-email: "Geoffrey R. Scheller" <geoffrey@scheller.com>
@@ -14,11 +14,11 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Typing :: Typed
 License-File: LICENSE
-Requires-Dist: pythonic-fp-gadgets>=3.1.0
+Requires-Dist: pythonic-fp-gadgets>=4.0.2
 Requires-Dist: pytest>=8.4.1 ; extra == "test"
 Project-URL: Changelog, https://github.com/grscheller/pythonic-fp-circulararray/blob/main/CHANGELOG.rst
-Project-URL: Documentation, https://grscheller.github.io/pythonic-fp/circulararray/development/build/html/index.html
-Project-URL: Homepage, https://github.com/grscheller/pythonic-fp/blob/main/README.md
+Project-URL: Documentation, https://grscheller.github.io/pythonic-fp/circulararray/development/build/html/
+Project-URL: Homepage, https://grscheller.github.io/pythonic-fp/homepage/build/html/
 Project-URL: Source, https://github.com/grscheller/pythonic-fp-circulararray
 Provides-Extra: test
 
@@ -54,7 +54,7 @@ Python module implementing stateful circular array data structures.
 
 Part of the
 `pythonic-fp
-<https://grscheller.github.io/pythonic-fp/homepage/build/html/index.html>`_
+<https://grscheller.github.io/pythonic-fp>`_
 PyPI projects.
 
 Documentation
@@ -62,7 +62,7 @@ Documentation
 
 Documentation for this project is hosted on
 `GitHub Pages
-<https://grscheller.github.io/pythonic-fp/circulararray/development/build/html>`_.
+<https://grscheller.github.io/pythonic-fp/circulararray>`_.
 
 Copyright and License
 ---------------------

pythonic_fp_circulararray-6.0.1.dist-info/RECORD

@@ -0,0 +1,11 @@
+pythonic_fp/circulararray/__init__.py,sha256=LBeypPlXTlFvBa4DgScR1uh6aPCIOaon9xRmPxr00jQ,1528
+pythonic_fp/circulararray/__init__.pyi,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pythonic_fp/circulararray/auto.py,sha256=a6sIoGYJRuWdKyIOr_nppX3YRd9LtYkKcqSGx3vVOV4,19930
+pythonic_fp/circulararray/auto.pyi,sha256=k92FjH9PblzfusOS3RFF29LtwgKAjaxAocuqENuhPEw,1798
+pythonic_fp/circulararray/fixed.py,sha256=atsagw_M6Bl9S3AAeV9ymNf-CFa-0KgR6y6iiTaQHVE,15873
+pythonic_fp/circulararray/fixed.pyi,sha256=n0A0ENgy7vSugeBNcgIUiMZtXzUii05CnuTTRj7VELI,1509
+pythonic_fp/circulararray/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pythonic_fp_circulararray-6.0.1.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+pythonic_fp_circulararray-6.0.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+pythonic_fp_circulararray-6.0.1.dist-info/METADATA,sha256=3vyieYyMYDVKTLuWyXnzsII9R8Xnb6q5E7xlqJUxZao,2697
+pythonic_fp_circulararray-6.0.1.dist-info/RECORD,,

pythonic_fp_circulararray-5.4.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-pythonic_fp/circulararray/__init__.py,sha256=uR0KASmw1Zraz9l3VPbqPm9WUKzWk-0_tUGT0opabzQ,1515
-pythonic_fp/circulararray/__init__.pyi,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pythonic_fp/circulararray/auto.py,sha256=mM5kAZnSo4etgA0uSp05VUMGpIOeKXIoCCQ1C3pIETo,19457
-pythonic_fp/circulararray/auto.pyi,sha256=DegIbRFv66Ws4N1J1dExQ6cQJOTZw-XXUEJHi1OgIBk,1861
-pythonic_fp/circulararray/fixed.py,sha256=VhCWBcE0C8toYqGyd9aKJ1bSJu8sHA46AQGJ7mGxYBE,15700
-pythonic_fp/circulararray/fixed.pyi,sha256=Uk0QnXn3_q_6urXeRFEMxsL0gS-3Xa4UsyDRVXk8YoY,1648
-pythonic_fp/circulararray/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pythonic_fp_circulararray-5.4.0.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-pythonic_fp_circulararray-5.4.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-pythonic_fp_circulararray-5.4.0.dist-info/METADATA,sha256=x6ZQX_ItPF3ndJZFS15JOOqKPK01yM6YEf0Y3e9PsK8,2761
-pythonic_fp_circulararray-5.4.0.dist-info/RECORD,,