[Jboost-cvs] jboost/scripts error.py, 1.2, 1.3 margin.py, 1.3, 1.4 nfold.py, 1.2, 1.3

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

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

Modified Files:
	error.py margin.py nfold.py 
Log Message:
A variety of small changes.
- Aaron


Index: margin.py
===================================================================
RCS file: /cvsroot/jboost/jboost/scripts/margin.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** margin.py	17 May 2007 07:55:16 -0000	1.3
--- margin.py	19 May 2007 01:57:56 -0000	1.4
***************
*** 10,19 ****
  def usage():
  	print 'Usage: margin.py    '
! 	print '--scores=filename   scores file as output by jboost'
! 	print '--data=filename     train/test filename'
! 	print '--spec=filename     spec filename'
! 	print '--iteration=NUMBER  the iteration number to inspect'
! 	print '--sample            are we interested in a sample of false pos/neg'
! 	print '--labels=filename   labels file (if unspecified then created from data file)'
  
  def sortByColumns(list2d, column_indices, in_place=False):
--- 10,19 ----
  def usage():
  	print 'Usage: margin.py    '
! 	print '\t--scores=filename   scores file as output by jboost'
! 	print '\t--data=filename     train/test filename'
! 	print '\t--spec=filename     spec filename'
! 	print '\t--iteration=NUMBER  the iteration number to inspect'
! 	print '\t--sample            are we interested in a sample of false pos/neg'
! 	print '\t--labels=filename   labels file (if unspecified then created from data file)'
  
  def sortByColumns(list2d, column_indices, in_place=False):

Index: error.py
===================================================================
RCS file: /cvsroot/jboost/jboost/scripts/error.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** error.py	17 May 2007 07:55:16 -0000	1.2
--- error.py	19 May 2007 01:57:56 -0000	1.3
***************
*** 7,14 ****
  
  def usage():
! 	print 'Usage: margin.py    '
! 	print '--info=info_file    scores file as output by jboost'
! 	print '--logaxis           should the axis be log-scaled (default: false)'
! 	print '--bound             show the bound on training error'
  
  def main():
--- 7,14 ----
  
  def usage():
! 	print 'Usage: error.py    '
! 	print '\t--info=info_file    scores file as output by jboost'
! 	print '\t--logaxis           should the axis be log-scaled (default: false)'
! 	print '\t--bound             show the bound on training error'
  
  def main():

Index: nfold.py
===================================================================
RCS file: /cvsroot/jboost/jboost/scripts/nfold.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nfold.py	17 May 2007 07:55:16 -0000	1.2
--- nfold.py	19 May 2007 01:57:56 -0000	1.3
***************
*** 11,23 ****
  def usage():
  	print 'Usage: nfold.py <--folds=number> [--generate | --dir=dir] [--data=filename --spec=filename] [--rounds=number --tree=treetype]'
! 	print '  --folds=N          create N files for N fold cross validation (required)'
! 	print '  --data=DATAFILE    DATAFILE contains the data to be divided into test/train sets (required)'
! 	print '  --spec=SPECFILE    SPECFILE is the same as used in JBoost typically (required)'
! 	print '  --rounds=N         The number of rounds to run the booster (required)'
! 	print '  --tree=TREETYPE    The type of tree nodes to use possible options are ADD_ROOT, '
! 	print '                     ADD_ALL, ADD_SINGLES, ADD_ROOT_OR_SINGLES.  If unspecified, all'
! 	print '                     types will be executed sequentially'
! 	print '  --generate         Creates directories for the cross validation sets'
! 	print '  --dir=DIR          Specifies a name for the directory to be generated'
  
      
--- 11,23 ----
  def usage():
  	print 'Usage: nfold.py <--folds=number> [--generate | --dir=dir] [--data=filename --spec=filename] [--rounds=number --tree=treetype]'
! 	print '\t--folds=N          create N files for N fold cross validation (required)'
! 	print '\t--data=DATAFILE    DATAFILE contains the data to be divided into test/train sets (required)'
! 	print '\t--spec=SPECFILE    SPECFILE is the same as used in JBoost typically (required)'
! 	print '\t--rounds=N         The number of rounds to run the booster (required)'
! 	print '\t--tree=TREETYPE    The type of tree nodes to use possible options are ADD_ROOT, '
! 	print '\t                   ADD_ALL, ADD_SINGLES, ADD_ROOT_OR_SINGLES.  If unspecified, all'
! 	print '\t                   types will be executed sequentially'
! 	print '\t--generate         Creates directories for the cross validation sets'
! 	print '\t--dir=DIR          Specifies a name for the directory to be generated'