[Jboost-cvs] jboost/scripts nfold.py,1.5,1.6

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

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

Modified Files:
	nfold.py 
Log Message:
booster option added, resample removed

Index: nfold.py
===================================================================
RCS file: /cvsroot/jboost/jboost/scripts/nfold.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** nfold.py	10 Jul 2007 01:38:38 -0000	1.5
--- nfold.py	7 Oct 2007 02:15:35 -0000	1.6
***************
*** 10,14 ****
  
  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)'
--- 10,15 ----
  
  def usage():
! 	print 'Usage: nfold.py <--booster=boosttype> <--folds=number> [--generate | --dir=dir] [--data=file --spec=file] [--rounds=number --tree=treetype]'
! 	print '\t--booster=TYPE     AdaBoost, LogLossBoost, BrownBoost, etc (required)'
  	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)'
***************
*** 23,31 ****
      
      
! def learner(atreeoption, k, rounds):
      # XXX: put in description!
      config= os.getenv('JBOOST_CONFIG')
      command = 'java -Xmx1000M -cp ' + os.getenv('CLASSPATH') \
! 	      + ' jboost.controller.Controller -b LogLossBoost -p 3 -a -1 -S trial' + str(k) \
  	      + ' -n trial.spec -ATreeType '+ atreeoption +' -numRounds ' + str(rounds)
      if (config != None):
--- 24,32 ----
      
      
! def learner(atreeoption, k, rounds, booster):
      # XXX: put in description!
      config= os.getenv('JBOOST_CONFIG')
      command = 'java -Xmx1000M -cp ' + os.getenv('CLASSPATH') \
! 	      + ' jboost.controller.Controller -b ' + booster + ' -p 3 -a -1 -S trial' + str(k) \
  	      + ' -n trial.spec -ATreeType '+ atreeoption +' -numRounds ' + str(rounds)
      if (config != None):
***************
*** 78,82 ****
          testfile.close()
          trainfile.close()
! 	os.system('./resample.py --k=128 --label=" 1" --train=' + trainfilename);
  
      
--- 79,83 ----
          testfile.close()
          trainfile.close()
! 	#os.system('./resample.py --k=128 --label=" 1" --train=' + trainfilename);
  
      
***************
*** 92,96 ****
      try:
          opts, args = getopt.getopt(sys.argv[1:],'' ,
!                                    ['folds=','data=','spec=','dir=','rounds=','tree=','generate'])
      except getopt.GetoptError:
          print 'nfold.py: Illegal argument\n'
--- 93,97 ----
      try:
          opts, args = getopt.getopt(sys.argv[1:],'' ,
!                                    ['booster=','folds=','data=','spec=','dir=','rounds=','tree=','generate'])
      except getopt.GetoptError:
          print 'nfold.py: Illegal argument\n'
***************
*** 99,103 ****
  
      # parse options
!     datafile = specfile = folds = dirname = generateData = rounds = tree = None
      for opt,arg in opts:
          if (opt == '--data'):
--- 100,104 ----
  
      # parse options
!     booster = datafile = specfile = folds = dirname = generateData = rounds = tree = None
      for opt,arg in opts:
          if (opt == '--data'):
***************
*** 105,108 ****
--- 106,111 ----
          elif (opt == '--spec'):
              specfile= arg
+         elif (opt == '--booster'):
+             booster= arg
          elif (opt == '--folds'):
              folds = int(arg)
***************
*** 128,131 ****
--- 131,139 ----
  	    sys.exit(2)
  	    
+     if (booster == None):
+ 	    print 'nfold.py: --booster is a required parameter.\n'
+ 	    usage()
+ 	    sys.exit(2)
+ 	    
      if (datafile != None and specfile == None):
  	    print 'nfold.py: --data option requies --spec option.\n'
***************
*** 194,198 ****
              print '* Fold ' + str(k) + '     |'
              print '*============'
!             learner(treetype, k, rounds)
              print '*=---------------------------------------------------------------------=-*'
              moveresults(treetype)
--- 202,206 ----
              print '* Fold ' + str(k) + '     |'
              print '*============'
!             learner(treetype, k, rounds, booster)
              print '*=---------------------------------------------------------------------=-*'
              moveresults(treetype)