diff options
| author | Thouis (Ray) Jones <thouis@gmail.com> | 2012-07-06 23:42:57 +0200 |
|---|---|---|
| committer | Thouis (Ray) Jones <thouis@gmail.com> | 2012-07-06 23:42:57 +0200 |
| commit | aeff403ff868e822ebebdb8e6fb02055cd6ccf5b (patch) | |
| tree | 8022d135b2154b2a90366704addb99442fba1993 /numpy/polynomial/laguerre.py | |
| parent | 5b5a0f4999dfac66c9c27160737352c727a3517b (diff) | |
| parent | 3b9a0fea12ae89fe6ce745d9af0beb3df17260b8 (diff) | |
| download | numpy-aeff403ff868e822ebebdb8e6fb02055cd6ccf5b.tar.gz | |
Merge remote-tracking branch 'upstream/master' into malloc_hooks
Diffstat (limited to 'numpy/polynomial/laguerre.py')
| -rw-r--r-- | numpy/polynomial/laguerre.py | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/numpy/polynomial/laguerre.py b/numpy/polynomial/laguerre.py index 4401b5414..3533343b0 100644 --- a/numpy/polynomial/laguerre.py +++ b/numpy/polynomial/laguerre.py @@ -1225,9 +1225,8 @@ def lagvander(x, deg) : x = np.array(x, copy=0, ndmin=1) + 0.0 dims = (ideg + 1,) + x.shape - mask = x.flags.maskna dtyp = x.dtype - v = np.empty(dims, dtype=dtyp, maskna=mask) + v = np.empty(dims, dtype=dtyp) v[0] = x*0 + 1 if ideg > 0 : v[1] = 1 - x @@ -1515,16 +1514,6 @@ def lagfit(x, y, deg, rcond=None, full=False, w=None): lhs = lhs * w rhs = rhs * w - # deal with NA. Note that polyvander propagates NA from x - # into all columns, that is rows for transposed form. - if lhs.flags.maskna or rhs.flags.maskna: - if rhs.ndim == 1: - mask = np.isna(lhs[0]) | np.isna(rhs) - else: - mask = np.isna(lhs[0]) | np.isna(rhs).any(0) - np.copyto(lhs, 0, where=mask) - np.copyto(rhs, 0, where=mask) - # set rcond if rcond is None : rcond = len(x)*np.finfo(x.dtype).eps |