Remove/rework uses of np.where where possible. #13385
Merged
Conversation
This file contains hidden or 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
QuLogic
reviewed
Feb 8, 2019
| @@ -43,27 +43,19 @@ def __str__(self): | |||
| self._apply_theta_transforms)) | |||
|
|
|||
| def transform_non_affine(self, tr): | |||
| xy = np.empty(tr.shape, float) | |||
|
|
|||
| t = tr[:, 0:1] | |||
There was a problem hiding this comment.
This slice makes t 2D; I don't remember why that was important though.
There was a problem hiding this comment.
I know, but staring at the code it seems unlikely to matter (it's been like that ever since polar.py appeared in 2008, so probably just "historical").
e629ee1 to
09467ce
Compare
timhoffm
approved these changes
Feb 16, 2019
QuLogic
reviewed
Feb 17, 2019
| @@ -18,7 +17,7 @@ | |||
| s2 = 2 * np.sin(2 * np.pi * 400 * t) | |||
|
|
|||
| # create a transient "chirp" | |||
| mask = np.where(np.logical_and(t > 10, t < 12), 1.0, 0.0) | |||
| mask = (10 < t) & (t < 12) | |||
| s2 = s2 * mask | |||
There was a problem hiding this comment.
I think I'd rather write this as:
s2[t <= 10] = 0
s2[12 <= t] = 0
(or using an or)
There was a problem hiding this comment.
good catch, fixed (and rebased)
8000
QuLogic
approved these changes
Feb 17, 2019
|
Seems to need a rebase though. |
In a few places, np.where can be replaced by direct use of boolean arrays, or other constructs. In colors.py, the use of putmask may be slightly obscure (so I left a comment explaining it), but avoids repeating the modified array twice, so I think is more legible. In polar.py, preallocating xy is just pointless given that we're constructing intermediate arrays for x and y and filling them into xy afterwards.
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.
In a few places, np.where can be replaced by direct use of boolean
arrays, or other constructs.
In colors.py, the use of putmask may be slightly obscure (so I left a
comment explaining it), but avoids repeating the modified array twice,
so I think is more legible.
In polar.py, preallocating xy is just pointless given that we're
constructing intermediate arrays for x and y and filling them into xy
afterwards.
PR Summary
PR Checklist