pygeodesy 24.9.9__py2.py3-none-any.whl → 24.9.29__py2.py3-none-any.whl

pygeodesy/fmath.py

@@ -10,11 +10,11 @@ from pygeodesy.basics import _copysign, copysign0, isbool, isint, isscalar, \
                               len2, map1, _xiterable
 from pygeodesy.constants import EPS0, EPS02, EPS1, NAN, PI, PI_2, PI_4, \
                                _0_0, _0_125, _1_6th, _0_25, _1_3rd, _0_5, _1_0, \
-                               _N_1_0, _1_5, _copysign_0_0, _isfinite, remainder
+                               _N_1_0, _1_5, _copysign_0_0, isfinite, remainder
 from pygeodesy.errors import _IsnotError, LenError, _TypeError, _ValueError, \
-                             _xError, _xkwds_get1, _xkwds_pop2
-from pygeodesy.fsums import _2float, Fsum, fsum, fsum1_, _isFsumTuple, _1primed, \
-                            Fmt, unstr
+                             _xError, _xkwds_get1, _xkwds_pop2, _xsError
+from pygeodesy.fsums import _2float, Fsum, fsum, fsum1_, _isFsum_2Tuple, \
+                            _1primed, _Psum_,  Fmt, unstr
 from pygeodesy.interns import MISSING, _negative_, _not_scalar_
 from pygeodesy.lazily import _ALL_LAZY, _sys_version_info2
 # from pygeodesy.streprs import Fmt, unstr  # from .fsums
@@ -24,7 +24,7 @@ from math import fabs, sqrt  # pow
 import operator as _operator  # in .datums, .trf, .utm
 
 __all__ = _ALL_LAZY.fmath
-__version__ = '24.09.09'
+__version__ = '24.09.29'
 
 # sqrt(2) - 1 <https://WikiPedia.org/wiki/Square_root_of_2>
 _0_4142  =  0.41421356237309504880  # ... ~ 3730904090310553 / 9007199254740992
@@ -262,7 +262,7 @@ def cbrt(x):
 
        @see: Functions L{cbrt2} and L{sqrt3}.
     '''
-    if _isFsumTuple(x):
+    if _isFsum_2Tuple(x):
         r = abs(x).fpow(_1_3rd)
         if x.signOf() < 0:
             r = -r
@@ -280,7 +280,7 @@ def cbrt2(x):  # PYCHOK attr
 
        @see: Functions L{cbrt} and L{sqrt3}.
     '''
-    return abs(x).fpow(_2_3rd) if _isFsumTuple(x) else _cbrt(x**2)
+    return abs(x).fpow(_2_3rd) if _isFsum_2Tuple(x) else _cbrt(x**2)
 
 
 def euclid(x, y):
@@ -431,8 +431,9 @@ def fdot(a, *b):
 
        @raise LenError: Unequal C{len(B{a})} and C{len(B{b})}.
 
