diff options
| -rw-r--r-- | benchmarks/simpleindex.py | 8 | ||||
| -rw-r--r-- | numpy/matlib.py | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/benchmarks/simpleindex.py b/benchmarks/simpleindex.py index 07c57f506..462fad536 100644 --- a/benchmarks/simpleindex.py +++ b/benchmarks/simpleindex.py @@ -27,12 +27,12 @@ for k in xrange(%d): for l in xrange(%d): a[k][l] = random.random() """ % (N,N,N,N) -t1 = timeit.Timer(code, 'import numpy as N; a = N.rand(%d,%d)' % (N,N)) +t1 = timeit.Timer(code, 'import numpy as N; a = N.random.rand(%d,%d)' % (N,N)) t2 = timeit.Timer(code, 'import MLab as N; a=N.rand(%d,%d)' % (N,N)) -t3 = timeit.Timer(code, 'import numarray.mlab as N; a=N.rand(%d,%d)' % (N,N)) -t4 = timeit.Timer(code2, 'import numpy as N; a = N.rand(%d,%d)' % (N,N)) +t3 = timeit.Timer(code, 'import numarray.mlab as N; a=N.random.rand(%d,%d)' % (N,N)) +t4 = timeit.Timer(code2, 'import numpy as N; a = N.random.rand(%d,%d)' % (N,N)) t5 = timeit.Timer(code3, setup3) -t6 = timeit.Timer("res = a + a.transpose()","import numpy as N; a=N.rand(%d,%d)" % (N,N)) +t6 = timeit.Timer("res = a + a.transpose()","import numpy as N; a=N.random.rand(%d,%d)" % (N,N)) print "shape = ", (N,N) print "NumPy 1: ", t1.repeat(3,100) print "NumPy 2: ", t4.repeat(3,100) diff --git a/numpy/matlib.py b/numpy/matlib.py index 8de0dfd94..9fd3cc6e1 100644 --- a/numpy/matlib.py +++ b/numpy/matlib.py @@ -35,7 +35,7 @@ def eye(n,M=None, k=0, dtype=float): return asmatrix(N.eye(n,M,k,dtype)) def rand(*args): - return asmatrix(N.rand(*args)) + return asmatrix(N.random.rand(*args)) def randn(*args): - return asmatrix(N.rand(*args)) + return asmatrix(N.random.rand(*args)) |