summaryrefslogtreecommitdiff
path: root/numpy/ma/core.py
diff options
context:
space:
mode:
authorslepton <slepton@posteo.de>2021-07-07 20:00:48 +0200
committerGitHub <noreply@github.com>2021-07-07 20:00:48 +0200
commitde245cd133699f8c23f97ec07ec29703e37a5923 (patch)
treed1b485e30de04e078aa86f9e5f3466744fa505b9 /numpy/ma/core.py
parent87db3d1ae9a16edabd8f4818307616d8182d2a12 (diff)
parent068074f4acab87b0fabf194517b7dfb0f038af5a (diff)
downloadnumpy-de245cd133699f8c23f97ec07ec29703e37a5923.tar.gz
Merge branch 'numpy:main' into main
Diffstat (limited to 'numpy/ma/core.py')
-rw-r--r--numpy/ma/core.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
index e3c6bc611..152d17965 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -5488,7 +5488,8 @@ class MaskedArray(ndarray):
filled = self.filled(fill_value)
return filled.argsort(axis=axis, kind=kind, order=order)
- def argmin(self, axis=None, fill_value=None, out=None):
+ def argmin(self, axis=None, fill_value=None, out=None, *,
+ keepdims=np._NoValue):
"""
Return array of indices to the minimum values along the given axis.
@@ -5531,9 +5532,11 @@ class MaskedArray(ndarray):
if fill_value is None:
fill_value = minimum_fill_value(self)
d = self.filled(fill_value).view(ndarray)
- return d.argmin(axis, out=out)
+ keepdims = False if keepdims is np._NoValue else bool(keepdims)
+ return d.argmin(axis, out=out, keepdims=keepdims)
- def argmax(self, axis=None, fill_value=None, out=None):
+ def argmax(self, axis=None, fill_value=None, out=None, *,
+ keepdims=np._NoValue):
"""
Returns array of indices of the maximum values along the given axis.
Masked values are treated as if they had the value fill_value.
@@ -5568,7 +5571,8 @@ class MaskedArray(ndarray):
if fill_value is None:
fill_value = maximum_fill_value(self._data)
d = self.filled(fill_value).view(ndarray)
- return d.argmax(axis, out=out)
+ keepdims = False if keepdims is np._NoValue else bool(keepdims)
+ return d.argmax(axis, out=out, keepdims=keepdims)
def sort(self, axis=-1, kind=None, order=None,
endwith=True, fill_value=None):