Fix masked array handling #4050
Merged
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.
This fixes #4049, and is an alternative to #4008. Unlike #4008, this fixes the problem directly in
_fast_from_vertices_and_codes
rather than at a number of call sites that call it. While it does make that function slower, it apparently needs the masked array treatment from all places that call it anyway, so sticking it right inside the function seems fine.In the process of fixing this bug, it was discovered that a fix to handle NaNs in draw_markers (cf43d57) was not brought over from the 1.4.x branch (probably my fault, since merges of C++ code are really hairy right now). This missing bugfix was papered over by the fact that NaNs were no longer being passed to
draw_markers
.Lastly, this adds an optimization to the log scaling to use NaNs rather than masked arrays. The original array is not touched, so this should be effectively the same thing, just without the large time and memory overhead of masked arrays.
This includes a test I shamelessly cherry-picked from #4008.