From 01a0309eca710b4128df2c9b5ce3a6905281df4b Mon Sep 17 00:00:00 2001 From: Travis Oliphant Date: Sun, 13 Aug 2006 07:15:52 +0000 Subject: Change default axis argument of average and several masked array functions. Move old behaviors to compatibility layer. --- numpy/oldnumeric/functions.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'numpy/oldnumeric/functions.py') diff --git a/numpy/oldnumeric/functions.py b/numpy/oldnumeric/functions.py index e18f12aa8..4e3f12639 100644 --- a/numpy/oldnumeric/functions.py +++ b/numpy/oldnumeric/functions.py @@ -9,7 +9,8 @@ __all__ = ['take', 'repeat', 'sum', 'product', 'sometrue', 'alltrue', 'cumsum', 'cumproduct', 'compress', 'ones', 'empty', 'identity', 'zeros', 'array', 'asarray', 'nonzero', 'reshape', 'arange', 'fromstring', 'ravel', 'trace', - 'indices', 'where','sarray','cross_product', 'argmax', 'argmin'] + 'indices', 'where','sarray','cross_product', 'argmax', 'argmin', + 'average'] def take(a, indicies, axis=0): return N.take(a, indicies, axis) @@ -115,3 +116,6 @@ def where(condition, x, y): def cross_product(a, b, axis1=-1, axis2=-1): return N.cross(a, b, axis1, axis2) + +def average(a, axis=0, weights=None, returned=False): + return N.average(a, axis, weights, returned) -- cgit v1.2.1