[Spambayes-checkins] spambayes Options.py,1.28,1.29 timcv.py,1.8,1.9 timtest.py,1.28,1.29

[Anthony Baxter]

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

Modified Files:
	Options.py timcv.py timtest.py 
Log Message:
Made the Data/Ham/SetN and Data/Spam/SetN things options that can be
over-ridden. Don't see why the rest of us should things this way just because
Tim thinks it's the correct way to do things <wink>

More importantly, means you can do test runs with different corpuses
(corpuscles? corpi? corpen?) at the same time.


Index: Options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Options.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Options.py	24 Sep 2002 03:29:48 -0000	1.28
--- Options.py	24 Sep 2002 05:37:11 -0000	1.29
***************
*** 151,154 ****
--- 151,160 ----
  save_histogram_pickles: False
  
+ # default locations for timcv and timtest - these get the set number 
+ # appended.
+ spam_directories: Data/Spam/Set%d
+ ham_directories: Data/Ham/Set%d
+ 
+ 
  [Classifier]
  # Fiddling these can have extreme effects.  See classifier.py for comments.
***************
*** 240,243 ****
--- 246,251 ----
                     'show_charlimit': int_cracker,
                     'spam_cutoff': float_cracker,
+                    'spam_directories': string_cracker,
+                    'ham_directories': string_cracker,
                    },
      'Classifier': {'hambias': float_cracker,

Index: timcv.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/timcv.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** timcv.py	23 Sep 2002 20:18:34 -0000	1.8
--- timcv.py	24 Sep 2002 05:37:11 -0000	1.9
***************
*** 52,57 ****
      print options.display()
  
!     hamdirs  = ["Data/Ham/Set%d" % i for i in range(1, nsets+1)]
!     spamdirs = ["Data/Spam/Set%d" % i for i in range(1, nsets+1)]
  
      d = TestDriver.Driver()
--- 52,57 ----
      print options.display()
  
!     hamdirs  = [options.ham_directories % i for i in range(1, nsets+1)]
!     spamdirs = [options.spam_directories % i for i in range(1, nsets+1)]
  
      d = TestDriver.Driver()

Index: timtest.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/timtest.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** timtest.py	23 Sep 2002 20:18:34 -0000	1.28
--- timtest.py	24 Sep 2002 05:37:11 -0000	1.29
***************
*** 54,59 ****
      print options.display()
  
!     spamdirs = ["Data/Spam/Set%d" % i for i in range(1, nsets+1)]
!     hamdirs  = ["Data/Ham/Set%d" % i for i in range(1, nsets+1)]
      spamhamdirs = zip(spamdirs, hamdirs)
  
--- 54,59 ----
      print options.display()
  
!     spamdirs = [options.spam_directories % i for i in range(1, nsets+1)]
!     hamdirs  = [options.ham_directories % i for i in range(1, nsets+1)]
      spamhamdirs = zip(spamdirs, hamdirs)