los speedup

Author: scivision

pyproject.toml

@@ -41,4 +41,4 @@ full = [
 line-length = 100
 
 [tool.pytest.ini_options]
-addopts = "-ra -v"
+addopts = "-ra"

scripts/benchmark_vincenty.py

@@ -31,7 +31,7 @@ def bench_vreckon(N: int) -> float:
     az = np.random.random(N)
 
     tic = time.monotonic()
-    a, b = vreckon(*ll0, sr, az)
+    a, b = vreckon(ll0[0], ll0[1], sr, az)
 
     return time.monotonic() - tic
 
@@ -41,7 +41,7 @@ def bench_vdist(N: int) -> float:
     lon = np.random.random(N)
 
     tic = time.monotonic()
-    asr, aaz = vdist(*ll0, lat, lon)
+    asr, aaz = vdist(ll0[0], ll0[1], lat, lon)
 
     return time.monotonic() - tic
 

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pymap3d
-version = 2.5.1
+version = 2.6.0
 author = Michael Hirsch, Ph.D.
 author_email = [email protected]
 description = pure Python (no prereqs) coordinate conversions, following convention of several popular Matlab routines.

src/pymap3d/aer.py

@@ -23,9 +23,9 @@ def ecef2aer(
     x: ndarray,
     y: ndarray,
     z: ndarray,
-    lat0: float,
-    lon0: float,
-    h0: float,
+    lat0: ndarray,
+    lon0: ndarray,
+    h0: ndarray,
     ell: Ellipsoid = None,
     deg: bool = True,
 ) -> tuple[ndarray, ndarray, ndarray]:
@@ -72,9 +72,9 @@ def geodetic2aer(
     lat: ndarray,
     lon: ndarray,
     h: ndarray,
-    lat0: float,
-    lon0: float,
-    h0: float,
+    lat0: ndarray,
+    lon0: ndarray,
+    h0: ndarray,
     ell: Ellipsoid = None,
     deg: bool = True,
 ) -> tuple[ndarray, ndarray, ndarray]:
@@ -117,15 +117,15 @@ def geodetic2aer(
 
 
 def aer2geodetic(
-    az: float,
-    el: float,
-    srange: float,
-    lat0: float,
-    lon0: float,
-    h0: float,
+    az: ndarray,
+    el: ndarray,
+    srange: ndarray,
+    lat0: ndarray,
+    lon0: ndarray,
+    h0: ndarray,
     ell: Ellipsoid = None,
     deg: bool = True,
-) -> tuple[float | ndarray, float | ndarray, float | ndarray]:
+) -> tuple[ndarray, ndarray, ndarray]:
     """
     gives geodetic coordinates of a point with az, el, range
     from an observer at lat0, lon0, h0
@@ -167,12 +167,12 @@ def aer2geodetic(
 
 
 def eci2aer(
-    x: float,
-    y: float,
-    z: float,
-    lat0: float,
-    lon0: float,
-    h0: float,
+    x: ndarray,
+    y: ndarray,
+    z: ndarray,
+    lat0: ndarray,
+    lon0: ndarray,
+    h0: ndarray,
     t: datetime,
     *,
     deg: bool = True,
@@ -221,18 +221,18 @@ def eci2aer(
 
 
 def aer2eci(
-    az: float,
-    el: float,
-    srange: float,
-    lat0: float,
-    lon0: float,
-    h0: float,
+    az: ndarray,
+    el: ndarray,
+    srange: ndarray,
+    lat0: ndarray,
+    lon0: ndarray,
+    h0: ndarray,
     t: datetime,
     ell=None,
     *,
     deg: bool = True,
     use_astropy: bool = True
-) -> tuple[float | ndarray, float | ndarray, float | ndarray]:
+) -> tuple[ndarray, ndarray, ndarray]:
     """
     gives ECI of a point from an observer at az, el, slant range
 
@@ -280,15 +280,15 @@ def aer2eci(
 
 
 def aer2ecef(
-    az: float,
-    el: float,
-    srange: float,
-    lat0: float,
-    lon0: float,
-    alt0: float,
+    az: ndarray,
+    el: ndarray,
+    srange: ndarray,
+    lat0: ndarray,
+    lon0: ndarray,
+    alt0: ndarray,
     ell: Ellipsoid = None,
     deg: bool = True,
-) -> tuple[float, float, float]:
+) -> tuple[ndarray, ndarray, ndarray]:
     """
     converts target azimuth, elevation, range from observer at lat0,lon0,alt0 to ECEF coordinates.
 

src/pymap3d/ecef.py

@@ -49,12 +49,12 @@
 
 
 def geodetic2ecef(
-    lat: float | ndarray,
-    lon: float | ndarray,
-    alt: float | ndarray,
+    lat: ndarray,
+    lon: ndarray,
+    alt: ndarray,
     ell: Ellipsoid = None,
     deg: bool = True,
-) -> tuple[float | ndarray, float | ndarray, float | ndarray]:
+) -> tuple[ndarray, ndarray, ndarray]:
     """
     point transformation from Geodetic of specified ellipsoid (default WGS-84) to ECEF
 
@@ -103,12 +103,12 @@ def geodetic2ecef(
 
 
 def ecef2geodetic(
-    x: float | ndarray,
-    y: float | ndarray,
-    z: float | ndarray,
+    x: ndarray,
+    y: ndarray,
+    z: ndarray,
     ell: Ellipsoid = None,
     deg: bool = True,
-) -> tuple[float | ndarray, float | ndarray, float | ndarray]:
+) -> tuple[ndarray, ndarray, ndarray]:
     """
     convert ECEF (meters) to geodetic coordinates
 
@@ -248,9 +248,9 @@ def ecef2enu(
     x: ndarray,
     y: ndarray,
     z: ndarray,
-    lat0: float,
-    lon0: float,
-    h0: float,
+    lat0: ndarray,
+    lon0: ndarray,
+    h0: ndarray,
     ell: Ellipsoid = None,
     deg: bool = True,
 ) -> tuple[ndarray, ndarray, ndarray]:
@@ -292,13 +292,13 @@ def ecef2enu(
 
 
 def enu2uvw(
-    east: float,
-    north: float,
-    up: float,
-    lat0: float,
-    lon0: float,
+    east: ndarray,
+    north: ndarray,
+    up: ndarray,
+    lat0: ndarray,
+    lon0: ndarray,
     deg: bool = True,
-) -> tuple[float, float, float]:
+) -> tuple[ndarray, ndarray, ndarray]:
     """
     Parameters
     ----------
@@ -332,7 +332,7 @@ def enu2uvw(
 
 
 def uvw2enu(
-    u: float, v: float, w: float, lat0: float, lon0: float, deg: bool = True
+    u: ndarray, v: ndarray, w: ndarray, lat0: ndarray, lon0: ndarray, deg: bool = True
 ) -> tuple[ndarray, ndarray, ndarray]:
     """
     Parameters
@@ -374,7 +374,7 @@ def eci2geodetic(
     *,
     deg: bool = True,
     use_astropy: bool = True
-) -> tuple[float | ndarray, float | ndarray, float | ndarray]:
+) -> tuple[ndarray, ndarray, ndarray]:
     """
     convert Earth Centered Internal ECI to geodetic coordinates
 
@@ -417,9 +417,9 @@ def eci2geodetic(
 
 
 def geodetic2eci(
-    lat: float | ndarray,
-    lon: float | ndarray,
-    alt: float | ndarray,
+    lat: ndarray,
+    lon: ndarray,
+    alt: ndarray,
     t: datetime,
     ell: Ellipsoid = None,
     *,
@@ -468,15 +468,15 @@ def geodetic2eci(
 
 
 def enu2ecef(
-    e1: float,
-    n1: float,
-    u1: float,
-    lat0: float,
-    lon0: float,
-    h0: float,
+    e1: ndarray,
+    n1: ndarray,
+    u1: ndarray,
+    lat0: ndarray,
+    lon0: ndarray,
+    h0: ndarray,
     ell: Ellipsoid = None,
     deg: bool = True,
-) -> tuple[float, float, float]:
+) -> tuple[ndarray, ndarray, ndarray]:
     """
     ENU to ECEF
 

src/pymap3d/enu.py

@@ -73,7 +73,9 @@ def enu2aer(
     return az, elev, slantRange
 
 
-def aer2enu(az: float, el: float, srange: float, deg: bool = True) -> tuple[float, float, float]:
+def aer2enu(
+    az: ndarray, el: ndarray, srange: float | ndarray, deg: bool = True
+) -> tuple[ndarray, ndarray, ndarray]:
     """
     Azimuth, Elevation, Slant range to target to East, North, Up
 
@@ -104,7 +106,7 @@ def aer2enu(az: float, el: float, srange: float, deg: bool = True) -> tuple[floa
     try:
         if (asarray(srange) < 0).any():
             raise ValueError("Slant range  [0, Infinity)")
-    except UnboundLocalError:
+    except NameError:
         if srange < 0:
             raise ValueError("Slant range  [0, Infinity)")
 
@@ -114,15 +116,15 @@ def aer2enu(az: float, el: float, srange: float, deg: bool = True) -> tuple[floa
 
 
 def enu2geodetic(
-    e: float,
-    n: float,
-    u: float,
-    lat0: float,
-    lon0: float,
-    h0: float,
+    e: ndarray,
+    n: ndarray,
+    u: ndarray,
+    lat0: ndarray,
+    lon0: ndarray,
+    h0: ndarray,
     ell: Ellipsoid = None,
     deg: bool = True,
-) -> tuple[float | ndarray, float | ndarray, float | ndarray]:
+) -> tuple[ndarray, ndarray, ndarray]:
     """
     East, North, Up to target to geodetic coordinates
 
@@ -165,9 +167,9 @@ def geodetic2enu(
     lat: ndarray,
     lon: ndarray,
     h: ndarray,
-    lat0: float,
-    lon0: float,
-    h0: float,
+    lat0: ndarray,
+    lon0: ndarray,
+    h0: ndarray,
     ell: Ellipsoid = None,
     deg: bool = True,
 ) -> tuple[ndarray, ndarray, ndarray]: