Small simplifications to streamplot. #20739
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
timhoffm
reviewed
Jul 25, 2021
lib/matplotlib/streamplot.py
Outdated
Comment on lines
481
to
484
| if stotal > minlength > 0: | ||
| return [*zip(*xy_traj)] | ||
| elif minlength == 0: | ||
| return [], [] |
There was a problem hiding this comment.
Overall, I'm +/-0 on packing x, y together. It is shorter in some places, but for example this construct is much harder to understand.
There was a problem hiding this comment.
The way to make this actually simpler is to make get_integrator return an (N, 2) array rather than a (2, N) array which is also consistent with what we do everywhere else, but basically means switching to a private _get_integrator with the new convention, so let's also deprecate the old one. (So that's no longer "just" maintenance, as there's a deprecation now.)
cm.get_cmap already handles None input, no need to do it again here. In get_integrator and _integrate_rk12, track x and y together rather than separately, and the `xyt[1:]` slicing works even if `xyt` is empty.
jklymak
reviewed
Jul 28, 2021
jklymak
approved these changes
Jul 28, 2021
timhoffm
approved these changes
Jul 28, 2021
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.
cm.get_cmap already handles None input, no need to do it again here.
In get_integrator and _integrate_rk12, track x and y together rather
than separately, and the
xyt[1:]slicing works even ifxytis empty.PR Summary
PR Checklist
pytestpasses).flake8on changed files to check).flake8-docstringsand runflake8 --docstring-convention=all).doc/users/next_whats_new/(follow instructions in README.rst there).doc/api/next_api_changes/(follow instructions in README.rst there).