diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2009-08-28 15:36:42 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2009-08-28 15:36:42 +0000 |
| commit | 2b01ee6b966b9ca298247e6717e3a5be16a92970 (patch) | |
| tree | 6bbb8ee8eebdfe2ef3eb26f13994193b313c6fe7 /numpy/lib/ufunclike.py | |
| parent | c2191bc97da8a0879cec8d3e9a7a93fe9e66fcd8 (diff) | |
| parent | fddd4b9c3b8f18ba7cf386f766b70ec3328b1c69 (diff) | |
| download | numpy-2b01ee6b966b9ca298247e6717e3a5be16a92970.tar.gz | |
Re-base the date-time branch back to the trunk.
Diffstat (limited to 'numpy/lib/ufunclike.py')
| -rw-r--r-- | numpy/lib/ufunclike.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/lib/ufunclike.py b/numpy/lib/ufunclike.py index 5dbc3f225..5e89b0930 100644 --- a/numpy/lib/ufunclike.py +++ b/numpy/lib/ufunclike.py @@ -176,7 +176,7 @@ def isneginf(x, y=None): _log2 = nx.log(2) def log2(x, y=None): """ - Return the base 2 logarithm. + Return the base 2 logarithm of the input array, element-wise. Parameters ---------- @@ -188,7 +188,7 @@ def log2(x, y=None): Returns ------- y : ndarray - The logarithm to the base 2 of `x` elementwise. + The logarithm to the base 2 of `x` element-wise. NaNs are returned where `x` is negative. See Also @@ -197,7 +197,7 @@ def log2(x, y=None): Examples -------- - >>> np.log2([-1,2,4]) + >>> np.log2([-1, 2, 4]) array([ NaN, 1., 2.]) """ |