summaryrefslogtreecommitdiff
path: root/numpy/numarray/functions.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-08-10 12:48:04 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-08-10 12:48:04 +0000
commitc6f48c8a03c438da6e2d400752eff702d1234cfc (patch)
treefd032d49f4da991a440e64b462ccc60c3c02de55 /numpy/numarray/functions.py
parentb772c977e5d4d71c78919ef941858ad438ee4986 (diff)
downloadnumpy-c6f48c8a03c438da6e2d400752eff702d1234cfc.tar.gz
Add output arguments to a few more functions for consistency
Diffstat (limited to 'numpy/numarray/functions.py')
-rw-r--r--numpy/numarray/functions.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/numpy/numarray/functions.py b/numpy/numarray/functions.py
index 1f358385c..73f3f80c9 100644
--- a/numpy/numarray/functions.py
+++ b/numpy/numarray/functions.py
@@ -40,7 +40,7 @@ import copy, copy_reg, types
import os, sys, math, operator
from numpy import dot as matrixmultiply, dot, vdot, ravel, concatenate, all,\
- allclose, any, argmax, argmin, around, argsort, array_equal, array_equiv,\
+ allclose, any, around, argsort, array_equal, array_equiv,\
array_str, array_repr, average, CLIP, RAISE, WRAP, clip, concatenate, \
diagonal, e, pi, fromfunction, indices, inner as innerproduct, nonzero, \
outer as outerproduct, kron as kroneckerproduct, lexsort, putmask, rank, \
@@ -438,3 +438,9 @@ def cumsum(a1, axis=0, out=None, type=None, dim=0):
def cumproduct(a1, axis=0, out=None, type=None, dim=0):
return N.asarray(a1).cumprod(axis,dtype=type,out=out)
+def argmax(x, axis=-1):
+ return N.argmax(x, axis)
+
+def argmin(x, axis=-1):
+ return N.argmin(x, axis)
+