[Python-checkins] python/dist/src/Lib random.py,1.53,1.54

[rhettinger at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv19586

Modified Files:
	random.py 
Log Message:
Eliminate unnecessary eval() in tests

Index: random.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/random.py,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** random.py	9 Aug 2003 18:30:57 -0000	1.53
--- random.py	30 Aug 2003 01:24:19 -0000	1.54
***************
*** 688,695 ****
  ## -------------------- test program --------------------
  
! def _test_generator(n, funccall):
      import time
!     print n, 'times', funccall
!     code = compile(funccall, funccall, 'eval')
      total = 0.0
      sqsum = 0.0
--- 688,694 ----
  ## -------------------- test program --------------------
  
! def _test_generator(n, func, args):
      import time
!     print n, 'times', func.__name__
      total = 0.0
      sqsum = 0.0
***************
*** 698,702 ****
      t0 = time.time()
      for i in range(n):
!         x = eval(code)
          total += x
          sqsum = sqsum + x*x
--- 697,701 ----
      t0 = time.time()
      for i in range(n):
!         x = func(*args)
          total += x
          sqsum = sqsum + x*x
***************
*** 712,730 ****
  
  def _test(N=2000):
!     _test_generator(N, 'random()')
!     _test_generator(N, 'normalvariate(0.0, 1.0)')
!     _test_generator(N, 'lognormvariate(0.0, 1.0)')
!     _test_generator(N, 'vonmisesvariate(0.0, 1.0)')
!     _test_generator(N, 'gammavariate(0.01, 1.0)')
!     _test_generator(N, 'gammavariate(0.1, 1.0)')
!     _test_generator(N, 'gammavariate(0.1, 2.0)')
!     _test_generator(N, 'gammavariate(0.5, 1.0)')
!     _test_generator(N, 'gammavariate(0.9, 1.0)')
!     _test_generator(N, 'gammavariate(1.0, 1.0)')
!     _test_generator(N, 'gammavariate(2.0, 1.0)')
!     _test_generator(N, 'gammavariate(20.0, 1.0)')
!     _test_generator(N, 'gammavariate(200.0, 1.0)')
!     _test_generator(N, 'gauss(0.0, 1.0)')
!     _test_generator(N, 'betavariate(3.0, 3.0)')
  
  # Create one instance, seeded from current time, and export its methods
--- 711,729 ----
  
  def _test(N=2000):
!     _test_generator(N, random, ())
!     _test_generator(N, normalvariate, (0.0, 1.0))
!     _test_generator(N, lognormvariate, (0.0, 1.0))
!     _test_generator(N, vonmisesvariate, (0.0, 1.0))
!     _test_generator(N, gammavariate, (0.01, 1.0))
!     _test_generator(N, gammavariate, (0.1, 1.0))
!     _test_generator(N, gammavariate, (0.1, 2.0))
!     _test_generator(N, gammavariate, (0.5, 1.0))
!     _test_generator(N, gammavariate, (0.9, 1.0))
!     _test_generator(N, gammavariate, (1.0, 1.0))
!     _test_generator(N, gammavariate, (2.0, 1.0))
!     _test_generator(N, gammavariate, (20.0, 1.0))
!     _test_generator(N, gammavariate, (200.0, 1.0))
!     _test_generator(N, gauss, (0.0, 1.0))
!     _test_generator(N, betavariate, (3.0, 3.0))
  
  # Create one instance, seeded from current time, and export its methods