[Spambayes-checkins] spambayes simplexloop.py,1.1,1.2

[Rob W.W. Hooft]

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

Modified Files:
	simplexloop.py 
Log Message:
optimize only 3 parameters; some changes to make it easier to follow a run

Index: simplexloop.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/simplexloop.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** simplexloop.py	15 Nov 2002 21:35:15 -0000	1.1
--- simplexloop.py	19 Nov 2002 17:44:25 -0000	1.2
***************
*** 35,42 ****
  start = (Options.options.unknown_word_prob,
           Options.options.minimum_prob_strength,
!          Options.options.unknown_word_strength,
!          Options.options.spam_cutoff,
!          Options.options.ham_cutoff)
! err = (0.01, 0.01, 0.01, 0.005, 0.01)
  
  def mkini(vars):
--- 35,40 ----
  start = (Options.options.unknown_word_prob,
           Options.options.minimum_prob_strength,
!          Options.options.unknown_word_strength)
! err = (0.01, 0.01, 0.01)
  
  def mkini(vars):
***************
*** 47,54 ****
  minimum_prob_strength = %.6f
  unknown_word_strength = %.6f
- 
- [TestDriver]
- spam_cutoff = %.4f
- ham_cutoff = %.4f
  """%tuple(vars))
      f.close()
--- 45,48 ----
***************
*** 66,71 ****
      cost = float(txt[-1].split()[2][1:])
      f.close()
!     # print ''.join(txt[-4:])[:-1]
!     print "x=%.4f p=%.4f s=%.4f sc=%.3f hc=%.3f %.2f"%(tuple(vars)+(cost,))
      return -cost
  
--- 60,67 ----
      cost = float(txt[-1].split()[2][1:])
      f.close()
!     os.rename('loop.out','loop.out.old')
!     print ''.join(txt[-20:])[:-1]
!     print "x=%.4f p=%.4f s=%.4f %.2f"%(tuple(vars)+(cost,))
!     sys.stdout.flush()
      return -cost