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

[Tim Peters]

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

Modified Files:
	cmp.py 
Log Message:
Restored ability to analyze older result files (from before the time
ham & spam mean & sdevs were displayed).

Added more commas.


Index: cmp.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/cmp.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** cmp.py	25 Sep 2002 03:29:01 -0000	1.16
--- cmp.py	26 Sep 2002 03:20:51 -0000	1.17
***************
*** 30,33 ****
--- 30,34 ----
      hamdev = []
      spamdev = []
+     hamdevall = spamdevall = (0.0, 0.0)
  
      get = f.readline
***************
*** 87,93 ****
      return t
  
! def mtag(m1,m2):
!     mean1,dev1 = m1
!     mean2,dev2 = m2
      t = "%7.2f %7.2f " % (mean1, mean2)
      if mean1:
--- 88,94 ----
      return t
  
! def mtag(m1, m2):
!     mean1, dev1 = m1
!     mean2, dev2 = m2
      t = "%7.2f %7.2f " % (mean1, mean2)
      if mean1:
***************
*** 115,120 ****
      print
  
! def dumpdev(meandev1,meandev2):
!     for m1,m2 in zip(meandev1,meandev2):
          print mtag(m1, m2)
  
--- 116,121 ----
      print
  
! def dumpdev(meandev1, meandev2):
!     for m1, m2 in zip(meandev1, meandev2):
          print mtag(m1, m2)
  
***************
*** 151,170 ****
  
  print
! print "ham mean                     ham sdev"
! dumpdev(hamdev1,hamdev2)
! print
! print "ham mean and sdev for all runs"
! dumpdev([hamdevall1],[hamdevall2])
  
! print
! print "spam mean                    spam sdev"
! dumpdev(spamdev1,spamdev2)
! print
! print "spam mean and sdev for all runs"
! dumpdev([spamdevall1],[spamdevall2])
! print
! 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)
--- 152,176 ----
  
  print
! if len(hamdev1) == len(hamdev2) and len(spamdev1) == len(spamdev2):
!     print "ham mean                     ham sdev"
!     dumpdev(hamdev1, hamdev2)
!     print
!     print "ham mean and sdev for all runs"
!     dumpdev([hamdevall1], [hamdevall2])
  
! 
!     print
!     print "spam mean                    spam sdev"
!     dumpdev(spamdev1, spamdev2)
!     print
!     print "spam mean and sdev for all runs"
!     dumpdev([spamdevall1], [spamdevall2])
! 
!     print
!     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)
! else:
!     print "[info about ham & spam means & sdevs not available in both files]"