[Python-checkins] python/dist/src/Demo/scripts mpzpi.py,1.2,1.3

[rhettinger at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Demo/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv6924

Modified Files:
	mpzpi.py 
Log Message:
Update to use python ints and int/long unification.

Index: mpzpi.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Demo/scripts/mpzpi.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mpzpi.py	27 Nov 1996 19:47:00 -0000	1.2
--- mpzpi.py	10 Dec 2003 01:58:52 -0000	1.3
***************
*** 9,34 ****
  
  import sys
- from mpz import mpz
  
  def main():
! 	mpzone, mpztwo, mpzten = mpz(1), mpz(2), mpz(10)
! 	k, a, b, a1, b1 = mpz(2), mpz(4), mpz(1), mpz(12), mpz(4)
! 	while 1:
! 		# Next approximation
! 		p, q, k = k*k, mpztwo*k+mpzone, k+mpzone
! 		a, b, a1, b1 = a1, b1, p*a+q*a1, p*b+q*b1
! 		# Print common digits
! 		d, d1 = a/b, a1/b1
! 		while d == d1:
! 			output(d)
! 			a, a1 = mpzten*(a%b), mpzten*(a1%b1)
! 			d, d1 = a/b, a1/b1
  
  def output(d):
! 	# Use write() to avoid spaces between the digits
! 	# Use int(d) to avoid a trailing L after each digit
! 	sys.stdout.write(`int(d)`)
! 	# Flush so the output is seen immediately
! 	sys.stdout.flush()
  
  main()
--- 9,32 ----
  
  import sys
  
  def main():
!         k, a, b, a1, b1 = 2, 4, 1, 12, 4
!         while 1:
!                 # Next approximation
!                 p, q, k = k*k, 2*k+1, k+1
!                 a, b, a1, b1 = a1, b1, p*a+q*a1, p*b+q*b1
!                 # Print common digits
!                 d, d1 = a/b, a1/b1
!                 while d == d1:
!                         output(d)
!                         a, a1 = 10*(a%b), 10*(a1%b1)
!                         d, d1 = a/b, a1/b1
  
  def output(d):
!         # Use write() to avoid spaces between the digits
!         # Use int(d) to avoid a trailing L after each digit
!         sys.stdout.write(`int(d)`)
!         # Flush so the output is seen immediately
!         sys.stdout.flush()
  
  main()