[Jboost-cvs] jboost/src/jboost/controller Configuration.java, 1.7, 1.8 Controller.java, 1.5, 1.6

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

Update of /cvsroot/jboost/jboost/src/jboost/controller
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26595

Modified Files:
	Configuration.java Controller.java 
Log Message:
Logging changed to be correct

Index: Controller.java
===================================================================
RCS file: /cvsroot/jboost/jboost/src/jboost/controller/Controller.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Controller.java	2 Oct 2007 20:36:43 -0000	1.5
--- Controller.java	5 Dec 2007 06:39:57 -0000	1.6
***************
*** 171,174 ****
--- 171,175 ----
  	} catch (Exception e) {
  	    // XXX: what to do?
+ 	    e.printStackTrace();
  	    throw new InstantiationException(e.getMessage());
  	}
***************
*** 206,212 ****
  	    m_learningTree= new InstrumentedAlternatingTree(m_splitterBuilderVector, m_booster, 
  							    m_trainSetIndices,m_config);
! 	    System.out.println("Finished creating root (iteration -1)");
  	}
      
  	// main loop
  	start= System.currentTimeMillis();
--- 207,220 ----
  	    m_learningTree= new InstrumentedAlternatingTree(m_splitterBuilderVector, m_booster, 
  							    m_trainSetIndices,m_config);
! 	    System.out.println("Finished creating root (iteration 0)");
! 	    if (Monitor.logLevel > 1) {
! 		m_monitor.logIteration(
! 				       0, // iteration
! 				       m_learningTree.getCombinedPredictor(),
! 				       m_learningTree.getLastBasePredictor());
! 	    }
  	}
      
+ 
  	// main loop
  	start= System.currentTimeMillis();
***************
*** 346,356 ****
      
  	Executor pe=ExecutorSinglet.getExecutor();
! 	for (int iter= 0; iter < iterNo	&& !m_learningTree.boosterIsFinished(); iter++) {
! 	    if (Monitor.logLevel > 1) {
! 		m_monitor.logIteration(
! 				       iter,
! 				       m_learningTree.getCombinedPredictor(),
! 				       m_learningTree.getLastBasePredictor());
! 	    }
  	    start= System.currentTimeMillis();
  	    Vector candidates= m_learningTree.getCandidates();
--- 354,358 ----
      
  	Executor pe=ExecutorSinglet.getExecutor();
! 	for (int iter= 1; iter <= iterNo && !m_learningTree.boosterIsFinished(); iter++) {
  	    start= System.currentTimeMillis();
  	    Vector candidates= m_learningTree.getCandidates();
***************
*** 422,429 ****
  			    + iter);
  	    }
- 	    System.out.println("Finished learning iteration " + iter);
  	    if(m_booster instanceof BrownBoost){
  		iterNo++;
  	    }
  	}
  
--- 424,437 ----
  			    + iter);
  	    }
  	    if(m_booster instanceof BrownBoost){
  		iterNo++;
  	    }
+ 	    System.out.println("Finished learning iteration " + iter);
+ 	    if (Monitor.logLevel > 1) {
+ 		m_monitor.logIteration(
+ 				       iter,
+ 				       m_learningTree.getCombinedPredictor(),
+ 				       m_learningTree.getLastBasePredictor());
+ 	    }
  	}
  

Index: Configuration.java
===================================================================
RCS file: /cvsroot/jboost/jboost/src/jboost/controller/Configuration.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Configuration.java	23 Oct 2007 22:46:32 -0000	1.7
--- Configuration.java	5 Dec 2007 06:39:57 -0000	1.8
***************
*** 95,99 ****
  	+ "\t-BoosTexter	   Only make a zero prediction at the root node.\n"
  	+ "\t-booster_smooth sf   Smoothing factor for prediction computation (default: 0.5)\n"
! 	+ "\t                     Described Shapire & Singer 1999 (smoothing the predictions), \n"
  	+ "\t                     $epsilon = sf / total_num_examples$  \n"
  	+ "\t-booster_paranoid Use safe version of booster (default: false)\n"
--- 95,99 ----
  	+ "\t-BoosTexter	   Only make a zero prediction at the root node.\n"
  	+ "\t-booster_smooth sf   Smoothing factor for prediction computation (default: 0.5)\n"
! 	+ "\t                     Described Schapire & Singer 1999 (smoothing the predictions), \n"
  	+ "\t                     $epsilon = sf / total_num_examples$  \n"
  	+ "\t-booster_paranoid Use safe version of booster (default: false)\n"