[Spambayes-checkins] spambayes/testtools mboxtest.py,1.2,1.3 simplexloop.py,1.2,1.3 weaktest.py,1.2,1.3

[Anthony Baxter]

Update of /cvsroot/spambayes/spambayes/testtools
In directory sc8-pr-cvs1:/tmp/cvs-serv9465/testtools

Modified Files:
	mboxtest.py simplexloop.py weaktest.py 
Log Message:
Whitespace n11n
(if localization can be l10n, normalization can be n11n :)


Index: mboxtest.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/testtools/mboxtest.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mboxtest.py	17 Jan 2003 06:42:54 -0000	1.2
--- mboxtest.py	29 Jan 2003 03:23:35 -0000	1.3
***************
*** 25,29 ****
  import random
  import re
! try: 
      from sets import Set
  except ImportError:
--- 25,29 ----
  import random
  import re
! try:
      from sets import Set
  except ImportError:

Index: simplexloop.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/testtools/simplexloop.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** simplexloop.py	17 Jan 2003 06:42:54 -0000	1.2
--- simplexloop.py	29 Jan 2003 03:23:35 -0000	1.3
***************
*** 8,12 ****
          Show usage and exit.
      -c command
!         The command to be run, with all its options. 
          The last line of output from this program should
          match 'YYYYYYY cost: $xxxx.xx'
--- 8,12 ----
          Show usage and exit.
      -c command
!         The command to be run, with all its options.
          The last line of output from this program should
          match 'YYYYYYY cost: $xxxx.xx'

Index: weaktest.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/testtools/weaktest.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** weaktest.py	17 Jan 2003 06:42:54 -0000	1.2
--- weaktest.py	29 Jan 2003 03:23:35 -0000	1.3
***************
*** 21,25 ****
          Number of Set directories (Data/Spam/Set1, ... and Data/Ham/Set1, ...).
          This is required.
!     -d decider 
          Name of the decider. One of %(decisionkeys)s
      -m min
--- 21,25 ----
          Number of Set directories (Data/Spam/Set1, ... and Data/Ham/Set1, ...).
          This is required.
!     -d decider
          Name of the decider. One of %(decisionkeys)s
      -m min
***************
*** 63,80 ****
      def spamtrain(self,scr):
          if scr < options.spam_cutoff:
! 	    return TRAIN_AS_SPAM
  
      def hamtrain(self,scr):
          if scr > options.ham_cutoff:
! 	    return TRAIN_AS_HAM
  
  class UnsureOnly(TrainDecision):
      def spamtrain(self,scr):
          if options.ham_cutoff < scr < options.spam_cutoff:
! 	    return TRAIN_AS_SPAM
  
      def hamtrain(self,scr):
          if options.ham_cutoff < scr < options.spam_cutoff:
! 	    return TRAIN_AS_HAM
  
  class All(TrainDecision):
--- 63,80 ----
      def spamtrain(self,scr):
          if scr < options.spam_cutoff:
!             return TRAIN_AS_SPAM
  
      def hamtrain(self,scr):
          if scr > options.ham_cutoff:
!             return TRAIN_AS_HAM
  
  class UnsureOnly(TrainDecision):
      def spamtrain(self,scr):
          if options.ham_cutoff < scr < options.spam_cutoff:
!             return TRAIN_AS_SPAM
  
      def hamtrain(self,scr):
          if options.ham_cutoff < scr < options.spam_cutoff:
!             return TRAIN_AS_HAM
  
  class All(TrainDecision):
***************
*** 88,92 ****
      def spamtrain(self,scr):
          if scr < 0.995:
! 	    return TRAIN_AS_SPAM
  
      def hamtrain(self,scr):
--- 88,92 ----
      def spamtrain(self,scr):
          if scr < 0.995:
!             return TRAIN_AS_SPAM
  
      def hamtrain(self,scr):
***************
*** 97,103 ****
      def hamtrain(self,scr):
          if scr < options.ham_cutoff:
! 	    return TRAIN_AS_HAM
          elif scr > options.spam_cutoff:
! 	    return TRAIN_AS_SPAM
  
      spamtrain = hamtrain
--- 97,103 ----
      def hamtrain(self,scr):
          if scr < options.ham_cutoff:
!             return TRAIN_AS_HAM
          elif scr > options.spam_cutoff:
!             return TRAIN_AS_SPAM
  
      spamtrain = hamtrain
***************
*** 127,136 ****
          if self.tooearly():
              if is_spam:
! 		return TRAIN_AS_SPAM
              else:
! 		return TRAIN_AS_HAM
          else:
              return self.client(scr,is_spam)
!     
      def tooearly(self):
          return self.x < self.n
--- 127,136 ----
          if self.tooearly():
              if is_spam:
!                 return TRAIN_AS_SPAM
              else:
!                 return TRAIN_AS_HAM
          else:
              return self.client(scr,is_spam)
! 
      def tooearly(self):
          return self.x < self.n
***************
*** 182,187 ****
                      print "Ham with score %.2f"%scr
                  cc.ham(scr)
!         de = decision(scr,is_spam) 
!         if de == TRAIN_AS_SPAM: 
              d.train_spam(m)
              spamtrain += 1
--- 182,187 ----
                      print "Ham with score %.2f"%scr
                  cc.ham(scr)
!         de = decision(scr,is_spam)
!         if de == TRAIN_AS_SPAM:
              d.train_spam(m)
              spamtrain += 1