pygeodesy 24.9.24__py2.py3-none-any.whl → 24.10.10__py2.py3-none-any.whl

pygeodesy/internals.py

@@ -1,3 +1,4 @@
+
 # -*- coding: utf-8 -*-
 
 u'''Mostly INTERNAL functions, except L{machine}, L{print_} and L{printf}.

pygeodesy/streprs.py

@@ -22,7 +22,7 @@ from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS,  _dunder_nameof
 from math import fabs, log10 as _log10
 
 __all__ = _ALL_LAZY.streprs
-__version__ = '24.08.13'
+__version__ = '24.10.04'
 
 _at_        = 'at'         # PYCHOK used!
 _EN_PREC    =  6           # max MGRS/OSGR precision, 1 micrometer
@@ -535,26 +535,36 @@ def strs(objs, prec=6, fmt=Fmt.F, ints=False):
     return tuple(_streprs(prec, objs, fmt, ints, False, str)) if objs else ()
 
 
-def unstr(where, *args, **kwds):
+def unstr(where, *args, **kwds_):
     '''Return the string representation of an invokation.
 
        @arg where: Class, function, method (C{type}) or name (C{str}).
        @arg args: Optional positional arguments.
-       @kwarg kwds: Optional keyword arguments, except C{B{_fmt}=Fmt.g}
-                    and C{B{_ELLIPSIS}=False}.
+       @kwarg kwds_: Optional keyword arguments, except C{B{_Cdot}=None},
+                     C{B{_ELLIPSIS}=False} and C{B{_fmt}=Fmt.g}.
 
        @return: Representation (C{str}).
     '''
-    def _e_g_kwds3(_ELLIPSIS=False, _fmt=Fmt.g, **kwds):
-        return _ELLIPSIS, _fmt, kwds
+    def _C_e_g_kwds3(_Cdot=None, _ELLIPSIS=0, _fmt=Fmt.g, **kwds):
+        return _Cdot, _ELLIPSIS, _fmt, kwds
 
-    e, g, kwds = _e_g_kwds3(**kwds)
-    t = reprs(args, fmt=g) if args else ()
-    if e:
+    C, e, g, kwds = _C_e_g_kwds3(**kwds_)
+    if e and len(args) > (e + 1):
+        t  =  reprs(args[:e], fmt=g)
         t += _ELLIPSIS_,
+        t +=  reprs(args[-1:], fmt=g)
+    else:
+        t  =  reprs(args, fmt=g) if args else ()
     if kwds:
         t += pairs(itemsorted(kwds), fmt=g)
     n = where if isstr(where) else _dunder_nameof(where)  # _NN_
+    if C and hasattr(C, n):
+        try:  # bound method of class C?
+            where = where.__func__
+        except AttributeError:
+            pass  # method of C?
+        if getattr(C, n, None) is where:
+            n = _DOT_(_dunder_nameof(C), n)
     return Fmt.PAREN(n, _COMMASPACE_.join(t))
 
 

pygeodesy/vector3d.py

@@ -11,9 +11,9 @@ from pygeodesy.constants import EPS, EPS0, EPS1, EPS4, INT0, isnear0, \
                                _0_0, _1_0
 from pygeodesy.errors import IntersectionError, _ValueError, VectorError, \
                             _xattr, _xError, _xkwds, _xkwds_get, _xkwds_item2
-from pygeodesy.fmath import euclid, fabs, fdot, hypot, sqrt,  fsum1_
-# from pygeodesy.fsums import fsum1_  # from .fmath
-# from pygeodesy.formy import _radical2  # in _intersects2 below
+from pygeodesy.fmath import euclid, fabs, fdot, hypot, sqrt
+# from pygeodesy.fsums import fsum1_  # from _MODS
+# from pygeodesy.formy import _radical2  # _MODS
 from pygeodesy.interns import _COMMA_, _concentric_, _intersection_, \
                               _near_, _negative_, _no_, _too_
 from pygeodesy.iters import PointsIter,  Fmt
@@ -31,7 +31,7 @@ from pygeodesy.vector3dBase import Vector3dBase
 # from math import fabs, sqrt  # from .fmath
 
 __all__ = _ALL_LAZY.vector3d
-__version__ = '24.08.18'
+__version__ = '24.10.01'
 
 _vector2d = _MODS.into(vector2d=__name__)
 
@@ -595,7 +595,7 @@ def _intersects2(center1, r1, center2, r2, sphere=True, too_d=None,  # in Cartes
     if d < max(r2 - r1, EPS):
         raise IntersectionError(_near_(_concentric_))  # XXX ConcentricError?
 
-    o = fsum1_(-d, r1, r2)  # overlap == -(d - (r1 + r2))
+    o = _MODS.fsums.fsum1_(-d, r1, r2)  # overlap == -(d - (r1 + r2))
     # compute intersections with c1 at (0, 0) and c2 at (d, 0), like
     # <https://MathWorld.Wolfram.com/Circle-CircleIntersection.html>
     if o > EPS:  # overlapping, r1, r2 == R, r