Fri May 26 20:26:21 CEST 2006

Author: steve.holden
Date: Fri May 26 20:26:21 2006
New Revision: 46381

Removed:
   python/trunk/Tools/pybench/Empty.py
   python/trunk/Tools/pybench/NewInstances.py
Modified:
   python/trunk/Tools/pybench/Arithmetic.py
   python/trunk/Tools/pybench/Calls.py
   python/trunk/Tools/pybench/Constructs.py
   python/trunk/Tools/pybench/Dict.py
   python/trunk/Tools/pybench/Exceptions.py
   python/trunk/Tools/pybench/Imports.py
   python/trunk/Tools/pybench/Instances.py
   python/trunk/Tools/pybench/Lists.py
   python/trunk/Tools/pybench/Lookups.py
   python/trunk/Tools/pybench/Numbers.py
   python/trunk/Tools/pybench/Setup.py
   python/trunk/Tools/pybench/Strings.py
   python/trunk/Tools/pybench/Tuples.py
   python/trunk/Tools/pybench/Unicode.py
   python/trunk/Tools/pybench/pybench.py
Log:
Revert tests to MAL's original round sizes to retiain comparability
from long ago and far away. Stop calling this pybench 1.4 because it
isn't. Remove the empty test, which was a bad idea.


Modified: python/trunk/Tools/pybench/Arithmetic.py
==============================================================================

--- python/trunk/Tools/pybench/Arithmetic.py	(original)
+++ python/trunk/Tools/pybench/Arithmetic.py	Fri May 26 20:26:21 2006
@@ -4,7 +4,7 @@
 
     version = 0.3
     operations = 5 * (3 + 5 + 5 + 3 + 3 + 3)
-    rounds = 1200*21
+    rounds = 120000
 
     def test(self):
 
@@ -159,7 +159,7 @@
 
     version = 0.3
     operations = 5 * (3 + 5 + 5 + 3 + 3 + 3)
-    rounds = 1000*30
+    rounds = 100000
 
     def test(self):
 
@@ -314,7 +314,7 @@
 
     version = 0.3
     operations = 5 * (3 + 5 + 5 + 3 + 3 + 3)
-    rounds = 1200*30
+    rounds = 120000
 
     def test(self):
 
@@ -470,7 +470,7 @@
 
     version = 0.3
     operations = 5 * (3 + 5 + 5 + 3 + 3 + 3)
-    rounds = 300*32
+    rounds = 30000
 
     def test(self):
 
@@ -625,7 +625,7 @@
 
     version = 0.3
     operations = 5 * (3 + 5 + 5 + 3 + 3 + 3)
-    rounds = 400*27
+    rounds = 40000
 
     def test(self):
 

Modified: python/trunk/Tools/pybench/Calls.py
==============================================================================
--- python/trunk/Tools/pybench/Calls.py	(original)
+++ python/trunk/Tools/pybench/Calls.py	Fri May 26 20:26:21 2006
@@ -4,7 +4,7 @@
 
     version = 0.3
     operations = 5*(1+4+4+2)
-    rounds = 600*22
+    rounds = 60000
 
     def test(self):
 
@@ -113,7 +113,7 @@
 
     version = 0.4
     operations = 5*(2+5+5+5)
-    rounds = 300*24
+    rounds = 30000
 
     def test(self):
 
@@ -234,7 +234,7 @@
 
     version = 0.3
     operations = 5*(6 + 5 + 4)
-    rounds = 200*27
+    rounds = 20000
 
     def test(self):
 
@@ -376,7 +376,7 @@
 
     version = 0.3
     operations = 5
-    rounds = 500*21
+    rounds = 50000
 
     def test(self):
 

Modified: python/trunk/Tools/pybench/Constructs.py
==============================================================================
--- python/trunk/Tools/pybench/Constructs.py	(original)
+++ python/trunk/Tools/pybench/Constructs.py	Fri May 26 20:26:21 2006
@@ -4,7 +4,7 @@
 
     version = 0.31
     operations = 30*3 # hard to say...
-    rounds = 1500*27
+    rounds = 150000
 
     def test(self):
 
@@ -471,7 +471,7 @@
 
     version = 0.3
     operations = 1000*10*5
-    rounds = 100
+    rounds = 150
 
     def test(self):
 
@@ -496,7 +496,7 @@
 
     version = 0.1
     operations = 5 * 5
