summaryrefslogtreecommitdiff
path: root/numpy/core
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-08-29 17:15:31 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-08-29 17:15:31 +0000
commit19a94794c106aef993bb2af6a7ea11950e362d0d (patch)
treeac3e83f9359e27e07fece6e13be58560de1bc74a /numpy/core
parent775a47de7e2f4b039592d614e7ac3fda464975a8 (diff)
downloadnumpy-19a94794c106aef993bb2af6a7ea11950e362d0d.tar.gz
Fix problem with randn in matlib. Acutally add min, max, round, abs to the numpy name-space without over-writing builtins on from numpy import *
Diffstat (limited to 'numpy/core')
-rw-r--r--numpy/core/__init__.py4
-rw-r--r--numpy/core/fromnumeric.py6
-rw-r--r--numpy/core/numeric.py2
3 files changed, 4 insertions, 8 deletions
diff --git a/numpy/core/__init__.py b/numpy/core/__init__.py
index 25ace99e3..e80a79ca1 100644
--- a/numpy/core/__init__.py
+++ b/numpy/core/__init__.py
@@ -19,6 +19,10 @@ from defchararray import *
import scalarmath
del nt
+from fromnumeric import amax as max, amin as min, \
+ round_ as round
+from numeric import absolute as abs
+
__all__ = ['char','rec','memmap','ma']
__all__ += numeric.__all__
__all__ += fromnumeric.__all__
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py
index dfe233b6e..1942bda45 100644
--- a/numpy/core/fromnumeric.py
+++ b/numpy/core/fromnumeric.py
@@ -439,8 +439,6 @@ def amax(a, axis=None, out=None):
return _wrapit(a, 'max', axis, out)
return amax(axis, out)
-max = amax
-
def amin(a, axis=None, out=None):
"""Return the minimum of a along dimension axis.
"""
@@ -450,8 +448,6 @@ def amin(a, axis=None, out=None):
return _wrapit(a, 'min', axis, out)
return amin(axis, out)
-min = amin
-
def alen(a):
"""Return the length of a Python object interpreted as an array
of at least 1 dimension.
@@ -522,8 +518,6 @@ def round_(a, decimals=0, out=None):
around = round_
-round = round_
-
def mean(a, axis=None, dtype=None, out=None):
"""mean(a, axis=None, dtype=None)
Return the arithmetic mean.
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py
index cd23c7cc0..f7733a92a 100644
--- a/numpy/core/numeric.py
+++ b/numpy/core/numeric.py
@@ -95,8 +95,6 @@ def extend_all(module):
extend_all(umath)
extend_all(numerictypes)
-abs = absolute
-
newaxis = None
ndarray = multiarray.ndarray