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

pythonic_fp/circulararray/auto.py

@@ -41,22 +41,21 @@ 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 populate 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
@@ -292,10 +291,10 @@ class CA[I]:
 
         (
             front1,
-            count1,
+            cnt1,
             capacity1,
             front2,
-            count2,
+            cnt2,
             capacity2,
         ) = (
             self._front,
@@ -306,10 +305,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]

pythonic_fp/circulararray/fixed.py

@@ -40,44 +40,38 @@ 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 populate 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 +84,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 +103,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 +153,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,
@@ -181,11 +175,11 @@ class CAF[I]:
 
         (
             front1,
-            count1,
-            capacity1,
+            cnt1,
+            cap1,
             front2,
-            count2,
-            capacity2,
+            cnt2,
+            cap2,
         ) = (
             self._front,
             self._cnt,
@@ -195,18 +189,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
@@ -409,7 +403,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: ...
@@ -500,11 +494,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-5.4.0.dist-info → pythonic_fp_circulararray-6.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pythonic-fp-circulararray
-Version: 5.4.0
+Version: 6.0.0
 Summary: Circular Array
 Keywords: auto resizing,circular array,circulararray,dequeue,indexable,pop,push
 Author-email: "Geoffrey R. Scheller" <geoffrey@scheller.com>

pythonic_fp_circulararray-6.0.0.dist-info/RECORD

@@ -0,0 +1,8 @@
+pythonic_fp/circulararray/__init__.py,sha256=uR0KASmw1Zraz9l3VPbqPm9WUKzWk-0_tUGT0opabzQ,1515
+pythonic_fp/circulararray/auto.py,sha256=7aT4l93zAPWIuIWjqxnLpXyJJZ349CCPqPGS-yXJxho,19486
+pythonic_fp/circulararray/fixed.py,sha256=usGVbw2wy4idhhMSZq_DFzROTrXUeiCjVpMYfetXiWs,15456
+pythonic_fp/circulararray/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pythonic_fp_circulararray-6.0.0.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+pythonic_fp_circulararray-6.0.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+pythonic_fp_circulararray-6.0.0.dist-info/METADATA,sha256=W9GQEAUwxQi-yzQU2yGqhanDDXYe-piRV5ZxZJYpYpk,2761
+pythonic_fp_circulararray-6.0.0.dist-info/RECORD,,

pythonic_fp/circulararray/auto.pyi

@@ -1,52 +0,0 @@
-from collections.abc import Callable, Iterable, Iterator
-from typing import overload
-
-__all__ = ['CA', 'ca']
-
-class CA[I]:
-    @overload
-    def __init__(self) -> None: ...
-    @overload
-    def __init__(self, items: Iterable[I]) -> None: ...
-    def __iter__(self) -> Iterator[I]: ...
-    def __reversed__(self) -> Iterator[I]: ...
-    def __bool__(self) -> bool: ...
-    def __len__(self) -> int: ...
-    @overload
-    def __getitem__(self, idx: int) -> I: ...
-    @overload
-    def __getitem__(self, idx: slice) -> CA[I]: ...
-    @overload
-    def __setitem__(self, idx: int, vals: I) -> None: ...
-    @overload
-    def __setitem__(self, idx: slice, vals: Iterable[I]) -> None: ...
-    @overload
-    def __delitem__(self, idx: int) -> None: ...
-    @overload
-    def __delitem__(self, idx: slice) -> None: ...
-    def __eq__(self, other: object) -> bool: ...
-    def pushl(self, *items: I) -> None: ...
-    def pushr(self, *items: I) -> None: ...
-    def popl(self) -> I: ...
-    def popr(self) -> I: ...
-    def popld(self, default: I) -> I: ...
-    def poprd(self, default: I) -> I: ...
-    def poplt(self, maximum: int) -> tuple[I, ...]: ...
-    def poprt(self, maximum: int) -> tuple[I, ...]: ...
-    def rotl(self, n: int = 1) -> None: ...
-    def rotr(self, n: int = 1) -> None: ...
-    def map[U](self, f: Callable[[I], U]) -> CA[U]: ...
-    @overload
-    def foldl[L](self, f: Callable[[I, I], I]) -> I: ...
-    @overload
-    def foldl[L](self, f: Callable[[L, I], L], start: L) -> L: ...
-    @overload
-    def foldr[R](self, f: Callable[[I, I], I]) -> I: ...
-    @overload
-    def foldr[R](self, f: Callable[[I, R], R], start: R) -> R: ...
-    def capacity(self) -> int: ...
-    def empty(self) -> None: ...
-    def fraction_filled(self) -> float: ...
-    def resize(self, minimum_capacity: int = 2) -> None: ...
-
-def ca[T](*items: T) -> CA[T]: ...

pythonic_fp/circulararray/fixed.pyi

@@ -1,44 +0,0 @@
-from collections.abc import Callable, Iterable, Iterator
-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 __iter__(self) -> Iterator[I]: ...
-    def __reversed__(self) -> Iterator[I]: ...
-    def __bool__(self) -> bool: ...
-    def __len__(self) -> int: ...
-    def __getitem__(self, idx: int) -> I: ...
-    def __setitem__(self, idx: int, val: I) -> None: ...
-    def __delitem__(self, idx: int) -> None: ...
-    def __eq__(self, other: object) -> bool: ...
-    def pushl(self, item: I) -> None: ...
-    def pushr(self, item: I) -> None: ...
-    def popl(self) -> I: ...
-    def popr(self) -> I: ...
-    def popld(self, default: I) -> I: ...
-    def poprd(self, default: I) -> I: ...
-    def poplt(self, maximum: int) -> tuple[I, ...]: ...
-    def poprt(self, maximum: int) -> tuple[I, ...]: ...
-    def rotl(self, n: int = 1) -> None: ...
-    def rotr(self, n: int = 1) -> None: ...
-    def map[U](self, f: Callable[[I], U]) -> CAF[U]: ...
-    @overload
-    def foldl[L](self, f: Callable[[I, I], I]) -> I: ...
-    @overload
-    def foldl[L](self, f: Callable[[L, I], L], start: L) -> L: ...
-    @overload
-    def foldr[R](self, f: Callable[[I, I], I]) -> I: ...
-    @overload
-    def foldr[R](self, f: Callable[[I, R], R], start: R) -> R: ...
-    def capacity(self) -> int: ...
-    def empty(self) -> None: ...
-    def fraction_filled(self) -> float: ...
-
-def caf[T](*items: T, capacity: int = 2) -> CAF[T]: ...

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,,