[Jboost-cvs] jboost/src/jboost/atree InstrumentedAlternatingTree.java, 1.7, 1.8

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

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

Modified Files:
	InstrumentedAlternatingTree.java 
Log Message:
added more RobustBoost support

Index: InstrumentedAlternatingTree.java
===================================================================
RCS file: /cvsroot/jboost/jboost/src/jboost/atree/InstrumentedAlternatingTree.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** InstrumentedAlternatingTree.java	5 Feb 2009 05:56:57 -0000	1.7
--- InstrumentedAlternatingTree.java	9 Feb 2009 10:47:50 -0000	1.8
***************
*** 17,20 ****
--- 17,21 ----
  import jboost.booster.NormalizedPrediction;
  import jboost.booster.RobustBinaryPrediction;
+ import jboost.booster.RobustBoost;
  import jboost.controller.Configuration;
  import jboost.controller.ConfigurationException;
***************
*** 457,461 ****
  
        Prediction[] predictions= m_booster.getPredictions(bags, partition);
-       // TODO: normalize precio
        m_booster.update(predictions, partition);
        if (parent==null) {
--- 458,461 ----
***************
*** 660,663 ****
--- 660,668 ----
      }
  
+     if(m_booster instanceof RobustBoost){
+       RobustBoost b = (RobustBoost) m_booster;
+       return b.isFinished();
+     }
+ 
      double EPS = 1e-50;
      double w = m_booster.getTotalWeight();