From 3496a3cda8ea70253a76ed17c0af261f2d645fe2 Mon Sep 17 00:00:00 2001 From: Travis Oliphant Date: Wed, 4 Jan 2006 17:37:00 +0000 Subject: Moving things.. --- numpy/lib/mlab.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 numpy/lib/mlab.py (limited to 'numpy/lib/mlab.py') diff --git a/numpy/lib/mlab.py b/numpy/lib/mlab.py new file mode 100644 index 000000000..749600d9b --- /dev/null +++ b/numpy/lib/mlab.py @@ -0,0 +1,14 @@ +# This module is for compatibility only. All functions are defined elsewhere. + +from numeric import * + +from twodim_base import eye, tri, diag, fliplr, flipud, rot90, tril, triu +from oldnumeric import amax as max +from oldnumeric import amin as min +from function_base import msort, median, trapz, diff, cov, corrcoef, kaiser, blackman, \ + bartlett, hanning, hamming, sinc, angle +from oldnumeric import cumsum, ptp, mean, std, prod, cumprod, squeeze +from polynomial import roots + +from scipy.random import rand, randn +from scipy.corelinalg import eig, svd -- cgit v1.2.1 From e706c7d92c4ee41e8e995fb3838bd0931b57efb5 Mon Sep 17 00:00:00 2001 From: Travis Oliphant Date: Wed, 4 Jan 2006 19:00:27 +0000 Subject: Changed all references to scipy to numpy --- numpy/lib/mlab.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'numpy/lib/mlab.py') diff --git a/numpy/lib/mlab.py b/numpy/lib/mlab.py index 749600d9b..9085c26be 100644 --- a/numpy/lib/mlab.py +++ b/numpy/lib/mlab.py @@ -10,5 +10,5 @@ from function_base import msort, median, trapz, diff, cov, corrcoef, kaiser, bla from oldnumeric import cumsum, ptp, mean, std, prod, cumprod, squeeze from polynomial import roots -from scipy.random import rand, randn -from scipy.corelinalg import eig, svd +from numpy.random import rand, randn +from numpy.corelinalg import eig, svd -- cgit v1.2.1 From 5a765123d45616661f7d61f322ce8ba4a518e1aa Mon Sep 17 00:00:00 2001 From: Travis Oliphant Date: Wed, 4 Jan 2006 19:30:36 +0000 Subject: Fixed lib --- numpy/lib/mlab.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'numpy/lib/mlab.py') diff --git a/numpy/lib/mlab.py b/numpy/lib/mlab.py index 9085c26be..f082cdc0d 100644 --- a/numpy/lib/mlab.py +++ b/numpy/lib/mlab.py @@ -1,13 +1,13 @@ # This module is for compatibility only. All functions are defined elsewhere. -from numeric import * +from numpy.core.numeric import * from twodim_base import eye, tri, diag, fliplr, flipud, rot90, tril, triu -from oldnumeric import amax as max -from oldnumeric import amin as min +from numpy.core.oldnumeric import amax as max +from numpy.core.oldnumeric import amin as min from function_base import msort, median, trapz, diff, cov, corrcoef, kaiser, blackman, \ bartlett, hanning, hamming, sinc, angle -from oldnumeric import cumsum, ptp, mean, std, prod, cumprod, squeeze +from numpy.core.oldnumeric import cumsum, ptp, mean, std, prod, cumprod, squeeze from polynomial import roots from numpy.random import rand, randn -- cgit v1.2.1