You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2007/10/15 14:06:21 UTC
svn commit: r584760 -
/spamassassin/branches/bug-5293-pluginized-bayes/lib/Mail/SpamAssassin/Plugin/OSBF.pm
Author: jm
Date: Mon Oct 15 05:06:21 2007
New Revision: 584760
URL: http://svn.apache.org/viewvc?rev=584760&view=rev
Log:
tiny speedup; no need to keep the %pw data for Winnow unless a plugin needs them
Modified:
spamassassin/branches/bug-5293-pluginized-bayes/lib/Mail/SpamAssassin/Plugin/OSBF.pm
Modified: spamassassin/branches/bug-5293-pluginized-bayes/lib/Mail/SpamAssassin/Plugin/OSBF.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/bug-5293-pluginized-bayes/lib/Mail/SpamAssassin/Plugin/OSBF.pm?rev=584760&r1=584759&r2=584760&view=diff
==============================================================================
--- spamassassin/branches/bug-5293-pluginized-bayes/lib/Mail/SpamAssassin/Plugin/OSBF.pm (original)
+++ spamassassin/branches/bug-5293-pluginized-bayes/lib/Mail/SpamAssassin/Plugin/OSBF.pm Mon Oct 15 05:06:21 2007
@@ -724,13 +724,14 @@
my @touch_tokens = ();
my $log_each_token = (would_log('dbg', 'osbf') > 1);
+ my $keep_pw = $self->{main}->have_plugin("bayes_scan");
+ my %pw;
# A variant of the Winnow classifier algorithm, as described in
# section 2 of _Combining Winnow and Orthogonal Sparse Bigrams
# for Incremental Spam Filtering_, Siefkes, Assis, Chhabra
# and Yerazunis.
- my %pw;
my $total_spam = 0;
my $total_ham = 0;
foreach my $tokendata (@{$tokensdata}) {
@@ -747,12 +748,12 @@
# update the atime on this token, it proved useful
push(@touch_tokens, $token);
-dbg("osbf: token '$msgtokens->{$token}' => s=$tok_spam / h=$tok_ham");
+# dbg("osbf: token '$msgtokens->{$token}' => s=$tok_spam / h=$tok_ham");
if ($log_each_token) {
dbg("osbf: token '$msgtokens->{$token}' => s=$tok_spam / h=$tok_ham");
}
- $pw{$token} = {
+ $keep_pw and $pw{$token} = {
prob => 0.5,
spam_count => $w_spam, # TODO, does this make sense?
ham_count => $w_ham,