speed by removing unneeded explicit broadcasts

Author: scivision

src/pymap3d/eci.py

@@ -60,7 +60,7 @@ def eci2ecef(
     else:
         raise ImportError("eci2ecef requires either Numpy or Astropy")
 
-    return xe.squeeze()[()], ye.squeeze()[()], ze.squeeze()[()]
+    return xe, ye, ze
 
 
 def eci2ecef_astropy(
@@ -89,23 +89,15 @@ def eci2ecef_numpy(x, y, z, t: datetime) -> tuple:
     see eci2ecef() for description
     """
 
-    x = np.atleast_1d(x)
-    y = np.atleast_1d(y)
-    z = np.atleast_1d(z)
-    gst = np.atleast_1d(greenwichsrt(juliandate(t)))
-    assert x.shape == y.shape == z.shape
-    if gst.size == 1 and x.size != 1:
-        gst = np.broadcast_to(gst, x.shape[0])
-    assert x.size == gst.size
+    gst = greenwichsrt(juliandate(t))
 
     c = np.cos(gst)
     s = np.sin(gst)
 
-    x_ecef = (c * x.ravel() + s * y.ravel()).reshape(x.shape)
-    y_ecef = (-s * x.ravel() + c * y.ravel()).reshape(y.shape)
-    z_ecef = z.reshape(z.shape)
+    x_ecef = c * x + s * y
+    y_ecef = -s * x + c * y
 
-    return x_ecef.squeeze()[()], y_ecef.squeeze()[()], z_ecef.squeeze()[()]
+    return x_ecef, y_ecef, z
 
 
 def ecef2eci(
@@ -168,21 +160,13 @@ def ecef2eci_numpy(x, y, z, t: datetime) -> tuple:
     """ecef2eci using Numpy
     see ecef2eci() for description
     """
-    x = np.atleast_1d(x)
-    y = np.atleast_1d(y)
-    z = np.atleast_1d(z)
-    gst = np.atleast_1d(greenwichsrt(juliandate(t)))
 
-    assert x.shape == y.shape == z.shape
-    if gst.size == 1 and x.size != 1:
-        gst = np.broadcast_to(gst, x.shape[0])
-    assert x.size == gst.size
+    gst = greenwichsrt(juliandate(t))
 
     c = np.cos(gst)
     s = np.sin(gst)
 
-    x_eci = (c * x.ravel() - s * y.ravel()).reshape(x.shape)
-    y_eci = (s * x.ravel() + c * y.ravel()).reshape(y.shape)
-    z_eci = z.reshape(z.shape)
+    x_eci = c * x - s * y
+    y_eci = s * x + c * y
 
-    return x_eci.squeeze()[()], y_eci.squeeze()[()], z_eci.squeeze()[()]
+    return x_eci, y_eci, z

src/pymap3d/tests/test_vincenty.py

@@ -10,8 +10,8 @@ def test_track2_unit(deg):
 
     lat1, lon1 = 0.0, 80.0
     lat2, lon2 = 0.0, 81.0
-    lat0 = [0.0, 0.0, 0.0, 0.0]
-    lon0 = [80.0, 80.33333, 80.66666, 81.0]
+    lat0 = np.array([0.0, 0.0, 0.0, 0.0])
+    lon0 = np.array([80.0, 80.33333, 80.66666, 81.0])
     if not deg:
         lat1, lon1, lat2, lon2 = np.radians((lat1, lon1, lat2, lon2))
         lat0 = np.radians(lat0)

src/pymap3d/tests/test_vincenty_dist.py

@@ -31,8 +31,10 @@ def test_unit_vdist(lat, lon, lat1, lon1, srange, az):
 
 
 def test_vector():
-    pytest.importorskip("numpy")
-    asr, aaz = vincenty.vdist(10, 20, [10.02137267, 10.01917819], [20.0168471, 20.0193493])
+    np = pytest.importorskip("numpy")
+    lat2 = np.array([10.02137267, 10.01917819])
+    lon2 = np.array([20.0168471, 20.0193493])
+    asr, aaz = vincenty.vdist(10, 20, lat2, lon2)
 
     assert 3e3 == approx(asr)
     assert aaz == approx([38, 45])

src/pymap3d/tests/test_vincenty_vreckon.py

@@ -44,14 +44,18 @@ def test_vreckon_unit(deg, lat, lon, srange, az, lato, lono):
 
 
 def test_az_vector():
-    pytest.importorskip("numpy")
-    a, b = vincenty.vreckon(*ll0, sr1[0], az1)
+    np =pytest.importorskip("numpy")
+    az = np.array(az1)
+    a, b = vincenty.vreckon(*ll0, sr1[0], az)
     assert a == approx(lat2)
     assert b == approx(lon2)
 
 
 def test_both_vector():
-    pytest.importorskip("numpy")
-    a, b = vincenty.vreckon(10, 20, sr1, az1)
+    np = pytest.importorskip("numpy")
+    sr = np.array(sr1)
+    az = np.array(az1)
+
+    a, b = vincenty.vreckon(10, 20, sr, az)
     assert a == approx(lat3)
     assert b == approx(lon3)

src/pymap3d/vincenty.py

@@ -10,11 +10,6 @@
 from copy import copy
 from math import nan, pi, tau
 
-try:
-    from numpy import atleast_1d
-except ImportError:
-    pass
-
 from .ellipsoid import Ellipsoid
 from .mathfun import (
     asin,
@@ -106,15 +101,6 @@ def vdist(Lat1, Lon1, Lat2, Lon2, ell: Ellipsoid | None = None, deg: bool = True
      12. No warranties; use at your own risk.
     """
 
-    # %% Input check:
-    try:
-        Lat1 = atleast_1d(Lat1)
-        Lon1 = atleast_1d(Lon1)
-        Lat2 = atleast_1d(Lat2)
-        Lon2 = atleast_1d(Lon2)
-    except NameError:
-        pass
-
     if ell is None:
         ell = Ellipsoid.from_name("wgs84")
     # %% Supply WGS84 earth ellipsoid axis lengths in meters:
@@ -141,13 +127,14 @@ def vdist(Lat1, Lon1, Lat2, Lon2, ell: Ellipsoid | None = None, deg: bool = True
     try:
         i = abs(pi / 2 - abs(lat1)) < 1e-10
         lat1[i] = sign(lat1[i]) * (pi / 2 - 1e-10)
-
-        i = abs(pi / 2 - abs(lat2)) < 1e-10
-        lat2[i] = sign(lat2[i]) * (pi / 2 - 1e-10)
     except TypeError:
         if abs(pi / 2 - abs(lat1)) < 1e-10:
             lat1 = sign(lat1) * (pi / 2 - 1e-10)
 
+    try:
+        i = abs(pi / 2 - abs(lat2)) < 1e-10
+        lat2[i] = sign(lat2[i]) * (pi / 2 - 1e-10)
+    except TypeError:
         if abs(pi / 2 - abs(lat2)) < 1e-10:
             lat2 = sign(lat2) * (pi / 2 - 1e-10)
 
@@ -345,13 +332,9 @@ def vreckon(Lat1, Lon1, Rng, Azim, ell: Ellipsoid | None = None, deg: bool = Tru
     """
 
     try:
-        Lat1 = atleast_1d(Lat1)
-        Lon1 = atleast_1d(Lon1)
-        Rng = atleast_1d(Rng)
-        Azim = atleast_1d(Azim)
         if (Rng < 0.0).any():
             raise ValueError("Ground distance must be positive")
-    except NameError:
+    except AttributeError:
         if Rng < 0.0:
             raise ValueError("Ground distance must be positive")