[pypy-commit] extradoc extradoc: consistent notation

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: extradoc
Changeset: r4582:24109d5b3f33
Date: 2012-08-15 10:11 +0200
http://bitbucket.org/pypy/extradoc/changeset/24109d5b3f33/

Log:	consistent notation

diff --git a/talk/iwtc11/benchmarks/benchmark.sh b/talk/iwtc11/benchmarks/benchmark.sh
--- a/talk/iwtc11/benchmarks/benchmark.sh
+++ b/talk/iwtc11/benchmarks/benchmark.sh
@@ -77,8 +77,8 @@
     #$* ./runner.py $EXTRA_OPTS image/sobel.py main NoBorderImagePadded uint8
     $* ./runner.py $EXTRA_OPTS scimark.py SOR 100 32768 Array2D
     $* ./runner.py $EXTRA_OPTS scimark.py SOR 1000 256 Array2D
-    $* ./runner.py $EXTRA_OPTS scimark.py SOR 100 32768 ArrayList
-    $* ./runner.py $EXTRA_OPTS scimark.py SOR 1000 256 ArrayList
+    #$* ./runner.py $EXTRA_OPTS scimark.py SOR 100 32768 ArrayList
+    #$* ./runner.py $EXTRA_OPTS scimark.py SOR 1000 256 ArrayList
     $* ./runner.py $EXTRA_OPTS scimark.py SparseMatMult 1000 5000 262144
     $* ./runner.py $EXTRA_OPTS scimark.py SparseMatMult 100000 1000000 1024
     $* ./runner.py $EXTRA_OPTS scimark.py MonteCarlo 268435456
diff --git a/talk/iwtc11/benchmarks/runner.lua b/talk/iwtc11/benchmarks/runner.lua
--- a/talk/iwtc11/benchmarks/runner.lua
+++ b/talk/iwtc11/benchmarks/runner.lua
@@ -43,7 +43,8 @@
 package.path = package.path .. ";convolution/?.lua"
 require('convolution')
 function benchmarks.convolution(a, b, c)
-    return string.format('convolution(%s)', convolution.main({a, b, c}))
+    convolution.main({a, b, c})
+    return string.format('%s(%s, %s)', a, b, tostring(c))
 end