[Spambayes-checkins] spambayes timtest.py,1.29,1.30

[Anthony Baxter]

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

Modified Files:
	timtest.py 
Log Message:
Added support for specifying different numbers for training and testing
ham and spam. Old options --ham-keep and --spam-keep (or --ham/--spam) 
still work as before. New options --HamTest --SpamTest --HamTrain --SpamTrain  
have been added to timcv.py.

Note that msgs.setparms _tries_ to do the right thing if it's called as
an old 3-arg form, but I might not have captured all the possible 
twistedness. As far as I can tell, only timcv.py and timtest.py
actually call these. Also, msgs.HamStream and msgs.SpamStream now
have an option 'train' argument (which defaults to 0/False), which
tells them whether to use the test or train numbers. 

If you have your own test harnesses, you _might_ need to update them
a little. 



Index: timtest.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/timtest.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** timtest.py	24 Sep 2002 05:37:11 -0000	1.29
--- timtest.py	1 Nov 2002 04:13:11 -0000	1.30
***************
*** 98,102 ****
          usage(1, "-n is required")
  
!     msgs.setparms(hamkeep, spamkeep, seed)
      drive(nsets)
  
--- 98,102 ----
          usage(1, "-n is required")
  
!     msgs.setparms(hamkeep, spamkeep, seed=seed)
      drive(nsets)