[Spambayes-checkins] spambayes/spambayes Options.py, 1.111, 1.112 classifier.py, 1.25, 1.26

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2027/spambayes

Modified Files:
	Options.py classifier.py 
Log Message:
Change [Classifier] x-use_bigrams to a normal, not experimental option.  i.e. it's now
[Classifier] use_bigrams.

Note that this has almost no effect (the only one I can think of is that it won't be
listed on the Experimental options page in sb_server/sb_imapfilter).

The option is still False by default, and if you have "x-use_bigrams" in your config
file, it'll still (silently) work.  You can remove the x- if you like.

Index: Options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Options.py,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** Options.py	5 Aug 2004 00:55:54 -0000	1.111
--- Options.py	9 Aug 2004 06:50:03 -0000	1.112
***************
*** 459,464 ****
       BOOLEAN, RESTORE),
  
!     ("x-use_bigrams", "Use mixed uni/bi-grams scheme", False,
!      """(EXPERIMENTAL) Generate both unigrams (words) and bigrams (pairs of
       words). However, extending an idea originally from Gary Robinson, the
       message is 'tiled' into non-overlapping unigrams and bigrams,
--- 459,464 ----
       BOOLEAN, RESTORE),
  
!     ("use_bigrams", "Use mixed uni/bi-grams scheme", False,
!      """Generate both unigrams (words) and bigrams (pairs of
       words). However, extending an idea originally from Gary Robinson, the
       message is 'tiled' into non-overlapping unigrams and bigrams,

Index: classifier.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/classifier.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** classifier.py	19 Jul 2004 09:58:59 -0000	1.25
--- classifier.py	9 Aug 2004 06:50:04 -0000	1.26
***************
*** 267,271 ****
          else that it's definitely not spam.
          """
!         if options["Classifier", "x-use_bigrams"]:
              wordstream = self._enhance_wordstream(wordstream)
          if options["URLRetriever", "x-slurp_urls"]:
--- 267,271 ----
          else that it's definitely not spam.
          """
!         if options["Classifier", "use_bigrams"]:
              wordstream = self._enhance_wordstream(wordstream)
          if options["URLRetriever", "x-slurp_urls"]:
***************
*** 278,282 ****
          Pass the same arguments you passed to learn().
          """
!         if options["Classifier", "x-use_bigrams"]:
              wordstream = self._enhance_wordstream(wordstream)
          if options["URLRetriever", "x-slurp_urls"]:
--- 278,282 ----
          Pass the same arguments you passed to learn().
          """
!         if options["Classifier", "use_bigrams"]:
              wordstream = self._enhance_wordstream(wordstream)
          if options["URLRetriever", "x-slurp_urls"]:
***************
*** 430,434 ****
          mindist = options["Classifier", "minimum_prob_strength"]
  
!         if options["Classifier", "x-use_bigrams"]:
              # This scheme mixes single tokens with pairs of adjacent tokens.
              # wordstream is "tiled" into non-overlapping unigrams and
--- 430,434 ----
          mindist = options["Classifier", "minimum_prob_strength"]
  
!         if options["Classifier", "use_bigrams"]:
              # This scheme mixes single tokens with pairs of adjacent tokens.
              # wordstream is "tiled" into non-overlapping unigrams and
***************
*** 534,539 ****
          "word").
  
!         If the experimental "Classifier":"x-use_bigrams" option is
!         removed, this function can be removed, too.
          """
  
--- 534,539 ----
          "word").
  
!         If the "Classifier":"use_bigrams" option is removed, this function
!         can be removed, too.
          """