[Jboost-cvs] jboost/src/jboost/controller Controller.java, 1.6, 1.7 ControllerConfiguration.java, 1.3, 1.4

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

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

Modified Files:
	Controller.java ControllerConfiguration.java 
Log Message:
Cost sensitive normalboost, fixed compile bug in BooleanAttribute

Index: ControllerConfiguration.java
===================================================================
RCS file: /cvsroot/jboost/jboost/src/jboost/controller/ControllerConfiguration.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ControllerConfiguration.java	23 Oct 2007 22:46:32 -0000	1.3
--- ControllerConfiguration.java	24 Jan 2008 22:48:53 -0000	1.4
***************
*** 54,67 ****
    public static final String YABA_C1="c1";
    public static final String YABA_C2="c2";
    public static final String YABA_THETA="theta";
!   public static final String YABA_POS_C="pos_r";
    public static final String YABA_POS_C1="pos_c1";
    public static final String YABA_POS_C2="pos_c2";
    public static final String YABA_POS_THETA="pos_theta";
!   public static final String YABA_NEG_C="neg_r";
    public static final String YABA_NEG_C1="neg_c1";
    public static final String YABA_NEG_C2="neg_c2";
    public static final String YABA_NEG_THETA="neg_theta";
    public static final String BROWN_BOOST_POTENTIAL="brownBoostPotential";
    
    public static final String DEFAULT_BOOSTER = "AdaBoost";
--- 54,71 ----
    public static final String YABA_C1="c1";
    public static final String YABA_C2="c2";
+   public static final String YABA_NC="nc";
    public static final String YABA_THETA="theta";
!   public static final String YABA_POS_C="pos_c";
    public static final String YABA_POS_C1="pos_c1";
    public static final String YABA_POS_C2="pos_c2";
    public static final String YABA_POS_THETA="pos_theta";
!   public static final String YABA_POS_NC="pos_nc";
!   public static final String YABA_NEG_C="neg_c";
    public static final String YABA_NEG_C1="neg_c1";
    public static final String YABA_NEG_C2="neg_c2";
    public static final String YABA_NEG_THETA="neg_theta";
+   public static final String YABA_NEG_NC="neg_nc";
    public static final String BROWN_BOOST_POTENTIAL="brownBoostPotential";
+   public static final String BROWN_COST_SENSITIVE="costSensitive";
    
    public static final String DEFAULT_BOOSTER = "AdaBoost";
***************
*** 94,107 ****
      addOption(YABA_C1, getString("c1", null));
      addOption(YABA_C2, getString("c2", null));
      addOption(YABA_THETA, getString("theta", null));
!     addOption(YABA_POS_C,"pos_r");
!     addOption(YABA_POS_C1,"pos_c1");
!     addOption(YABA_POS_C2,"pos_c2");
!     addOption(YABA_POS_THETA,"pos_theta");
!     addOption(YABA_NEG_C,"neg_r");
!     addOption(YABA_NEG_C1,"neg_c1");
!     addOption(YABA_NEG_C2,"neg_c2");
!     addOption(YABA_NEG_THETA,"neg_theta");
      addOption(BROWN_BOOST_POTENTIAL, getString("potential", null));
    }
      
--- 98,115 ----
      addOption(YABA_C1, getString("c1", null));
      addOption(YABA_C2, getString("c2", null));
+     addOption(YABA_NC, getString("nc", null));
      addOption(YABA_THETA, getString("theta", null));
!     addOption(YABA_POS_C,getString("pos_c",null));
!     addOption(YABA_POS_C1,getString("pos_c1",null));
!     addOption(YABA_POS_C2,getString("pos_c2",null));
!     addOption(YABA_POS_THETA,getString("pos_theta",null));
!     addOption(YABA_POS_NC, getString("pos_nc", null));
!     addOption(YABA_NEG_C,getString("neg_c",null));
!     addOption(YABA_NEG_C1,getString("neg_c1",null));
!     addOption(YABA_NEG_C2,getString("neg_c2",null));
!     addOption(YABA_NEG_THETA,getString("neg_theta",null));
!     addOption(YABA_NEG_NC, getString("neg_nc", null));
      addOption(BROWN_BOOST_POTENTIAL, getString("potential", null));
+     addOption(BROWN_COST_SENSITIVE, getString("costSensitive", null));
    }
      
***************
*** 288,291 ****
--- 296,311 ----
  
  
+   /**
+    * @return should we print potential and exit?
+    */
+   public boolean getCostSensitive() {
+ 	String str = getString(BROWN_COST_SENSITIVE);
+ 	if (str == null) {
+ 	    return false;
+ 	}
+ 	return true;
+   }
+ 
+ 
  
  

Index: Controller.java
===================================================================
RCS file: /cvsroot/jboost/jboost/src/jboost/controller/Controller.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Controller.java	5 Dec 2007 06:39:57 -0000	1.6
--- Controller.java	24 Jan 2008 22:48:53 -0000	1.7
***************
*** 92,96 ****
  	    configuration.printUsage();
  	    e.printStackTrace();
- 	    e.getMessage();
  	} finally {
  	    Monitor.closeLog();
--- 92,95 ----
***************
*** 143,146 ****
--- 142,149 ----
  	    BrownBoost b = (BrownBoost) m_booster;
  	    System.out.println("\tPotential loss of m_booster: " + b.getInitialPotential());
+ 	    if (b.isCostSensitive()) {
+ 	    System.out.println("\tPotential loss of positive examples m_booster: " + b.getPositivePotential());
+ 	    System.out.println("\tPotential loss of negative examples m_booster: " + b.getNegativePotential());
+ 	    }
  	    System.exit(0);
  	}