-    rounds = 80*25
+    rounds = 8000
 
     def test(self):
 

Modified: python/trunk/Tools/pybench/Dict.py
==============================================================================
--- python/trunk/Tools/pybench/Dict.py	(original)
+++ python/trunk/Tools/pybench/Dict.py	Fri May 26 20:26:21 2006
@@ -4,7 +4,7 @@
 
     version = 0.3
     operations = 5*(5 + 5)
-    rounds = 600*24
+    rounds = 60000
 
     def test(self):
 
@@ -79,7 +79,7 @@
 
     version = 0.1
     operations = 5*(6 + 6)
-    rounds = 2000*30
+    rounds = 200000
 
     def test(self):
 
@@ -168,7 +168,7 @@
 
     version = 0.1
     operations = 5*(6 + 6)
-    rounds = 20000
+    rounds = 200000
 
     def test(self):
 
@@ -257,7 +257,7 @@
 
     version = 0.1
     operations = 5*(6 + 6)
-    rounds = 2000*19
+    rounds = 200000
 
     def test(self):
 
@@ -346,7 +346,7 @@
 
     version = 0.3
     operations = 5*(6 + 6 + 6 + 6)
-    rounds = 500*44
+    rounds = 50000
 
     def test(self):
 

Deleted: /python/trunk/Tools/pybench/Empty.py
==============================================================================
--- /python/trunk/Tools/pybench/Empty.py	Fri May 26 20:26:21 2006
+++ (empty file)
@@ -1,22 +0,0 @@
-from pybench import Test
-
-class EmptyTest(Test):
-    """This is just here as a potential measure of repeatability."""
-
-    version = 0.3
-    operations = 1
-    rounds = 60000
-
-    def test(self):
-
-        l = []
-        for i in xrange(self.rounds):
-            pass
-
-
-    def calibrate(self):
-
-        l = []
-
-        for i in xrange(self.rounds):
-            pass

Modified: python/trunk/Tools/pybench/Exceptions.py
==============================================================================
--- python/trunk/Tools/pybench/Exceptions.py	(original)
+++ python/trunk/Tools/pybench/Exceptions.py	Fri May 26 20:26:21 2006
@@ -4,7 +4,7 @@
 
     version = 0.1
     operations = 2 + 3
-    rounds = 600*25
+    rounds = 60000
 
     def test(self):
 
@@ -44,7 +44,7 @@
 
     version = 0.1
     operations = 15 * 10
-    rounds = 2000*16
+    rounds = 200000
 
     def test(self):
 

Modified: python/trunk/Tools/pybench/Imports.py
==============================================================================
--- python/trunk/Tools/pybench/Imports.py	(original)
+++ python/trunk/Tools/pybench/Imports.py	Fri May 26 20:26:21 2006
@@ -8,7 +8,7 @@
 
     version = 0.1
     operations = 5 * 5
-    rounds = 2000*15
+    rounds = 20000
 
     def test(self):
 
@@ -53,7 +53,7 @@
 
     version = 0.1
     operations = 5 * 5
-    rounds = 200*20
+    rounds = 20000
 
     def test(self):
 
@@ -97,7 +97,7 @@
 
     version = 0.1
     operations = 5 * 5
-    rounds = 200*17
+    rounds = 20000
 
     def test(self):
 

Modified: python/trunk/Tools/pybench/Instances.py
==============================================================================
--- python/trunk/Tools/pybench/Instances.py	(original)
+++ python/trunk/Tools/pybench/Instances.py	Fri May 26 20:26:21 2006
@@ -4,7 +4,7 @@
 
     version = 0.2
     operations = 3 + 7 + 4
-    rounds = 600*17
+    rounds = 60000
 
     def test(self):
 

Modified: python/trunk/Tools/pybench/Lists.py
==============================================================================
--- python/trunk/Tools/pybench/Lists.py	(original)
+++ python/trunk/Tools/pybench/Lists.py	Fri May 26 20:26:21 2006
@@ -4,7 +4,7 @@
 
     version = 0.3
     operations = 5* (6 + 6 + 6)
-    rounds = 600*45
+    rounds = 60000
 
     def test(self):
 
@@ -132,7 +132,7 @@
 
     version = 0.4
     operations = 25*(3+1+2+1)
