[Spambayes-checkins] spambayes/spambayes ImapUI.py, 1.27, 1.28 Options.py, 1.87, 1.88 ProxyUI.py, 1.31, 1.32 ServerUI.py, 1.3, 1.4

[Tim Peters]

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1:/tmp/cvs-serv25360/spambayes

Modified Files:
	ImapUI.py Options.py ProxyUI.py ServerUI.py 
Log Message:
Finished deprecating the experimental_ham_spam_imbalance_adjustment option.


Index: ImapUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/ImapUI.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ImapUI.py	14 Dec 2003 02:08:25 -0000	1.27
--- ImapUI.py	15 Dec 2003 00:16:19 -0000	1.28
***************
*** 80,84 ****
  adv_map = (
      ('Statistics Options',  None),
-     ('Classifier',          'experimental_ham_spam_imbalance_adjustment'),
      ('Classifier',          'max_discriminators'),
      ('Classifier',          'minimum_prob_strength'),
--- 80,83 ----

Index: Options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Options.py,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** Options.py	14 Dec 2003 04:12:32 -0000	1.87
--- Options.py	15 Dec 2003 00:16:19 -0000	1.88
***************
*** 364,368 ****
       assigning certainty (0 or 1) to a word that has appeared in only ham
       or only spam.  This is a disaster.
!      
       As unknown_word_strength tends toward infintity, all probabilities
       tend toward unknown_word_prob.  All reports were that a value near 0.4
--- 364,368 ----
       assigning certainty (0 or 1) to a word that has appeared in only ham
       or only spam.  This is a disaster.
! 
       As unknown_word_strength tends toward infintity, all probabilities
       tend toward unknown_word_prob.  All reports were that a value near 0.4
***************
*** 411,418 ****
      # strong imbalance need to test it first.\
      # LATER:  this option sucked, creating more problems than it solved.
!     # XXX The code in classifier.py is gone now.  How can we get rid of
!     # XXX the option gracefully?
  
!     ("experimental_ham_spam_imbalance_adjustment", "Compensate for unequal numbers of spam and ham", False,
       """If your training database has significantly more ham than
       spam, or vice versa, you may start seeing an increase in incorrect
--- 411,420 ----
      # strong imbalance need to test it first.\
      # LATER:  this option sucked, creating more problems than it solved.
!     # It's deprecated, and the support code has gone away.
!     # XXX The "x-" prefix can't be "X-" instead, else it's considered
!     # XXX an invalid option instead of a deprecated one.  That behavior
!     # XXX doesn't match the OptionsClass comments.
  
!     ("x-experimental_ham_spam_imbalance_adjustment", "Compensate for unequal numbers of spam and ham", False,
       """If your training database has significantly more ham than
       spam, or vice versa, you may start seeing an increase in incorrect
***************
*** 951,955 ****
       PORT, RESTORE),
    ),
!  
    "globals" : (
      ("verbose", "Verbose", False,
--- 953,957 ----
       PORT, RESTORE),
    ),
! 
    "globals" : (
      ("verbose", "Verbose", False,
***************
*** 1013,1017 ****
              options.merge_files(alts)
              optionsPathname = os.path.abspath(alts[-1])
!     
      if not optionsPathname:
          optionsPathname = os.path.abspath('bayescustomize.ini')
--- 1015,1019 ----
              options.merge_files(alts)
              optionsPathname = os.path.abspath(alts[-1])
! 
      if not optionsPathname:
          optionsPathname = os.path.abspath('bayescustomize.ini')

Index: ProxyUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/ProxyUI.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** ProxyUI.py	14 Dec 2003 01:36:49 -0000	1.31
--- ProxyUI.py	15 Dec 2003 00:16:19 -0000	1.32
***************
*** 105,109 ****
  adv_map = (
      ('Statistics Options',  None),
-     ('Classifier',          'experimental_ham_spam_imbalance_adjustment'),
      ('Classifier',          'max_discriminators'),
      ('Classifier',          'minimum_prob_strength'),
--- 105,108 ----

Index: ServerUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/ServerUI.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ServerUI.py	14 Dec 2003 01:36:49 -0000	1.3
--- ServerUI.py	15 Dec 2003 00:16:20 -0000	1.4
***************
*** 57,61 ****
      ('Categorization',      'ham_cutoff'),
      ('Categorization',      'spam_cutoff'),
-     ('Classifier',          'experimental_ham_spam_imbalance_adjustment'),
  )
  
--- 57,60 ----