Improved checking logic of _check_xyz in contour.py #1471
Merged
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
| @@ -0,0 +1,127 @@ | |||
| import numpy as np | |||
| from matplotlib import pyplot as plt | |||
There was a problem hiding this comment.
FYI: All tests which use pyplot should either be an image test, or use the cleanup decroator.
There was a problem hiding this comment.
Ok, thanks! Added.
|
@pelson - the tests appear to be passing now. |
|
+1 |
| elif x.ndim == 2: | ||
|
|
||
| if x.shape != z.shape: | ||
| raise TypeError("Shape of x does not match that of z: found {0} instead of {1}.".format(x.shape, z.shape)) |
There was a problem hiding this comment.
This and the TypeError below stretch to longer than 78 characters. In lieu of porting the codebase to be PEP8 compliant, could you wrap these and any other lines that are too long?
There was a problem hiding this comment.
This should be fixed now.
|
@astrofrog - sadly doesn't automatically merge. would you mind rebasing please? |
|
@pelson - done! All tests seem to pass on Travis. |
dmcdougall
added a commit
that referenced
this pull request
Nov 13, 2012
Improved checking logic of _check_xyz in contour.py
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.
At the moment, if one calls
contourwith:and
xandyare 2-d arrays with a different shape fromz, the error iswhich caused me much confusion. I dug into the code, and I realized the logic and errors could be significantly improved, so I've done that here, and added some tests. It should now give more informative/relevant errors.