[Spambayes-checkins] spambayes classifier.py,1.28,1.29

[Tim Peters]

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

Modified Files:
	classifier.py 
Log Message:
Sneak more info into the clues returned by the central limit schemes.


Index: classifier.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/classifier.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** classifier.py	4 Oct 2002 18:37:52 -0000	1.28
--- classifier.py	5 Oct 2002 02:07:41 -0000	1.29
***************
*** 459,464 ****
              clues = [(word, prob) for prob, word, record in clues]
              clues.sort(lambda a, b: cmp(a[1], b[1]))
!             clues.insert(0, ('*zspam*', zspam))
!             clues.insert(0, ('*zham*', zham))
              return score, clues
          else:
--- 459,469 ----
              clues = [(word, prob) for prob, word, record in clues]
              clues.sort(lambda a, b: cmp(a[1], b[1]))
!             extra = [('*zham*', zham),
!                      ('*zspam*', zspam),
!                      ('*hmean*', mean),
!                      ('*smean*', mean),
!                      ('*n*', n),
!                     ]
!             clues[0:0] = extra
              return score, clues
          else:
***************
*** 554,559 ****
              clues = [(word, prob) for prob, word, record in clues]
              clues.sort(lambda a, b: cmp(a[1], b[1]))
!             clues.insert(0, ('*zspam*', zspam))
!             clues.insert(0, ('*zham*', zham))
              return score, clues
          else:
--- 559,569 ----
              clues = [(word, prob) for prob, word, record in clues]
              clues.sort(lambda a, b: cmp(a[1], b[1]))
!             extra = [('*zham*', zham),
!                      ('*zspam*', zspam),
!                      ('*hmean*', hmean),
!                      ('*smean*', smean),
!                      ('*n*', n),
!                     ]
!             clues[0:0] = extra
              return score, clues
          else: