[Jboost-cvs] jboost/src/jboost/controller Controller.java, 1.15, 1.16

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

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

Modified Files:
	Controller.java 
Log Message:
* multiclass support for RobustBoost

Index: Controller.java
===================================================================
RCS file: /cvsroot/jboost/jboost/src/jboost/controller/Controller.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Controller.java	9 Feb 2009 10:40:19 -0000	1.15
--- Controller.java	19 Feb 2009 14:22:56 -0000	1.16
***************
*** 23,26 ****
--- 23,27 ----
  import jboost.booster.Booster;
  import jboost.booster.Prediction;
+ import jboost.booster.MulticlassWrapMH;
  import jboost.booster.RobustBoost;
  import jboost.examples.BadLabelException;
***************
*** 444,448 ****
                iterNo++;
              }
!             
              if(m_booster instanceof RobustBoost){
                NumberFormat f= new DecimalFormat("0.00000");
--- 445,449 ----
                iterNo++;
              }
!             // binary case of RobustBoost
              if(m_booster instanceof RobustBoost){
                NumberFormat f= new DecimalFormat("0.00000");
***************
*** 454,457 ****
--- 455,471 ----
                    ", dt= " + f.format(((RobustBoost)m_booster).getLastDt()) + "]");
              }
+             // multiclass case of RobustBoost
+             else if (m_booster instanceof MulticlassWrapMH) {
+               Booster b = ((MulticlassWrapMH)m_booster).m_booster;
+               if (b instanceof RobustBoost) {
+                 NumberFormat f= new DecimalFormat("0.00000");
+                 System.out.println("" +
+                     "[Iter= " + iter + 
+                     ", Time= " + f.format(((RobustBoost)b).getCurrentTime()) + 
+                     ", Active Examples= " + ((RobustBoost)b).getNumActiveExamples() +
+                     ", ds= " + f.format(((RobustBoost)b).getLastDs()) + 
+                     ", dt= " + f.format(((RobustBoost)b).getLastDt()) + "]");
+               }
+             }
              else 
                System.out.println("Finished learning iteration " + iter);