-    rounds = 4*45
+    rounds = 400
 
     def test(self):
 
@@ -169,7 +169,7 @@
 
     version = 0.3
     operations = 5*(1+ 6 + 6 + 3 + 1)
-    rounds = 600*15
+    rounds = 60000
 
     def test(self):
 

Modified: python/trunk/Tools/pybench/Lookups.py
==============================================================================
--- python/trunk/Tools/pybench/Lookups.py	(original)
+++ python/trunk/Tools/pybench/Lookups.py	Fri May 26 20:26:21 2006
@@ -4,7 +4,7 @@
 
     version = 0.3
     operations = 5*(12 + 12)
-    rounds = 1000*16
+    rounds = 100000
 
     def test(self):
 
@@ -185,7 +185,7 @@
 
     version = 0.3
     operations = 5*(12 + 12)
-    rounds = 1000*20
+    rounds = 100000
 
     def test(self):
 
@@ -371,7 +371,7 @@
 
     version = 0.3
     operations = 5*(12 + 12)
-    rounds = 1000*14
+    rounds = 100000
 
     def test(self):
 
@@ -559,7 +559,7 @@
 
     version = 0.3
     operations = 5*(12 + 12)
-    rounds = 1000*22
+    rounds = 100000
 
     def test(self):
 
@@ -747,7 +747,7 @@
 
     version = 0.3
     operations = 5*(3*5 + 3*5)
-    rounds = 700*15
+    rounds = 70000
 
     def test(self):
 

Deleted: /python/trunk/Tools/pybench/NewInstances.py
==============================================================================
--- /python/trunk/Tools/pybench/NewInstances.py	Fri May 26 20:26:21 2006
+++ (empty file)
@@ -1,66 +0,0 @@
-from pybench import Test
-
-class CreateNewInstances(Test):
-
-    version = 0.1
-    operations = 3 + 7 + 4
-    rounds = 60000
-
-    def test(self):
-
-        class c(object):
-            pass
-
-        class d(object):
-            def __init__(self,a,b,c):
-                self.a = a
-                self.b = b
-                self.c = c
-
-        class e(object):
-            def __init__(self,a,b,c=4):
-                self.a = a
-                self.b = b
-                self.c = c
-                self.d = a
-                self.e = b
-                self.f = c
-
-        for i in xrange(self.rounds):
-            o = c()
-            o1 = c()
-            o2 = c()
-            p = d(i,i,3)
-            p1 = d(i,i,3)
-            p2 = d(i,3,3)
-            p3 = d(3,i,3)
-            p4 = d(i,i,i)
-            p5 = d(3,i,3)
-            p6 = d(i,i,i)
-            q = e(i,i,3)
-            q1 = e(i,i,3)
-            q2 = e(i,i,3)
-            q3 = e(i,i)
-
-    def calibrate(self):
-
-        class c(object):
-            pass
-
-        class d(object):
-            def __init__(self,a,b,c):
-                self.a = a
-                self.b = b
-                self.c = c
-
-        class e(object):
-            def __init__(self,a,b,c=4):
-                self.a = a
-                self.b = b
-                self.c = c
-                self.d = a
-                self.e = b
-                self.f = c
-
-        for i in xrange(self.rounds):
-            pass

Modified: python/trunk/Tools/pybench/Numbers.py
==============================================================================
--- python/trunk/Tools/pybench/Numbers.py	(original)
+++ python/trunk/Tools/pybench/Numbers.py	Fri May 26 20:26:21 2006
@@ -4,7 +4,7 @@
 
     version = 0.1
     operations = 30 * 5
-    rounds = 1200*21
+    rounds = 120000
 
     def test(self):
 
@@ -200,7 +200,7 @@
 
     version = 0.1
     operations = 30 * 5
-    rounds = 600*27
+    rounds = 60000
 
     def test(self):
 
@@ -396,7 +396,7 @@
 
     version = 0.1
     operations = 30 * 5
-    rounds = 600*16
+    rounds = 60000
 
     def test(self):
 
@@ -592,7 +592,7 @@
 
     version = 0.1
     operations = 30 * 5
-    rounds = 600*24
+    rounds = 60000
 
     def test(self):
 

Modified: python/trunk/Tools/pybench/Setup.py
==============================================================================
--- python/trunk/Tools/pybench/Setup.py	(original)
+++ python/trunk/Tools/pybench/Setup.py	Fri May 26 20:26:21 2006
@@ -17,7 +17,6 @@
 Warp_factor = 20
 
 # Import tests
