diff options
| author | Aditya Panchal <apanchal@bastula.org> | 2016-01-29 18:44:59 -0600 |
|---|---|---|
| committer | Aditya Panchal <apanchal@bastula.org> | 2016-01-29 18:44:59 -0600 |
| commit | 0e65b7166a6265a2047cb3ca47f487f3de19f0a6 (patch) | |
| tree | e473af69f29f1bfb987be14ca206a3130ddc2b2b /numpy/lib/function_base.py | |
| parent | e2805398f9a63b825f4a2aab22e9f169ff65aae9 (diff) | |
| download | numpy-0e65b7166a6265a2047cb3ca47f487f3de19f0a6.tar.gz | |
BUG: Fixed regressions in np.piecewise in ref to #5737 and #5729.
Added unit tests for these conditions.
Diffstat (limited to 'numpy/lib/function_base.py')
| -rw-r--r-- | numpy/lib/function_base.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py index a1048002c..6eff945b0 100644 --- a/numpy/lib/function_base.py +++ b/numpy/lib/function_base.py @@ -944,11 +944,15 @@ def piecewise(x, condlist, funclist, *args, **kw): condlist = condlist.T if n == n2 - 1: # compute the "otherwise" condition. totlist = np.logical_or.reduce(condlist, axis=0) - condlist = np.vstack([condlist, ~totlist]) + try: + condlist = np.vstack([condlist, ~totlist]) + except: + condlist = [asarray(c, dtype=bool) for c in condlist] + totlist = condlist[0] + for k in range(1, n): + totlist |= condlist[k] + condlist.append(~totlist) n += 1 - if (n != n2): - raise ValueError( - "function list and condition list must be the same") y = zeros(x.shape, x.dtype) for k in range(n): |