[Jboost-cvs] jboost/scripts surfing.py,1.1,1.2

[Aaron A. <aa...@us...>]

Update of /cvsroot/jboost/jboost/scripts
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3389

Modified Files:
	surfing.py 
Log Message:
minor updates

Index: surfing.py
===================================================================
RCS file: /cvsroot/jboost/jboost/scripts/surfing.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** surfing.py	10 Jul 2007 01:34:17 -0000	1.1
--- surfing.py	12 Jul 2007 16:07:26 -0000	1.2
***************
*** 67,70 ****
--- 67,71 ----
  		y = math.exp(-math.pow(x-mu,2)/(var)) * max_bin 
  		p = (1 - erf((x-mu)/math.sqrt(var)))/2
+ 		p = min(2*p, 1)
  		weights.append((x,y,p))
  		x += step
***************
*** 76,80 ****
  	num_bins = 0
  	if is_cum:
! 		num_bins = 100
  	else:
  		num_bins = 30
--- 77,81 ----
  	num_bins = 0
  	if is_cum:
! 		num_bins = 200
  	else:
  		num_bins = 30
***************
*** 154,158 ****
  	epsoutlines.append('set terminal post\n')
  	epsoutlines.append('set output \'surfing%05d.eps\'\n' % (iter))
! 	epsoutlines.append('set title "'+  params[0] +  'boost ' + datafile + ' Surfing: Iteration ' + str(iter) + '" font "Times,20"\n')
  	epsoutlines.append('set key left top\n')
  	epsoutlines.append('set yzeroaxis lt -1\n')
--- 155,159 ----
  	epsoutlines.append('set terminal post\n')
  	epsoutlines.append('set output \'surfing%05d.eps\'\n' % (iter))
! 	epsoutlines.append('set title "'+  params[0] +  'boost ' + datafile + ' Surfing: Time Remaining ' + str(params[2]) + '" font "Times,20"\n')
  	epsoutlines.append('set key left top\n')
  	epsoutlines.append('set yzeroaxis lt -1\n')
***************
*** 165,170 ****
--- 166,176 ----
  	epsoutlines.append('set xlabel "Margin" font "Times,20"\n')
  	epsoutlines.append('set ylabel "Cumulative Distribution" font "Times,20"\n')
+ #	epsoutlines.append('EPS = 0.00001\n')
+ #	epsoutlines.append('theta = %.5f\n' % (params[5]))
+ #	epsoutlines.append('set parametric \n')
+ #	epsoutlines.append('delta(t) = (x<=theta+EPS ? x>=theta-EPS ? 1.0 : 0 : 0 )\n')
  	epsoutlines.append('plot "surfing_hist.dat" using 1:2 title "Margin CDF" with lines, ' + \
  				'"surfing_weight.dat" using 1:2 title "Potential" with lines \n')
+ #				'delta(t) with lines \n')
  #	if params[0]=='normal':
  #		epsoutlines.append('set parametric\n')