Update of /cvsroot/spambayes/spambayes/Outlook2000
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11996/Outlook2000
Modified Files:
filter.py manager.py msgstore.py
Log Message:
It makes life much simpler if the classification strings match the non-Outlook
ones.
Thresholds are 0-100, cutoffs are 0.0-1.0 - need to convert between them, or
everything
is spam!
Index: filter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/filter.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** filter.py 22 Dec 2004 00:30:26 -0000 1.43
--- filter.py 22 Dec 2004 01:22:00 -0000 1.44
***************
*** 17,29 ****
disposition = "Yes"
attr_prefix = "spam"
! msg.c = mgr.bayes_options["Headers", "header_spam_string"]
elif prob_perc >= config.unsure_threshold:
disposition = "Unsure"
attr_prefix = "unsure"
! msg.c = mgr.bayes_options["Headers", "header_unsure_string"]
else:
disposition = "No"
attr_prefix = "ham"
! msg.c = mgr.bayes_options["Headers", "header_ham_string"]
ms = mgr.message_store
--- 17,30 ----
disposition = "Yes"
attr_prefix = "spam"
! msg.c = mgr.bayes_options["Headers", "header_spam_string"][0]
elif prob_perc >= config.unsure_threshold:
disposition = "Unsure"
attr_prefix = "unsure"
! msg.c = mgr.bayes_options["Headers", "header_unsure_string"][0]
else:
disposition = "No"
attr_prefix = "ham"
! msg.c = mgr.bayes_options["Headers", "header_ham_string"][0]
! mgr.classifier_data.message_db.store_msg(msg)
ms = mgr.message_store
Index: manager.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/manager.py,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** manager.py 22 Dec 2004 00:30:26 -0000 1.104
--- manager.py 22 Dec 2004 01:22:00 -0000 1.105
***************
*** 457,463 ****
self.bayes_options = bayes_options
bayes_options["Categorization", "spam_cutoff"] = \
! self.config.filter.spam_threshold
bayes_options["Categorization", "ham_cutoff"] = \
! self.config.filter.unsure_threshold
self.stats = bayes_stats.Stats(bayes_options,
self.classifier_data.message_db)
--- 457,465 ----
self.bayes_options = bayes_options
bayes_options["Categorization", "spam_cutoff"] = \
! self.config.filter.spam_threshold \
! / 100.0
bayes_options["Categorization", "ham_cutoff"] = \
! self.config.filter.unsure_threshold \
! / 100.0
self.stats = bayes_stats.Stats(bayes_options,
self.classifier_data.message_db)
***************
*** 908,914 ****
# stats use) to our thresholds.
bayes_options["Categorization", "spam_cutoff"] = \
! self.config.filter.spam_threshold
bayes_options["Categorization", "ham_cutoff"] = \
! self.config.filter.unsure_threshold
# And tell the addin that our filters may have changed.
if self.addin is not None:
--- 910,918 ----
# stats use) to our thresholds.
bayes_options["Categorization", "spam_cutoff"] = \
! self.config.filter.spam_threshold \
! / 100.0
bayes_options["Categorization", "ham_cutoff"] = \
! self.config.filter.unsure_threshold \
! / 100.0
# And tell the addin that our filters may have changed.
if self.addin is not None:
Index: msgstore.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/msgstore.py,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** msgstore.py 21 Dec 2004 21:48:37 -0000 1.97
--- msgstore.py 22 Dec 2004 01:22:00 -0000 1.98
***************
*** 812,815 ****
--- 812,816 ----
self.t = None
self.c = None
+ self.date_modified = None
self.original_folder = None
_______________________________________________
Spambayes-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/spambayes-checkins