-       @see: Class L{Fdot} and U{Algorithm 5.10 B{DotK}
-             <https://www.TUHH.De/ti3/paper/rump/OgRuOi05.pdf>}.
+       @see: Class L{Fdot}, U{Algorithm 5.10 B{DotK}
+             <https://www.TUHH.De/ti3/paper/rump/OgRuOi05.pdf>} and function
+             C{math.sumprod} in Python 3.12 and later.
     '''
     return fsum(_map_mul(a, b, fdot))
 
@@ -544,16 +545,20 @@ def fidw(xs, ds, beta=2):
     return x
 
 
-def fma(x, y, z):
-    '''Fused-multiply-add, as C{math.fma(x, y, z)} from Python 3.13+.
+def fma(x, y, z, **nonfinites):
+    '''Fused-multiply-add, using C{math.fma(x, y, z)} in Python 3.13+
+       or an equivalent implementation.
 
-       @arg x: A C{scalar}, an L{Fsum} or L{Fsum2Tuple} instance.
-       @arg y: A C{scalar}, an L{Fsum} or L{Fsum2Tuple} instance.
-       @arg z: A C{scalar}, an L{Fsum} or L{Fsum2Tuple} instance.
+       @arg x: Multiplicand (C{scalar}, an L{Fsum} or L{Fsum2Tuple}).
+       @arg y: Multiplier (C{scalar}, an L{Fsum} or L{Fsum2Tuple}).
+       @arg z: Addend (C{scalar}, an L{Fsum} or L{Fsum2Tuple}).
+       @kwarg nonfinites: Use C{B{nonfinites}=True} or C{=False}, to
+                          override default L{nonfiniterrors} (C{bool}),
+                          see L{Fsum<Fsum.__init__>},
 
-       @return: C{(x * y) + z} (C{float} or an L{Fsum}).
+       @return: C{(x * y) + z} (L{Fsum} or C{float}).
     '''
-    return Fsum(x).fma(y, z).as_iscalar
+    return _Psum_(x).fma(y, z, **nonfinites).as_iscalar
 
 
 def fmean(xs):
@@ -581,6 +586,22 @@ def fmean_(*xs):
     return fmean(xs)
 
 
+def f2mul_(x, *ys, **nonfinites):
+    '''Cascaded, accurate multiplication C{B{x} * B{y} * B{y} ...} for all B{C{ys}}.
+
+       @arg x: Multiplicand (C{scalar}, an L{Fsum} or L{Fsum2Tuple}).
+       @arg ys: Multipliers (each C{scalar}, an L{Fsum} or L{Fsum2Tuple}), all
+                positional.
+       @kwarg nonfinites: Use C{B{nonfinites}=True} or C{=False}, to override default
+                          L{nonfiniterrors} (C{bool}), see L{Fsum<Fsum.__init__>}.
+
+       @return: The cascaded I{TwoProduct} (L{Fsum}, C{float} or C{int}).
+
+       @see: U{Equations 2.3<https://www.TUHH.De/ti3/paper/rump/OzOgRuOi06.pdf>}
+    '''
+    return _Psum_(x).f2mul_(*ys, **nonfinites).as_iscalar
+
+
 def fpolynomial(x, *cs, **over):
     '''Evaluate the polynomial M{sum(cs[i] * x**i for i=0..len(cs))
        [/ over]}.
@@ -615,7 +636,7 @@ def fpowers(x, n, alts=0):
     elif n < 1:
         raise _ValueError(n=n)
 
-    p  = x if isint(x) or _isFsumTuple(x) else _2float(x=x)
+    p  = x if isscalar(x) or _isFsum_2Tuple(x) else _2float(x=x)
     ps = tuple(_powers(p, n))
 
     if alts > 0:  # x**2, x**4, ...
@@ -752,7 +773,7 @@ def fremainder(x, y):
     # On Windows 32-bit with python 2.7, math.fmod(-0.0, 360)
     # == +0.0.  This fixes this bug.  See also Math::AngNormalize
     # in the C++ library, Math.sincosd has a similar fix.
-    if _isfinite(x):
+    if isfinite(x):
         try:
             r = remainder(x, y) if x else x
         except Exception as e:
@@ -818,7 +839,7 @@ def hypot1(x):
 
        @return: Norm (C{float}).
     '''
-    if _isFsumTuple(x):
+    if _isFsum_2Tuple(x):
         h = float(Fhypot(_1_0, x)) if x else _1_0
     else:
         h = hypot(_1_0, x) if x else _1_0
@@ -916,13 +937,14 @@ def norm_(*xs):
               or zero norm.
     '''
     try:
-        i  = x = h = None
+        i  = h = None
+        x  = xs
         h  = hypot_(*xs)
         _h = (_1_0 / h) if h else _0_0
         for i, x in enumerate(xs):
             yield x * _h
     except Exception as X:
-        raise _xError(X, Fmt.SQUARE(xs=i), x, h=h)
+        raise _xsError(X, xs, i, x, h=h)
 
 
 def _powers(x, n):

pygeodesy/formy.py

@@ -6,6 +6,7 @@ u'''Formulary of basic geodesy functions and approximations.
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
+# from pygeodesy.basics import W_args_kwds_count2
 # from pygeodesy.cartesianBase import CartesianBase  # _MODS
 from pygeodesy.constants import EPS, EPS0, EPS1, PI, PI2, PI3, PI_2, R_M, \
                                _0_0s, float0_, isnon0, remainder, _umod_PI2, \
@@ -42,7 +43,7 @@ from contextlib import contextmanager
 from math import asin, atan, atan2, cos, degrees, fabs, radians, sin, sqrt  # pow
 
 __all__ = _ALL_LAZY.formy
-__version__ = '24.07.29'
+__version__ = '24.09.27'
 
 _RADIANS2 = (PI / _180_0)**2  # degrees- to radians-squared
 _ratio_   = 'ratio'

pygeodesy/fstats.py

@@ -10,9 +10,10 @@ from __future__ import division as _; del _  # PYCHOK semicolon
 from pygeodesy.basics import isscalar, isodd, _xinstanceof, \
                             _xiterable, _xsubclassof, _zip
 from pygeodesy.constants import _0_0, _1_0, _2_0, _3_0, _4_0, _6_0
-from pygeodesy.errors import _AssertionError, _ValueError, _xError
+from pygeodesy.errors import _ValueError, _xError, _xkwds_item2, \
+                             _xsError
 from pygeodesy.fmath import Fsqrt,  Fmt
-from pygeodesy.fsums import _2finite, Fsum, _iadd_op_, _isFsumTuple
+from pygeodesy.fsums import _2finite, Fsum, _iadd_op_, _isFsum_2Tuple
 from pygeodesy.interns import _odd_, _SPACE_
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY
 from pygeodesy.named import _name__, _Named, _NotImplemented, \
@@ -21,24 +22,19 @@ from pygeodesy.named import _name__, _Named, _NotImplemented, \
 # from pygeodesy.streprs import Fmt  # from .fmath
 
 __all__ = _ALL_LAZY.fstats
-__version__ = '24.05.21'
+__version__ = '24.09.28'
 
 
 def _2Floats(**xs):
-    '''(INTERNAL) Yield each value as C{float} or L{Fsum}.
+    '''(INTERNAL) Yield all C{xs} as C{float} or L{Fsum}.
     '''
+    name, xs = _xkwds_item2(xs)
     try:
-        name, xs = xs.popitem()
-    except Exception as X:
-        raise _AssertionError(xs=xs, cause=X)
-
-    try:
-        i = None
+        i, x = None, xs
         for i, x in enumerate(_xiterable(xs)):  # don't unravel Fsums
-            yield x._Fsum if _isFsumTuple(x) else _2finite(x)
+            yield x._Fsum if _isFsum_2Tuple(x) else _2finite(x)
     except Exception as X:
-        raise _xError(X, name, xs) if i is None else \
-              _xError(X, Fmt.INDEX(name, i), x)
+        raise _xsError(X, xs, i, x, name)
 
 
 def _sampled(n, sample):
@@ -190,7 +186,7 @@ class _FstatsBase(_FstatsNamed):
         '''(INTERNAL) Add one or several values.
         '''
         try:
-            if _isFsumTuple(other):
+            if _isFsum_2Tuple(other):
                 self.fadd_(other._Fsum)
             elif isscalar(other):
                 self.fadd_(_2finite(other))