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

[william b. <wil...@us...>]

Update of /cvsroot/jboost/jboost/scripts
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16407/scripts

Modified Files:
	nfold.py 
Log Message:
major change to outbound dirname structure.  cvdata and train test splits are now nested inside datafile.fold_N folder.  
cvdata dirname includes year

Index: nfold.py
===================================================================
RCS file: /cvsroot/jboost/jboost/scripts/nfold.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** nfold.py	7 Oct 2007 02:15:35 -0000	1.6
--- nfold.py	25 Jan 2009 05:57:46 -0000	1.7
***************
*** 7,10 ****
--- 7,11 ----
  import getopt
  import shutil
+ import glob
  
  
***************
*** 43,51 ****
  # XXX: put in description!
  
!     os.system('mv *.info ./'+foldername)    
!     os.system('mv *.scores ./'+foldername)
!     os.system('mv *.output.tree ./'+foldername)
!     os.system('mv *.sampling ./'+foldername)
!     os.system('mv *.log ./'+foldername)
  
  
--- 44,66 ----
  # XXX: put in description!
  
!     for f in glob.glob('*.tree'):
!     	shutil.move(f,foldername)
! 	for f in glob.glob('*.info'):
! 		shutil.move(f,foldername)
! 	for f in glob.glob('*.scores'):
! 		shutil.move(f,foldername)
! 	for f in glob.glob('*.output.tree'):
! 		shutil.move(f,foldername)
! 	for f in glob.glob('*.sampling'):
! 		shutil.move(f,foldername)
! 	for f in glob.glob('*.log'):
! 		shutil.move(f,foldername)
! 			
! #	os.system('mv *.tree ./'+foldername)   	    
! #    os.system('mv *.info ./'+foldername)    
! #    os.system('mv *.scores ./'+foldername)
! #    os.system('mv *.output.tree ./'+foldername)
! #    os.system('mv *.sampling ./'+foldername)
! #    os.system('mv *.log ./'+foldername)
  
  
***************
*** 162,166 ****
          # create directory for n-folds of data
          if (dirname == None):
!             dirname= 'cvdata-' + time.strftime("%m-%d-%H-%M-%S")
  
          try:
--- 177,181 ----
          # create directory for n-folds of data
          if (dirname == None):
!             dirname= datafile + ".folds_" + str(folds)
  
          try:
***************
*** 189,196 ****
      else:
  	    adtrees=[tree]
! 		
      for treetype in adtrees:
          try:
!             os.mkdir(treetype)
          except OSError:
  #            print 'Directory '+ treetype + ' already exists.'
--- 204,217 ----
      else:
  	    adtrees=[tree]
! 	
!     treedir_prefix = "cvdata-" + time.strftime("%m-%d-%y-%H-%M-%S")
!     try:
!         os.mkdir(treedir_prefix)
!     except OSError:
!         print 'Directory '+ treedir_prefix + ' already exists.'
! 	
      for treetype in adtrees:
          try:
!             os.mkdir(os.path.join(treedir_prefix,treetype))
          except OSError:
  #            print 'Directory '+ treetype + ' already exists.'
***************
*** 204,208 ****
              learner(treetype, k, rounds, booster)
              print '*=---------------------------------------------------------------------=-*'
!             moveresults(treetype)
          
  
--- 225,229 ----
              learner(treetype, k, rounds, booster)
              print '*=---------------------------------------------------------------------=-*'
!             moveresults(os.path.join(treedir_prefix,treetype))