Update of /cvsroot/jboost/jboost/scripts
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv618/scripts
Modified Files:
margin.py
Log Message:
Significant speed up (only find max once)
Index: margin.py
===================================================================
RCS file: /cvsroot/jboost/jboost/scripts/margin.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** margin.py 31 May 2007 10:03:00 -0000 1.6
--- margin.py 13 Jun 2007 16:09:14 -0000 1.7
***************
*** 87,90 ****
--- 87,96 ----
lines = []
+ margin_list_maxes = []
+ for i in range(len(margin_list)):
+ margins = margin_list[i]
+ margin_list_maxes.append(max(margins))
+
+
for w in range(len(margin_list[0])):
line = ""
***************
*** 92,96 ****
for i in range(len(margin_list)):
margins = margin_list[i]
! marg_max = max(margins)
line += ' '
line += str(margins[w]/marg_max)
--- 98,102 ----
for i in range(len(margin_list)):
margins = margin_list[i]
! marg_max = margin_list_maxes[i]
line += ' '
line += str(margins[w]/marg_max)
***************
*** 287,293 ****
margin_list.append(margins)
process_data(examples, labels, margin_list[len(margin_list)-1], scores, datafile, sample)
- write_gnuplot(margin_list, iters, datafile)
--- 293,300 ----
margin_list.append(margins)
+ write_gnuplot(margin_list, iters, datafile)
+
process_data(examples, labels, margin_list[len(margin_list)-1], scores, datafile, sample)
|
