summaryrefslogtreecommitdiff
path: root/numpy/numarray
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-08-10 23:31:53 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-08-10 23:31:53 +0000
commit6628b4156a2a7ee74cf284cbdb765dc5a06ddbc2 (patch)
tree60e0af5f8743e49184e26089e45e748dfe4ccff4 /numpy/numarray
parente74b65af13735872f42adc1553ada2479d7dd11f (diff)
downloadnumpy-6628b4156a2a7ee74cf284cbdb765dc5a06ddbc2.tar.gz
Finish adding the rest of numarray compatibility
Diffstat (limited to 'numpy/numarray')
-rw-r--r--numpy/numarray/fft.py7
-rw-r--r--numpy/numarray/ma.py2
-rw-r--r--numpy/numarray/matrix.py8
-rw-r--r--numpy/numarray/mlab.py7
-rw-r--r--numpy/numarray/random_array.py9
5 files changed, 33 insertions, 0 deletions
diff --git a/numpy/numarray/fft.py b/numpy/numarray/fft.py
index e69de29bb..c7ac6a27e 100644
--- a/numpy/numarray/fft.py
+++ b/numpy/numarray/fft.py
@@ -0,0 +1,7 @@
+
+from numpy.oldnumeric.fft import *
+import numpy.oldnumeric.fft as nof
+
+__all__ = nof.__all__
+
+del nof
diff --git a/numpy/numarray/ma.py b/numpy/numarray/ma.py
index e69de29bb..5c7a19cf2 100644
--- a/numpy/numarray/ma.py
+++ b/numpy/numarray/ma.py
@@ -0,0 +1,2 @@
+
+from numpy.oldnumeric.ma import *
diff --git a/numpy/numarray/matrix.py b/numpy/numarray/matrix.py
index e69de29bb..a39812e1f 100644
--- a/numpy/numarray/matrix.py
+++ b/numpy/numarray/matrix.py
@@ -0,0 +1,8 @@
+
+__all__ = ['Matrix']
+
+from numpy import matrix as _matrix
+
+def Matrix(data, typecode=None, copy=1, savespace=0):
+ return _matrix(data, typecode, copy=copy)
+
diff --git a/numpy/numarray/mlab.py b/numpy/numarray/mlab.py
index e69de29bb..05f234d37 100644
--- a/numpy/numarray/mlab.py
+++ b/numpy/numarray/mlab.py
@@ -0,0 +1,7 @@
+
+from numpy.oldnumeric.mlab import *
+import numpy.oldnumeric.mlab as nom
+
+__all__ = nom.__all__
+
+del nom
diff --git a/numpy/numarray/random_array.py b/numpy/numarray/random_array.py
index e69de29bb..d70e2694a 100644
--- a/numpy/numarray/random_array.py
+++ b/numpy/numarray/random_array.py
@@ -0,0 +1,9 @@
+
+__all__ = ['ArgumentError', 'F', 'beta', 'binomial', 'chi_square',
+ 'exponential', 'gamma', 'get_seed', 'multinomial',
+ 'multivariate_normal', 'negative_binomial', 'noncentral_F',
+ 'noncentral_chi_square', 'normal', 'permutation', 'poisson',
+ 'randint', 'random', 'random_integers', 'standard_normal',
+ 'uniform', 'seed']
+
+from numpy.oldnumeric.random_array import *