kbasic 0.3.0__tar.gz → 0.3.2__tar.gz

{kbasic-0.3.0 → kbasic-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kbasic
-Version: 0.3.0
+Version: 0.3.2
 Summary: Keyan's basic utility functions.
 Author: Keyan Gootkin
 Author-email: Keyan Gootkin <keyangootkin@gmail.com>

{kbasic-0.3.0 → kbasic-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kbasic"
-version = "0.3.0"
+version = "0.3.2"
 description = "Keyan's basic utility functions."
 readme = "README.md"
 authors = [

{kbasic-0.3.0 → kbasic-0.3.2}/src/kbasic/__init__.py

@@ -8,4 +8,4 @@ from kbasic.user_input import *
 from kbasic.Tex import *
 from kbasic.typing import *
 from kbasic.vectors import *
-from kbasic.parsing import *
+from kbasic.parsing import *

{kbasic-0.3.0 → kbasic-0.3.2}/src/kbasic/array.py

@@ -3,11 +3,12 @@
 # >-|===|>                             Imports                             <|===|-<
 # !==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==
 from typing import Callable
-from kbasic.typing import Number, ArrayLike, NDArray
+from kbasic.typing import Number
 from numpy import argmin, any, all, absolute, hypot, logspace, log10, where, \
                   nanmean, nanmin, nanmax, sqrt, linspace, nanstd, array, isnan, \
                   isfinite, arange, mgrid, r_, c_, zeros, delete, unravel_index
 from numpy.fft import fftshift, fft2, fftn
+from numpy.typing import ArrayLike, NDArray
 from scipy.interpolate import RegularGridInterpolator
 from tqdm import tqdm
 

{kbasic-0.3.0 → kbasic-0.3.2}/src/kbasic/vectors.py

@@ -28,9 +28,9 @@ def hamilton_product(q1, q2):
 class VectorBase:
     def __init__(self, *components) -> None:
         match components[0]:
-            case x if type(x) in Number.types:
+            case Number():
                 self.components = components
-            case x if type(x) in Array.types:
+            case Array():
                 self.components = tuple(array(x) for x in components)
             case Generator():
                 self.components = tuple(components[0])
@@ -77,15 +77,15 @@ class VectorBase:
         match other:
             case VectorBase():
                 return Vector(xs+xo for xs, xo in zip(self.components, other.components))
-            case x if type(x) in Number.types:
+            case Number():
                 return Vector(xi+other for xi in self)
-            case x if type(x) in Array.types:
+            case Array():
                 return Vector(xs+xo for xs, xo in zip(self.components, other))
     def __sub__(self, other) -> Self:
         match other:
-            case x if type(x) in Number.types:
+            case Number():
                 return type(self)(x-other for x in self)
-            case x if type(x) in Array.types:
+            case Array():
                 return type(self)(xs-xo for xs, xo in zip(self.components, other))
             case VectorBase():
                 return type(self)(xs-xo for xs, xo in zip(self.components, other.components))
@@ -93,23 +93,23 @@ class VectorBase:
         match other:
             case VectorBase():
                 return sum(list(c1*c2 for c1,c2 in zip(self, other)), axis=0)
-            case x if type(x) in Number.types:
+            case Number():
                 return type(self)(c*other for c in self)
-            case x if type(x) in Array.types:
+            case Array():
                 return type(self)(c1*c2 for c1, c2 in zip(self, other))
     def __truediv__(self, other) -> Self:
         match other:
             case VectorBase():
                 return Vector(c1 / c2 for c1, c2 in zip(self, other))
-            case x if type(x) in Number.types:
+            case Number():
                 return type(self)(c / other for c in self)
-            case x if type(x) in Array.types:
+            case Array():
                 return type(self)(c1 / c2 for c1, c2 in zip(self, other))
     def __floordiv__(self, other) -> Self:
         match other:
-            case x if type(x) in Number.types:
+            case Number():
                 return type(self)(c//other for c in self)
-            case x if type(x) in Array.types:
+            case Array():
                 return type(self)(c1//c2 for c1, c2 in zip(self, other))
     def __radd__(self, other) -> Self:
         match other:
@@ -125,15 +125,15 @@ class VectorBase:
             case _: return self.__mul__(other)
     def __rtruediv__(self, other) -> Self:
         match other:
-            case x if type(x) in Number.types:
+            case Number():
                 return type(self)(other/c for c in self)
-            case x if type(x) in Array.types:
+            case Array():
                 return type(self)(c2/c1 for c1, c2 in zip(self, other))
     def __rfloordiv__(self, other) -> Self:
         match other:
-            case x if type(x) in Number.types:
+            case Number():
                 return type(self)(other//c for c in self)
-            case x if type(x) in Array.types:
+            case Array():
                 return type(self)(c2//c1 for c1, c2 in zip(self, other))
 class Vector(VectorBase):
     def __new__(cls, *components) -> Self: # the vector factory
@@ -145,7 +145,7 @@ class Vector(VectorBase):
             case (Generator(),):
                 return Vector(tuple(components[0]))
             # single array
-            case (x,) if type(x) in Array.types:
+            case (Array(),):
                 return Vector(*x)
             # 2D
             case (x, y):