summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorseberg <sebastian@sipsolutions.net>2016-02-08 15:58:33 +0100
committerseberg <sebastian@sipsolutions.net>2016-02-08 15:58:33 +0100
commitc4bb7e9c7bc689f750e89899b102268a775b5c6f (patch)
tree6cff9208d5f646bd89816566a3b034bd551f13d8
parent952413451f4cc3eb71b401501ffdbce14106668f (diff)
parente3bca2cf026ae16926ef58d71b33afa2981c33c6 (diff)
downloadnumpy-c4bb7e9c7bc689f750e89899b102268a775b5c6f.tar.gz
Merge pull request #7211 from omegahm/doc-fix-fmin-examples
DOC: Fix fmin examples
-rw-r--r--numpy/core/code_generators/ufunc_docstrings.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/core/code_generators/ufunc_docstrings.py b/numpy/core/code_generators/ufunc_docstrings.py
index 34ac59984..e3600406c 100644
--- a/numpy/core/code_generators/ufunc_docstrings.py
+++ b/numpy/core/code_generators/ufunc_docstrings.py
@@ -2393,11 +2393,11 @@ add_newdoc('numpy.core.umath', 'fmin',
Examples
--------
>>> np.fmin([2, 3, 4], [1, 5, 2])
- array([2, 5, 4])
+ array([1, 3, 2])
>>> np.fmin(np.eye(2), [0.5, 2])
- array([[ 1. , 2. ],
- [ 0.5, 2. ]])
+ array([[ 0.5, 0. ],
+ [ 0. , 1. ]])
>>> np.fmin([np.nan, 0, np.nan],[0, np.nan, np.nan])
array([ 0., 0., NaN])