[Jboost-cvs] jboost/src/jboost/booster BrownBoost.java, 1.4, 1.5 BrownBoostTest.java, 1.2, 1.3 YabaBoost.java, 1.3, 1.4

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

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

Modified Files:
	BrownBoost.java BrownBoostTest.java YabaBoost.java 
Log Message:
corrected erf bug and added surfing data to yaba

Index: YabaBoost.java
===================================================================
RCS file: /cvsroot/jboost/jboost/src/jboost/booster/YabaBoost.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** YabaBoost.java	14 Jun 2007 16:37:46 -0000	1.3
--- YabaBoost.java	10 Jul 2007 01:32:52 -0000	1.4
***************
*** 115,118 ****
--- 115,129 ----
      }
      
+     
+     public String surfingData() {
+         String ret = new String("");
+         ret += String.format("YabaBoost Params: %.4f %.4f %4f %4f %4f\n", m_c, m_s, m_c1, m_c2, m_theta);
+         for (int i=0; i<m_margins.length; i++){
+             ret += String.format("%.4f\t%.4f\t%.4f\n", m_margins[i], m_weights[i], m_potentials[i]);
+         }
+         return ret;
+     }
+ 
+ 
  
      public void finalizeData() {
***************
*** 486,489 ****
--- 497,503 ----
  
  
+ 	if (m_hypPredictions.length != m_margins.length) {
+ 	    System.err.println("WARNING: m_hypPredictions is not the same length as the margins");
+ 	}
  	for (int i=0; i < m_hypPredictions.length; i++) {
  	    m_oldWeights[i]= m_weights[i];

Index: BrownBoost.java
===================================================================
RCS file: /cvsroot/jboost/jboost/src/jboost/booster/BrownBoost.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BrownBoost.java	14 Jun 2007 16:45:52 -0000	1.4
--- BrownBoost.java	10 Jul 2007 01:32:52 -0000	1.5
***************
*** 109,113 ****
  				       t * (-0.82215223 + 
  				       t * ( 0.17087277))))))))));
! 	return Math.abs(ans);
      }
  
--- 109,114 ----
  				       t * (-0.82215223 + 
  				       t * ( 0.17087277))))))))));
! 	
! 	return sign(z)*Math.abs(ans);
      }
  
***************
*** 422,425 ****
--- 423,427 ----
      public String surfingData() {
  	String ret = new String("");
+ 	ret += String.format("BrownBoost Params: %.4f %.4f\n", m_c, m_s);
  	for (int i=0; i<m_margins.length; i++){
  	    ret += String.format("%.4f\t%.4f\t%.4f\n", m_margins[i], m_weights[i], m_potentials[i]);

Index: BrownBoostTest.java
===================================================================
RCS file: /cvsroot/jboost/jboost/src/jboost/booster/BrownBoostTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BrownBoostTest.java	27 May 2007 11:23:23 -0000	1.2
--- BrownBoostTest.java	10 Jul 2007 01:32:52 -0000	1.3
***************
*** 183,186 ****
--- 183,190 ----
  	assertEquals(BrownBoost.erf(1.0), .8427007, 0.0001);
  	assertEquals(BrownBoost.erf(2.0), .9953222, 0.0001);
+ 
+ 	assertEquals(BrownBoost.erf(-0.5), -.5204998, 0.0001);
+ 	assertEquals(BrownBoost.erf(-1.0), -.8427007, 0.0001);
+ 	assertEquals(BrownBoost.erf(-2.0), -.9953222, 0.0001);
      }