summaryrefslogtreecommitdiff
path: root/numpy/core/fromnumeric.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2020-02-23 07:03:29 -0700
committerGitHub <noreply@github.com>2020-02-23 07:03:29 -0700
commitb6c7048bfd72a999f0cd948a346de94fe13f8123 (patch)
treee04593657c96f83e6f9af8690f6c80b9dce6604a /numpy/core/fromnumeric.py
parentb2545d01be561f7f8bb71c6064ba48de3d3e8dc1 (diff)
parent1d0033d09a29f5be76e8a8a8eec2278fb89eac17 (diff)
downloadnumpy-b6c7048bfd72a999f0cd948a346de94fe13f8123.tar.gz
Merge pull request #15579 from rsokl/clip_docs_fix
DOC: numpy.clip is equivalent to minimum(..., maximum(...))
Diffstat (limited to 'numpy/core/fromnumeric.py')
-rw-r--r--numpy/core/fromnumeric.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py
index ab45ddfe8..acd2d2bea 100644
--- a/numpy/core/fromnumeric.py
+++ b/numpy/core/fromnumeric.py
@@ -2039,8 +2039,8 @@ def clip(a, a_min, a_max, out=None, **kwargs):
is specified, values smaller than 0 become 0, and values larger
than 1 become 1.
- Equivalent to but faster than ``np.maximum(a_min, np.minimum(a, a_max))``
- assuming ``a_min < a_max``.
+ Equivalent to but faster than ``np.minimum(a_max, np.maximum(a, a_min))``.
+
No check is performed to ensure ``a_min < a_max``.
Parameters