[Jboost-cvs] jboost/src/jboost/controller Controller.java, 1.13, 1.14

[Sunsern C. <sch...@us...>]

Update of /cvsroot/jboost/jboost/src/jboost/controller
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9644/src/jboost/controller

Modified Files:
	Controller.java 
Log Message:
Add support for RobustBoost

Index: Controller.java
===================================================================
RCS file: /cvsroot/jboost/jboost/src/jboost/controller/Controller.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Controller.java	3 Jan 2009 05:13:32 -0000	1.13
--- Controller.java	5 Feb 2009 05:59:04 -0000	1.14
***************
*** 7,10 ****
--- 7,12 ----
  import java.io.ObjectOutputStream;
  import java.io.PrintWriter;
+ import java.text.DecimalFormat;
+ import java.text.NumberFormat;
  import java.util.Iterator;
  import java.util.Vector;
***************
*** 21,24 ****
--- 23,27 ----
  import jboost.booster.Booster;
  import jboost.booster.Prediction;
+ import jboost.booster.RobustBoost;
  import jboost.examples.BadLabelException;
  import jboost.examples.Example;
***************
*** 437,444 ****
                              + iter);
              }
              if(m_booster instanceof BrownBoost){
!                 iterNo++;
              }
!             System.out.println("Finished learning iteration " + iter);
              if (Monitor.logLevel > 1) {
                  m_monitor.logIteration(
--- 440,457 ----
                              + iter);
              }
+             
              if(m_booster instanceof BrownBoost){
!               iterNo++;
              }
!             
!             if(m_booster instanceof RobustBoost){
!               NumberFormat f= new DecimalFormat("0.000000");
!               System.out.println("[Iter = " + iter + 
!                   ",Time =  " + f.format(((RobustBoost)m_booster).getCurrentTime()) +
!                   ",TotalWeight =  " + f.format(((RobustBoost)m_booster).getTotalWeight()) + "]");
!             }
!             else 
!               System.out.println("Finished learning iteration " + iter);
!             
              if (Monitor.logLevel > 1) {
                  m_monitor.logIteration(