[Spambayes-checkins] spambayes cmp.py,1.12,1.13

[Sjoerd Mullender]

Update of /cvsroot/spambayes/spambayes
In directory usw-pr-cvs1:/tmp/cvs-serv11535

Modified Files:
	cmp.py 
Log Message:
Protect against a mean of 0.

Index: cmp.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/cmp.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** cmp.py	23 Sep 2002 21:46:34 -0000	1.12
--- cmp.py	24 Sep 2002 11:43:06 -0000	1.13
***************
*** 82,92 ****
      mean1,dev1 = m1
      mean2,dev2 = m2
!     mp = (mean2 - mean1) * 100.0 / mean1
!     dp = (dev2 - dev1) * 100.0 / dev1
! 
!     return "%2.2f %2.2f (%+2.2f%%)     %2.2f %2.2f (%+2.2f%%)" %  (
!             mean1,mean2,mp,
!             dev1,dev2,dp
!         )
  
  def dump(p1s, p2s):
--- 82,98 ----
      mean1,dev1 = m1
      mean2,dev2 = m2
!     t = "%7.2f %7.2f " % (mean1, mean2)
!     if mean1:
!         mp = (mean2 - mean1) * 100.0 / mean1
!         t += "%+7.2f%%" % mp
!     else:
!         t += "+(was 0)"
!     t += "     %7.2f %7.2f " % (dev1, dev2)
!     if dev1:
!         dp = (dev2 - dev1) * 100.0 / dev1
!         t += "%+7.2f%%" % dp
!     else:
!         t += "+(was 0)"
!     return t
  
  def dump(p1s, p2s):
***************
*** 134,138 ****
  
  print
! print "ham mean                 ham sdev"
  dumpdev(hamdev1,hamdev2)
  print
--- 140,144 ----
  
  print
! print "ham mean                     ham sdev"
  dumpdev(hamdev1,hamdev2)
  print
***************
*** 141,145 ****
  
  print
! print "spam mean                spam sdev"
  dumpdev(spamdev1,spamdev2)
  print
--- 147,151 ----
  
  print
! print "spam mean                    spam sdev"
  dumpdev(spamdev1,spamdev2)
  print