diff options
Diffstat (limited to 'numpy/lib')
| -rw-r--r-- | numpy/lib/getlimits.py | 4 | ||||
| -rw-r--r-- | numpy/lib/polynomial.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/numpy/lib/getlimits.py b/numpy/lib/getlimits.py index 297ef9b36..d03f000c1 100644 --- a/numpy/lib/getlimits.py +++ b/numpy/lib/getlimits.py @@ -80,9 +80,9 @@ class finfo(object): setattr(self,word,getattr(machar, word)) for word in ['tiny','resolution','epsneg']: setattr(self,word,getattr(machar, word).squeeze()) - self.max = machar.huge.squeeze() + self.max = machar.huge.flat[0] self.min = -self.max - self.eps = machar.epsilon.squeeze() + self.eps = machar.eps.flat[0] self.nexp = machar.iexp self.nmant = machar.it self.machar = machar diff --git a/numpy/lib/polynomial.py b/numpy/lib/polynomial.py index 58da84edd..a1de6389f 100644 --- a/numpy/lib/polynomial.py +++ b/numpy/lib/polynomial.py @@ -11,14 +11,14 @@ import warnings import numpy.core.numeric as NX from numpy.core import isscalar, abs -from numpy.lib.machar import MachAr +from numpy.lib.getlimits import finfo from numpy.lib.twodim_base import diag, vander from numpy.lib.shape_base import hstack, atleast_1d from numpy.lib.function_base import trim_zeros, sort_complex eigvals = None lstsq = None -_single_eps = MachAr(NX.single).eps -_double_eps = MachAr(NX.double).eps +_single_eps = finfo(NX.single).eps +_double_eps = finfo(NX.double).eps class RankWarning(UserWarning): """Issued by polyfit when Vandermonde matrix is rank deficient. |