pygeodesy 24.9.29__py2.py3-none-any.whl → 24.10.10__py2.py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {PyGeodesy-24.9.29.dist-info → PyGeodesy-24.10.10.dist-info}/METADATA +9 -9
- {PyGeodesy-24.9.29.dist-info → PyGeodesy-24.10.10.dist-info}/RECORD +12 -12
- pygeodesy/__init__.py +10 -9
- pygeodesy/errors.py +11 -6
- pygeodesy/fmath.py +185 -173
- pygeodesy/fstats.py +54 -56
- pygeodesy/fsums.py +283 -255
- pygeodesy/internals.py +1 -0
- pygeodesy/streprs.py +7 -4
- pygeodesy/vector3d.py +5 -5
- {PyGeodesy-24.9.29.dist-info → PyGeodesy-24.10.10.dist-info}/WHEEL +0 -0
- {PyGeodesy-24.9.29.dist-info → PyGeodesy-24.10.10.dist-info}/top_level.txt +0 -0
pygeodesy/internals.py
CHANGED
pygeodesy/streprs.py
CHANGED
|
@@ -22,7 +22,7 @@ from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _dunder_nameof
|
|
|
22
22
|
from math import fabs, log10 as _log10
|
|
23
23
|
|
|
24
24
|
__all__ = _ALL_LAZY.streprs
|
|
25
|
-
__version__ = '24.
|
|
25
|
+
__version__ = '24.10.04'
|
|
26
26
|
|
|
27
27
|
_at_ = 'at' # PYCHOK used!
|
|
28
28
|
_EN_PREC = 6 # max MGRS/OSGR precision, 1 micrometer
|
|
@@ -545,13 +545,16 @@ def unstr(where, *args, **kwds_):
|
|
|
545
545
|
|
|
546
546
|
@return: Representation (C{str}).
|
|
547
547
|
'''
|
|
548
|
-
def _C_e_g_kwds3(_Cdot=None, _ELLIPSIS=
|
|
548
|
+
def _C_e_g_kwds3(_Cdot=None, _ELLIPSIS=0, _fmt=Fmt.g, **kwds):
|
|
549
549
|
return _Cdot, _ELLIPSIS, _fmt, kwds
|
|
550
550
|
|
|
551
551
|
C, e, g, kwds = _C_e_g_kwds3(**kwds_)
|
|
552
|
-
|
|
553
|
-
|
|
552
|
+
if e and len(args) > (e + 1):
|
|
553
|
+
t = reprs(args[:e], fmt=g)
|
|
554
554
|
t += _ELLIPSIS_,
|
|
555
|
+
t += reprs(args[-1:], fmt=g)
|
|
556
|
+
else:
|
|
557
|
+
t = reprs(args, fmt=g) if args else ()
|
|
555
558
|
if kwds:
|
|
556
559
|
t += pairs(itemsorted(kwds), fmt=g)
|
|
557
560
|
n = where if isstr(where) else _dunder_nameof(where) # _NN_
|
pygeodesy/vector3d.py
CHANGED
|
@@ -11,9 +11,9 @@ from pygeodesy.constants import EPS, EPS0, EPS1, EPS4, INT0, isnear0, \
|
|
|
11
11
|
_0_0, _1_0
|
|
12
12
|
from pygeodesy.errors import IntersectionError, _ValueError, VectorError, \
|
|
13
13
|
_xattr, _xError, _xkwds, _xkwds_get, _xkwds_item2
|
|
14
|
-
from pygeodesy.fmath import euclid, fabs, fdot, hypot, sqrt
|
|
15
|
-
# from pygeodesy.fsums import fsum1_ # from
|
|
16
|
-
# from pygeodesy.formy import _radical2 #
|
|
14
|
+
from pygeodesy.fmath import euclid, fabs, fdot, hypot, sqrt
|
|
15
|
+
# from pygeodesy.fsums import fsum1_ # from _MODS
|
|
16
|
+
# from pygeodesy.formy import _radical2 # _MODS
|
|
17
17
|
from pygeodesy.interns import _COMMA_, _concentric_, _intersection_, \
|
|
18
18
|
_near_, _negative_, _no_, _too_
|
|
19
19
|
from pygeodesy.iters import PointsIter, Fmt
|
|
@@ -31,7 +31,7 @@ from pygeodesy.vector3dBase import Vector3dBase
|
|
|
31
31
|
# from math import fabs, sqrt # from .fmath
|
|
32
32
|
|
|
33
33
|
__all__ = _ALL_LAZY.vector3d
|
|
34
|
-
__version__ = '24.
|
|
34
|
+
__version__ = '24.10.01'
|
|
35
35
|
|
|
36
36
|
_vector2d = _MODS.into(vector2d=__name__)
|
|
37
37
|
|
|
@@ -595,7 +595,7 @@ def _intersects2(center1, r1, center2, r2, sphere=True, too_d=None, # in Cartes
|
|
|
595
595
|
if d < max(r2 - r1, EPS):
|
|
596
596
|
raise IntersectionError(_near_(_concentric_)) # XXX ConcentricError?
|
|
597
597
|
|
|
598
|
-
o = fsum1_(-d, r1, r2) # overlap == -(d - (r1 + r2))
|
|
598
|
+
o = _MODS.fsums.fsum1_(-d, r1, r2) # overlap == -(d - (r1 + r2))
|
|
599
599
|
# compute intersections with c1 at (0, 0) and c2 at (d, 0), like
|
|
600
600
|
# <https://MathWorld.Wolfram.com/Circle-CircleIntersection.html>
|
|
601
601
|
if o > EPS: # overlapping, r1, r2 == R, r
|
|
File without changes
|
|
File without changes
|