Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix array_equal behaviour for masked arrays #4457

Merged
merged 8 commits into from
Jun 19, 2024
Merged

Fix array_equal behaviour for masked arrays #4457

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
474f083
fix array_equal behaviour for masked arrays
stephenworsley Dec 10, 2021
a2ac4f8
Merge branch 'main' into array_equal_fix
stephenworsley Jun 10, 2024
2afdafb
address review comment
stephenworsley Jun 10, 2024
e0b6f9e
fix tests
stephenworsley Jun 10, 2024
d15295c
fix bug, add test and whatsnew
stephenworsley Jun 10, 2024
80cee2e
address review comments
stephenworsley Jun 14, 2024
e1b237e
Update lib/iris/tests/unit/util/test_array_equal.py
stephenworsley Jun 19, 2024
9045abc
Merge branch 'main' into array_equal_fix
pp-mo Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/iris/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,8 @@ def array_equal(array1, array2, withnans=False):

def normalise_array(array):
if not is_lazy_data(array):
array = np.asarray(array)
if not ma.isMaskedArray(array):
pp-mo marked this conversation as resolved.
Show resolved Hide resolved
array = np.asarray(array)
pp-mo marked this conversation as resolved.
Show resolved Hide resolved
return array

array1, array2 = normalise_array(array1), normalise_array(array2)
Expand Down
Loading