[Jboost-cvs] jboost/src/jboost/booster YabaBoost.java, 1.8.2.1, 1.8.2.2

[Daniel H. <dh...@us...>]

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

Modified Files:
      Tag: jboost_unstable
	YabaBoost.java 
Log Message:
Changed 'init()' to use 'config.getDouble()' instead of 'config.getString()' and
check class before casting 'config'.

Index: YabaBoost.java
===================================================================
RCS file: /cvsroot/jboost/jboost/src/jboost/booster/YabaBoost.java,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -d -r1.8.2.1 -r1.8.2.2
*** YabaBoost.java	9 Apr 2008 07:24:04 -0000	1.8.2.1
--- YabaBoost.java	10 Apr 2008 07:32:29 -0000	1.8.2.2
***************
*** 99,118 ****
      double rneg=0, c1neg=0, c2neg=0, thetaneg=0, ncneg=0;
      try {
!       c1 = Double.parseDouble(config.getString("c1", "Z1.0"));
!       c2 = Double.parseDouble(config.getString("c2", "Z1.0"));
!       theta = Double.parseDouble(config.getString("theta", "Z0.15"));
!       nc = Double.parseDouble(config.getString("nc", "Z0.15"));
        setParams(c1,c2,theta,nc);
!       if (((ControllerConfiguration) config).getCostSensitive()) {
!         rpos = Double.parseDouble(config.getString("pos_c","Z"));
!         rneg = Double.parseDouble(config.getString("neg_c","Z"));
!         c1pos = Double.parseDouble(config.getString("pos_c1","Z"));
!         c1neg = Double.parseDouble(config.getString("neg_c1","Z"));
!         c2pos = Double.parseDouble(config.getString("pos_c2","Z"));
!         c2neg = Double.parseDouble(config.getString("neg_c2","Z"));
!         thetapos = Double.parseDouble(config.getString("pos_theta","Z"));
!         thetaneg = Double.parseDouble(config.getString("neg_theta","Z"));
!         ncpos = Double.parseDouble(config.getString("pos_nc","Z"));
!         ncneg = Double.parseDouble(config.getString("neg_nc","Z"));
          setCostSensitiveParams(rpos, c1pos, c2pos, thetapos, ncpos, rneg, c1neg, c2neg, thetaneg, ncneg);
        }
--- 99,119 ----
      double rneg=0, c1neg=0, c2neg=0, thetaneg=0, ncneg=0;
      try {
!       c1 = config.getDouble("c1", 1.0);
!       c2 = config.getDouble("c2", 1.0);
!       theta = config.getDouble("theta", 0.15);;
!       nc = config.getDouble("nc", 0.15);
        setParams(c1,c2,theta,nc);
!       if (config instanceof ControllerConfiguration &&
!           ((ControllerConfiguration) config).getCostSensitive()) {
!         rpos = config.getDouble("pos_c",1.0);
!         rneg = config.getDouble("neg_c",1.0);
!         c1pos = config.getDouble("pos_c1",1.0);
!         c1neg = config.getDouble("neg_c1",1.0);
!         c2pos = config.getDouble("pos_c2",1.0);
!         c2neg = config.getDouble("neg_c2",1.0);
!         thetapos = config.getDouble("pos_theta",1.0);
!         thetaneg = config.getDouble("neg_theta",1.0);
!         ncpos = config.getDouble("pos_nc",1.0);
!         ncneg = config.getDouble("neg_nc",1.0);
          setCostSensitiveParams(rpos, c1pos, c2pos, thetapos, ncpos, rneg, c1neg, c2neg, thetaneg, ncneg);
        }