[Spambayes-checkins] spambayes cmp.py,1.15,1.16

Tim Peters tim_one@users.sourceforge.net
Tue, 24 Sep 2002 20:29:03 -0700


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

Modified Files:
	cmp.py 
Log Message:
Split long lines, added commas.


Index: cmp.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/cmp.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** cmp.py	25 Sep 2002 03:26:40 -0000	1.15
--- cmp.py	25 Sep 2002 03:29:01 -0000	1.16
***************
*** 37,41 ****
              print line,
          if line.find(' items; mean ') != -1:
!             "-> <stat> Ham distribution for this pair: 1000 items; mean 0.05; sample sdev 0.68"
              # and later "sample " went away
              vals = line.split(';')
--- 37,41 ----
              print line,
          if line.find(' items; mean ') != -1:
!             # -> <stat> Ham distribution for this pair: 1000 items; mean 0.05; sample sdev 0.68
              # and later "sample " went away
              vals = line.split(';')
***************
*** 132,137 ****
  f2n = windowsfy(f2n)
  
! fp1, fn1, fptot1, fntot1, fpmean1, fnmean1,hamdev1,spamdev1,hamdevall1,spamdevall1 = suck(file(f1n))
! fp2, fn2, fptot2, fntot2, fpmean2, fnmean2,hamdev2,spamdev2,hamdevall2,spamdevall2 = suck(file(f2n))
  
  print
--- 132,140 ----
  f2n = windowsfy(f2n)
  
! (fp1, fn1, fptot1, fntot1, fpmean1, fnmean1,
!  hamdev1, spamdev1, hamdevall1, spamdevall1) = suck(file(f1n))
! 
! (fp2, fn2, fptot2, fntot2, fpmean2, fnmean2,
!  hamdev2, spamdev2, hamdevall2, spamdevall2) = suck(file(f2n))
  
  print
***************
*** 163,165 ****
  diff1 = spamdevall1[0] - hamdevall1[0]
  diff2 = spamdevall2[0] - hamdevall2[0]
! print "ham/spam mean difference: %2.2f %2.2f %+2.2f" % (diff1,diff2,(diff2-diff1))
--- 166,170 ----
  diff1 = spamdevall1[0] - hamdevall1[0]
  diff2 = spamdevall2[0] - hamdevall2[0]
! print "ham/spam mean difference: %2.2f %2.2f %+2.2f" % (diff1,
!                                                         diff2,
!                                                         diff2 - diff1)