summaryrefslogtreecommitdiff
path: root/benchmarks
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-01-04 19:00:27 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-01-04 19:00:27 +0000
commite706c7d92c4ee41e8e995fb3838bd0931b57efb5 (patch)
tree015a057d49422774e49ed211a37c14105d03a713 /benchmarks
parentc14d4fe25cb5cd482369734dd487ac8f376851c9 (diff)
downloadpython-numpy-e706c7d92c4ee41e8e995fb3838bd0931b57efb5.tar.gz
python-numpy-e706c7d92c4ee41e8e995fb3838bd0931b57efb5.tar.bz2
python-numpy-e706c7d92c4ee41e8e995fb3838bd0931b57efb5.zip
Changed all references to scipy to numpy
Diffstat (limited to 'benchmarks')
-rw-r--r--benchmarks/sorting.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/benchmarks/sorting.py b/benchmarks/sorting.py
index c7869616f..e822d5547 100644
--- a/benchmarks/sorting.py
+++ b/benchmarks/sorting.py
@@ -2,7 +2,7 @@ import timeit
N = 10000
t1 = timeit.Timer('a=array(None,shape=%d);a.sort()'%N,'from numarray import array')
-t2 = timeit.Timer('a=empty(shape=%d);a.sort()'%N,'from scipy import empty')
+t2 = timeit.Timer('a=empty(shape=%d);a.sort()'%N,'from numpy import empty')
t3 = timeit.Timer('a=empty(shape=%d);sort(a)'%N,'from Numeric import empty,sort')
print "1-D length = ", N
@@ -12,7 +12,7 @@ print "Numeric: ", t3.repeat(3,100)
N1,N2 = 100,100
t1 = timeit.Timer('a=array(None,shape=(%d,%d));a.sort()'%(N1,N2),'from numarray import array')
-t2 = timeit.Timer('a=empty(shape=(%d,%d));a.sort()'%(N1,N2),'from scipy import empty')
+t2 = timeit.Timer('a=empty(shape=(%d,%d));a.sort()'%(N1,N2),'from numpy import empty')
t3 = timeit.Timer('a=empty(shape=(%d,%d));sort(a)'%(N1,N2),'from Numeric import empty,sort')
print "2-D shape = (%d,%d), last-axis" % (N1,N2)
@@ -22,7 +22,7 @@ print "Numeric: ", t3.repeat(3,100)
N1,N2 = 100,100
t1 = timeit.Timer('a=array(None,shape=(%d,%d));a.sort(0)'%(N1,N2),'from numarray import array')
-t2 = timeit.Timer('a=empty(shape=(%d,%d));a.sort(0)'%(N1,N2),'from scipy import empty')
+t2 = timeit.Timer('a=empty(shape=(%d,%d));a.sort(0)'%(N1,N2),'from numpy import empty')
t3 = timeit.Timer('a=empty(shape=(%d,%d));sort(a,0)'%(N1,N2),'from Numeric import empty,sort')
print "2-D shape = (%d,%d), first-axis" % (N1,N2)