-#from Empty import *
 from Arithmetic import *
 from Calls import *
 from Constructs import *

Modified: python/trunk/Tools/pybench/Strings.py
==============================================================================
--- python/trunk/Tools/pybench/Strings.py	(original)
+++ python/trunk/Tools/pybench/Strings.py	Fri May 26 20:26:21 2006
@@ -5,7 +5,7 @@
 
     version = 0.1
     operations = 10 * 5
-    rounds = 6000
+    rounds = 60000
 
     def test(self):
 
@@ -87,7 +87,7 @@
 
     version = 0.2
     operations = 10 * 5
-    rounds = 2000*22
+    rounds = 200000
 
     def test(self):
 
@@ -169,7 +169,7 @@
 
     version = 0.1
     operations = 10 * 5
-    rounds = 2000*28
+    rounds = 200000
 
     def test(self):
 
@@ -251,7 +251,7 @@
 
     version = 0.1
     operations = 10 * 5
-    rounds = 800*32
+    rounds = 80000
 
     def test(self):
 
@@ -326,7 +326,7 @@
 
     version = 0.1
     operations = 5 * 7
-    rounds = 1000*15
+    rounds = 100000
 
     def test(self):
 
@@ -389,7 +389,7 @@
 
         version = 0.1
         operations = 3 * (5 + 4 + 2 + 1)
-        rounds = 14000
+        rounds = 70000
 
         def test(self):
 
@@ -462,7 +462,7 @@
 
         version = 0.1
         operations = 10 * 7
-        rounds = 800*24
+        rounds = 80000
 
         def test(self):
 

Modified: python/trunk/Tools/pybench/Tuples.py
==============================================================================
--- python/trunk/Tools/pybench/Tuples.py	(original)
+++ python/trunk/Tools/pybench/Tuples.py	Fri May 26 20:26:21 2006
@@ -4,7 +4,7 @@
 
     version = 0.31
     operations = 3 * 25 * 10 * 7
-    rounds = 100
+    rounds = 400
 
     def test(self):
 
@@ -272,7 +272,7 @@
 
     version = 0.3
     operations = 5*(1 + 3 + 6 + 2)
-    rounds = 800*16
+    rounds = 80000
 
     def test(self):
 

Modified: python/trunk/Tools/pybench/Unicode.py
==============================================================================
--- python/trunk/Tools/pybench/Unicode.py	(original)
+++ python/trunk/Tools/pybench/Unicode.py	Fri May 26 20:26:21 2006
@@ -10,7 +10,7 @@
 
     version = 0.1
     operations = 10 * 5
-    rounds = 600*7
+    rounds = 60000
 
     def test(self):
 
@@ -92,7 +92,7 @@
 
     version = 0.1
     operations = 10 * 5
-    rounds = 1500*17
+    rounds = 150000
 
     def test(self):
 
@@ -174,7 +174,7 @@
 
     version = 0.1
     operations = 10 * 5
-    rounds = 800*12
+    rounds = 80000
 
     def test(self):
 
@@ -249,7 +249,7 @@
 
     version = 0.1
     operations = 5 * 7
-    rounds = 10000
+    rounds = 100000
 
     def test(self):
 
@@ -310,7 +310,7 @@
 
     version = 0.1
     operations = 3 * (5 + 4 + 2 + 1)
-    rounds = 100*15
+    rounds = 10000
 
     def test(self):
 
@@ -383,7 +383,7 @@
 
     version = 0.1
     operations = 5 * 9
-    rounds = 1000*25
+    rounds = 100000
 
     def test(self):
 
@@ -460,7 +460,7 @@
 
         version = 0.1
         operations = 5 * 8
-        rounds = 1000*15
+        rounds = 100000
 
         def test(self):
 

Modified: python/trunk/Tools/pybench/pybench.py
==============================================================================
--- python/trunk/Tools/pybench/pybench.py	(original)
+++ python/trunk/Tools/pybench/pybench.py	Fri May 26 20:26:21 2006
@@ -35,7 +35,7 @@
 """
 
 # Version number
-__version__ = '1.4'
+__version__ = '1.3'
 
 #
 # NOTE: Use xrange for all test loops unless you want to face
