BUG: Fixed regressions in np.piecewise in ref to #5737 and #5729. #7145
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…#5729. Added unit tests for these conditions.
| @@ -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: | |||
There was a problem hiding this comment.
Can you do this without using try...except? Using exception handling for flow control is kind of ugly. Also, there should be an explanation of why the alternative is correct.
There was a problem hiding this comment.
Yes it should be possible as we can check for the number of dimensions. Thanks for the feedback. I agree the try...except block is ugly and even more so without a specific exception.
|
Thanks @bastula . |
charris
pushed a commit
to charris/numpy
that referenced
this pull request
Feb 1, 2016
jaimefrio
pushed a commit
to jaimefrio/numpy
that referenced
this pull request
Mar 22, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed regressions in np.piecewise that were generated as a result of the 0d fixes in #4792.
Unit tests were appropriately added.
The fix for #5737 was created by reusing the old condition creation method which works better for multidimensional arrays.
The fix for #5729 was created by removing the n != n2 as it is not necessary and piecewise still works with the same expected behavior (confirmed via unit tests).