PP + merge test fixes #2728
Merged
PP + merge test fixes #2728
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
lbdreyer
reviewed
Aug 4, 2017
| self.assertArrayEqual(result.data, expected) | ||
| self.assertEqual(result.dtype, self.dtype) | ||
| self._check_fill_value(result, fill0, fill1) | ||
| self._check_fill_value(result) |
Member
There was a problem hiding this comment.
For tests including ndarray (e.g. test__ndarray_ndarray, test__masked_ndarray, test__ndarray_masked) it seems unnecessary to test the fill_combos since we already know they won't have fill_values.
I would do something like:
def test__ndarray_ndarray(self):
for (lazy0, laz1) in self.lazy_combos:
cubes = iris.cube.CubeList()
cubes.append(self._make_cube(0, dtype=self.dtype, lazy=lazy0)
cubes.append(self._make_cube(1, dtype=self.dtype, lazy=lazy1)
result = cubes.merge_cube()
expected = self._make_data([0, 1], dtype=self.dtype)
self.assertArrayEqual(result.data, expected)
self.assertEqual(result.dtype, self.dtype)
Member
There was a problem hiding this comment.
Unless you want to check that after a merge, the resultant data isn't a masked array for some reason
lbdreyer
reviewed
Aug 4, 2017
| if data.dtype.kind in 'biu': | ||
| # Integer or Boolean data : No masking is supported. | ||
| msg = 'Non-floating masked data cannot be saved to PP.' | ||
| raise ValueError(msg) |
Member
There was a problem hiding this comment.
This was added in #2564 which has now been removed anyway
Member
|
@bjlittle This all looks good. I just want to talk to you about the testing of fill_values when merging ndarrays but otherwise I think this is ready to merge in |
Member
|
Thanks @bjlittle ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 PR addresses assorted PP save test failures.
I also ended up bleeding thru into merge and fixing those tests to confirm that merge was behaving correctly for merging masked and ndarray cube payload combos.
We also require to force an
asarray=Falsedefault for_lazy_data.as_lazy_data, otherwisedaskcan cast masked data derived from a proxy as a ndarray.