[Spambayes-checkins] spambayes Tester.py,1.6,1.7

Tim Peters tim_one@users.sourceforge.net
Sat, 19 Oct 2002 21:01:10 -0700


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

Modified Files:
	Tester.py 
Log Message:
false_positive_rate(), false_negative_rate(), unsure_rate():
return 0.0 instead of raising ZeroDivisionError if the base set is
empty; e.g., if you *just* predict against ham in some test, there
is no spam to count in the divisor for false_negative_rate().


Index: Tester.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Tester.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Tester.py	17 Oct 2002 06:23:13 -0000	1.6
--- Tester.py	20 Oct 2002 04:01:08 -0000	1.7
***************
*** 118,130 ****
      def false_positive_rate(self):
          """Percentage of ham mistakenly identified as spam, in 0.0..100.0."""
!         return self.nham_wrong * 1e2 / self.nham_tested
  
      def false_negative_rate(self):
          """Percentage of spam mistakenly identified as ham, in 0.0..100.0."""
!         return self.nspam_wrong * 1e2 / self.nspam_tested
  
      def unsure_rate(self):
          return ((self.nham_unsure + self.nspam_unsure) * 1e2 /
!                 (self.nham_tested + self.nspam_tested))
  
      def false_positives(self):
--- 118,130 ----
      def false_positive_rate(self):
          """Percentage of ham mistakenly identified as spam, in 0.0..100.0."""
!         return self.nham_wrong * 1e2 / (self.nham_tested or 1)
  
      def false_negative_rate(self):
          """Percentage of spam mistakenly identified as ham, in 0.0..100.0."""
!         return self.nspam_wrong * 1e2 / (self.nspam_tested or 1)
  
      def unsure_rate(self):
          return ((self.nham_unsure + self.nspam_unsure) * 1e2 /
!                 ((self.nham_tested + self.nspam_tested) or 1))
  
      def false_positives(self):