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/02/17 19:02:16 UTC
svn commit: r508786 - in /spamassassin/trunk/masses: config config.set0
config.set1 config.set2 config.set3 runGA
Author: jm
Date: Sat Feb 17 10:02:15 2007
New Revision: 508786
URL: http://svn.apache.org/viewvc?view=rev&rev=508786
Log:
try to remove the requirement of single-threaded use of ../rules/50_scores.cf in runGA script; update configs to what was used in bug 5270
Modified:
spamassassin/trunk/masses/config
spamassassin/trunk/masses/config.set0
spamassassin/trunk/masses/config.set1
spamassassin/trunk/masses/config.set2
spamassassin/trunk/masses/config.set3
spamassassin/trunk/masses/runGA
Modified: spamassassin/trunk/masses/config
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/config?view=diff&rev=508786&r1=508785&r2=508786
==============================================================================
--- spamassassin/trunk/masses/config (original)
+++ spamassassin/trunk/masses/config Sat Feb 17 10:02:15 2007
@@ -1,5 +1,5 @@
-SCORESET=0
+SCORESET=1
HAM_PREFERENCE=5.0
THRESHOLD=5.0
-EPOCHS=0
+EPOCHS=100
NOTE=
Modified: spamassassin/trunk/masses/config.set0
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/config.set0?view=diff&rev=508786&r1=508785&r2=508786
==============================================================================
--- spamassassin/trunk/masses/config.set0 (original)
+++ spamassassin/trunk/masses/config.set0 Sat Feb 17 10:02:15 2007
@@ -1,5 +1,5 @@
SCORESET=0
HAM_PREFERENCE=2.0
-THRESHOLD=4.0
+THRESHOLD=5.0
EPOCHS=100
NOTE=
Modified: spamassassin/trunk/masses/config.set1
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/config.set1?view=diff&rev=508786&r1=508785&r2=508786
==============================================================================
--- spamassassin/trunk/masses/config.set1 (original)
+++ spamassassin/trunk/masses/config.set1 Sat Feb 17 10:02:15 2007
@@ -1,5 +1,5 @@
SCORESET=1
-HAM_PREFERENCE=2.0
-THRESHOLD=4.7
+HAM_PREFERENCE=5.0
+THRESHOLD=5.0
EPOCHS=100
NOTE=
Modified: spamassassin/trunk/masses/config.set2
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/config.set2?view=diff&rev=508786&r1=508785&r2=508786
==============================================================================
--- spamassassin/trunk/masses/config.set2 (original)
+++ spamassassin/trunk/masses/config.set2 Sat Feb 17 10:02:15 2007
@@ -1,5 +1,5 @@
SCORESET=2
-HAM_PREFERENCE=2.0
-THRESHOLD=4.625
+HAM_PREFERENCE=5.0
+THRESHOLD=5.0
EPOCHS=100
NOTE=
Modified: spamassassin/trunk/masses/config.set3
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/config.set3?view=diff&rev=508786&r1=508785&r2=508786
==============================================================================
--- spamassassin/trunk/masses/config.set3 (original)
+++ spamassassin/trunk/masses/config.set3 Sat Feb 17 10:02:15 2007
@@ -1,5 +1,5 @@
SCORESET=3
-HAM_PREFERENCE=2.0
+HAM_PREFERENCE=5.0
THRESHOLD=5.0
EPOCHS=100
NOTE=
Modified: spamassassin/trunk/masses/runGA
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/runGA?view=diff&rev=508786&r1=508785&r2=508786
==============================================================================
--- spamassassin/trunk/masses/runGA (original)
+++ spamassassin/trunk/masses/runGA Sat Feb 17 10:02:15 2007
@@ -34,12 +34,17 @@
fi
# This should be in here instead. Prevents testing.
-svn revert ../rules/50_scores.cf
+# svn revert ../rules/50_scores.cf
+
+rm -rf tmprules
+cp -r ../rules tmprules
+
+cp tmprules/50_scores.cf orig_scores.cf
# fix all scores to non-zero (avoid a possible bug, not quite sure)
-./enable-all-evolved-rules < ../rules/50_scores.cf \
- > ../rules/50_scores.cf.new || exit 1
-mv ../rules/50_scores.cf.new ../rules/50_scores.cf
+./enable-all-evolved-rules < tmprules/50_scores.cf \
+ > tmprules/50_scores.cf.new || exit 1
+mv tmprules/50_scores.cf.new tmprules/50_scores.cf
echo "[Doing a scoreset $SCORESET score-generation run]"
@@ -88,15 +93,21 @@
# misuse EPOCHS as pop size
./garescorer -b $HAM_PREFERENCE -s $EPOCHS -t $THRESHOLD
+# POST-GA COMMANDS:
+
mv garescorer.scores $LOGDIR/scores
echo "[gen run end]"
-svn revert ../rules/50_scores.cf
-./rewrite-cf-with-new-scores $SCORESET ../rules/50_scores.cf $LOGDIR/scores > /tmp/runGA.$$
-mv /tmp/runGA.$$ ../rules/50_scores.cf
-cp ../rules/50_scores.cf $LOGDIR/50_scores.cf
+cp orig_scores.cf tmprules/50_scores.cf
+./rewrite-cf-with-new-scores $SCORESET tmprules/50_scores.cf \
+ $LOGDIR/scores > tmprules/50_newscores.cf
+mv tmprules/50_newscores.cf tmprules/50_scores.cf
+cp tmprules/50_scores.cf $LOGDIR/50_scores.cf
+
+./fp-fn-statistics --ham ham-test.log --spam spam-test.log --scoreset $SCORESET \
+ --fnlog $LOGDIR/false_negatives --fplog $LOGDIR/false_positives > $LOGDIR/test
-./fp-fn-statistics --ham ham-test.log --spam spam-test.log --scoreset $SCORESET --fnlog $LOGDIR/false_negatives --fplog $LOGDIR/false_positives > $LOGDIR/test
+# END OF POST-GA COMMANDS
) | tee $LOGDIR/log