summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorRalf Gommers <ralf.gommers@gmail.com>2021-12-01 12:40:52 +0100
committerGitHub <noreply@github.com>2021-12-01 12:40:52 +0100
commit0bd7f2df20154370544925aacf7b1439d121cc53 (patch)
treef7961553d321114ad10d6d4b6de57ebd39d7dc65 /numpy
parent007f433a7c99131f8e402eaec60fd3194e1e41d0 (diff)
parentc86ebe0d343c5af9d210658a1be6115ce04feb6f (diff)
downloadnumpy-0bd7f2df20154370544925aacf7b1439d121cc53.tar.gz
Merge pull request #20407 from wltjr1007/minmax_axis_doc-2
DOC: Update axis parameter for np.ma.{min,max}
Diffstat (limited to 'numpy')
-rw-r--r--numpy/ma/core.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
index 491c2c605..12836967c 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -5666,9 +5666,12 @@ class MaskedArray(ndarray):
Parameters
----------
- axis : {None, int}, optional
+ axis : None or int or tuple of ints, optional
Axis along which to operate. By default, ``axis`` is None and the
flattened input is used.
+ .. versionadded:: 1.7.0
+ If this is a tuple of ints, the minimum is selected over multiple
+ axes, instead of a single axis or all the axes as before.
out : array_like, optional
Alternative output array in which to place the result. Must be of
the same shape and buffer length as the expected output.
@@ -5800,9 +5803,12 @@ class MaskedArray(ndarray):
Parameters
----------
- axis : {None, int}, optional
+ axis : None or int or tuple of ints, optional
Axis along which to operate. By default, ``axis`` is None and the
flattened input is used.
+ .. versionadded:: 1.7.0
+ If this is a tuple of ints, the maximum is selected over multiple
+ axes, instead of a single axis or all the axes as before.
out : array_like, optional
Alternative output array in which to place the result. Must
be of the same shape and buffer length as the expected output.