svn commit: r1032191 - in /spamassassin/trunk/rulesrc/sandbox/dos/new-rule-score-gen: do-nightly-rescore-example merge-scoresets

[do...@apache.org]

Author: dos
Date: Sun Nov  7 00:50:54 2010
New Revision: 1032191

URL: http://svn.apache.org/viewvc?rev=1032191&view=rev
Log:
bug 6510: temporarily force all generated scores to be non-zero

Modified:
    spamassassin/trunk/rulesrc/sandbox/dos/new-rule-score-gen/do-nightly-rescore-example
    spamassassin/trunk/rulesrc/sandbox/dos/new-rule-score-gen/merge-scoresets

Modified: spamassassin/trunk/rulesrc/sandbox/dos/new-rule-score-gen/do-nightly-rescore-example
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/dos/new-rule-score-gen/do-nightly-rescore-example?rev=1032191&r1=1032190&r2=1032191&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/dos/new-rule-score-gen/do-nightly-rescore-example (original)
+++ spamassassin/trunk/rulesrc/sandbox/dos/new-rule-score-gen/do-nightly-rescore-example Sun Nov  7 00:50:54 2010
@@ -32,6 +32,10 @@ else
   REVISION=`grep "revision .*" scores-set0 | cut -d" " -f9`
 fi
 
+# 20101106 - temporarily s/0.000/0.001/g scores - bug 6510
+sed -e 's/0.000/0.001 # force non-zero/g' < scores-set0 > scores-set0-non-zero; mv -f scores-set0-non-zero scores-set0
+sed -e 's/0.000/0.001 # force non-zero/g' < scores-set1 > scores-set1-non-zero; mv -f scores-set1-non-zero scores-set1
+
 cp scores-set0 scores-set2
 cp scores-set1 scores-set3
 ./merge-scoresets $SCORESET

Modified: spamassassin/trunk/rulesrc/sandbox/dos/new-rule-score-gen/merge-scoresets
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/dos/new-rule-score-gen/merge-scoresets?rev=1032191&r1=1032190&r2=1032191&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/dos/new-rule-score-gen/merge-scoresets (original)
+++ spamassassin/trunk/rulesrc/sandbox/dos/new-rule-score-gen/merge-scoresets Sun Nov  7 00:50:54 2010
@@ -34,7 +34,7 @@ $active_rule_set = $ARGV[0] if (defined 
 if (defined $active_rule_set) {
   open (SCORES, "scores-set$active_rule_set") or die "Cannot open scores-set$active_rule_set: $!";
   while(<SCORES>) {
-    next unless /^score (\S+)\s+(-?[\d.]+)$/;
+    next unless /^score (\S+)\s+(-?[\d.]+)\b/;
     @{$rules{$1}} = ('0.001', '0.001' ,'0.001', '0.001');
     $rules{$1}[$active_rule_set] = $2;
   }
@@ -45,7 +45,7 @@ for (my $i = 0; $i < 4; $i++) {
   next if (defined $active_rule_set && $i == $active_rule_set);
   open (SCORES, "scores-set$i") or die "Cannot open scores-set$i: $!";
   while(<SCORES>) {
-    next unless /^score (\S+)\s+(-?[\d.]+)$/;
+    next unless /^score (\S+)\s+(-?[\d.]+)\b/;
     next if (defined $active_rule_set && !exists $rules{$1});
     @{$rules{$1}} = ('0.001', '0.001' ,'0.001', '0.001') unless exists $rules{$1};
     $rules{$1}[$i] = $2;