[Jboost-cvs] jboost/src/jboost/controller Configuration.java, 1.8, 1.9 Controller.java, 1.9, 1.10 ControllerTest.java, 1.2, 1.3

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

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

Modified Files:
	Configuration.java Controller.java ControllerTest.java 
Log Message:
More commits related to removing ControllerConfiguration, Also now outputs training and testing info files at the end of all BrownBoost classes

Index: ControllerTest.java
===================================================================
RCS file: /cvsroot/jboost/jboost/src/jboost/controller/ControllerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ControllerTest.java	27 May 2007 11:20:23 -0000	1.2
--- ControllerTest.java	15 Aug 2008 21:38:13 -0000	1.3
***************
*** 19,23 ****
  
    private Controller m_controller;
!   private ControllerConfiguration m_config;
    /*
     * @see TestCase#setUp()
--- 19,23 ----
  
    private Controller m_controller;
!   private Configuration m_config;
    /*
     * @see TestCase#setUp()
***************
*** 28,32 ****
          File.separatorChar +  "src/jboost/controller/jboost.config"};
     System.out.println(args[1]);
!     m_config= new ControllerConfiguration(null, args);
      Monitor.init_log(m_config);
      m_controller= new Controller(m_config);
--- 28,32 ----
          File.separatorChar +  "src/jboost/controller/jboost.config"};
     System.out.println(args[1]);
!     m_config= new Configuration(null, args);
      Monitor.init_log(m_config);
      m_controller= new Controller(m_config);
***************
*** 38,42 ****
          File.separatorChar +  "src/jboost/controller/weightedjboost.config"};
      System.out.println(args[1]);
!     m_config= new ControllerConfiguration(null, args);
      Monitor.init_log(m_config);
      m_controller= new Controller(m_config);
--- 38,42 ----
          File.separatorChar +  "src/jboost/controller/weightedjboost.config"};
      System.out.println(args[1]);
!     m_config= new Configuration(null, args);
      Monitor.init_log(m_config);
      m_controller= new Controller(m_config);
***************
*** 217,221 ****
        String[] args= {"-CONFIG", System.getProperty("jboost.home") + 
            File.separatorChar +  "src/jboost/controller/weightedjboost.config"};
!       m_config= new ControllerConfiguration(null, args);
        // learn for 40 rounds, write to file, reload and learn for 40 more rounds
        m_config.addOption("numRounds", Integer.toString(rounds/2));      
--- 217,221 ----
        String[] args= {"-CONFIG", System.getProperty("jboost.home") + 
            File.separatorChar +  "src/jboost/controller/weightedjboost.config"};
!       m_config= new Configuration(null, args);
        // learn for 40 rounds, write to file, reload and learn for 40 more rounds
        m_config.addOption("numRounds", Integer.toString(rounds/2));      
***************
*** 261,265 ****
        String[] args= {"-CONFIG", System.getProperty("jboost.home") + 
            File.separatorChar +  "src/jboost/controller/multilabeljboost.config"};
!       m_config= new ControllerConfiguration(null, args);
        m_config.addOption("numRounds", Integer.toString(rounds/2));      
        m_config.addOption("booster_type", "jboost.booster.LogLossBoost");
--- 261,265 ----
        String[] args= {"-CONFIG", System.getProperty("jboost.home") + 
            File.separatorChar +  "src/jboost/controller/multilabeljboost.config"};
!       m_config= new Configuration(null, args);
        m_config.addOption("numRounds", Integer.toString(rounds/2));      
        m_config.addOption("booster_type", "jboost.booster.LogLossBoost");
***************
*** 304,308 ****
        String[] args= {"-CONFIG", System.getProperty("jboost.home") + 
            File.separatorChar +  "src/jboost/controller/weightedjboost.config"};
!       m_config= new ControllerConfiguration(null, args);
        m_config.addOption("numRounds", Integer.toString(rounds));      
        m_config.addOption("booster_type", "jboost.booster.LogLossBoost");
--- 304,308 ----
        String[] args= {"-CONFIG", System.getProperty("jboost.home") + 
            File.separatorChar +  "src/jboost/controller/weightedjboost.config"};
!       m_config= new Configuration(null, args);
        m_config.addOption("numRounds", Integer.toString(rounds));      
        m_config.addOption("booster_type", "jboost.booster.LogLossBoost");
***************
*** 310,316 ****
        m_controller.startLearning();
        m_controller.outputLearningResults();
!       m_config.addOption(ControllerConfiguration.SERIALIZED_INPUT,"src/jboost/controller/weightedatree.serialized");
!       m_config.addOption(ControllerConfiguration.SAMPLE_TRAINING_DATA, "true");
!       m_config.addOption(ControllerConfiguration.SAMPLE_THRESHOLD_WEIGHT, "0.005");
        m_controller= new Controller(m_config);
        m_controller.startLearning();
--- 310,316 ----
        m_controller.startLearning();
        m_controller.outputLearningResults();
!       m_config.addOption(Configuration.SERIALIZED_INPUT,"src/jboost/controller/weightedatree.serialized");
!       m_config.addOption(Configuration.SAMPLE_TRAINING_DATA, "true");
!       m_config.addOption(Configuration.SAMPLE_THRESHOLD_WEIGHT, "0.005");
        m_controller= new Controller(m_config);
        m_controller.startLearning();

Index: Configuration.java
===================================================================
RCS file: /cvsroot/jboost/jboost/src/jboost/controller/Configuration.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Configuration.java	5 Dec 2007 06:39:57 -0000	1.8
--- Configuration.java	15 Aug 2008 21:38:13 -0000	1.9
***************
*** 3,6 ****
--- 3,7 ----
  import java.io.BufferedReader;
  import java.io.FileNotFoundException;
+ import java.io.File;
  import java.io.IOException;
  import java.util.HashMap;
***************
*** 16,20 ****
   * This class provides the utilities for parsing the command line which
   * specifies the setting of the options in the different packages.
[...1388 lines suppressed...]
  
      public Command(String n, String v) {
!         name= n;
!         value= v;
      }
      public String getValue() {
!         checkCount++;
!         return (value);
      }
      public int getCount() {
!         return (checkCount);
      }
  
      public String toString() {
!         String retval= new String("-");
!         retval += name + " " + value;
!         return (retval);
      }
  }
+ 

Index: Controller.java
===================================================================
RCS file: /cvsroot/jboost/jboost/src/jboost/controller/Controller.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Controller.java	13 Aug 2008 19:51:31 -0000	1.9
--- Controller.java	15 Aug 2008 21:38:13 -0000	1.10
***************
*** 57,61 ****
      private Vector m_splitterBuilderVector;
      // configuration object
!     private ControllerConfiguration m_config;
      // m_monitor
      private Monitor m_monitor;
--- 57,61 ----
      private Vector m_splitterBuilderVector;
      // configuration object
!     private Configuration m_config;
      // m_monitor
      private Monitor m_monitor;
***************
*** 73,82 ****
  
      public static void main(String[] argv) {
!         ControllerConfiguration configuration= null;
          Controller controller= null;
  
          try {
              // read the command line
!             configuration= new ControllerConfiguration(DEFAULT_MANPAGE, argv);
              Monitor.init_log(configuration);
              configuration.checkCommandValues();
--- 73,82 ----
  
      public static void main(String[] argv) {
!         Configuration configuration= null;
          Controller controller= null;
  
          try {
              // read the command line
!             configuration= new Configuration(DEFAULT_MANPAGE, argv);
              Monitor.init_log(configuration);
              configuration.checkCommandValues();
***************
*** 103,107 ****
       * Build a default controller
       */
!     public Controller(ControllerConfiguration configuration) throws Exception {
          m_config= configuration;
          init();
--- 103,107 ----
       * Build a default controller
       */
!     public Controller(Configuration configuration) throws Exception {
          m_config= configuration;
          init();
***************
*** 161,165 ****
  
          // load serialized tree, if necessary
!         String serializedFile= m_config.getString(ControllerConfiguration.SERIALIZED_INPUT, null);
          if (serializedFile != null) {
              m_serializedTree= loadTree(serializedFile);
--- 161,165 ----
  
          // load serialized tree, if necessary
!         String serializedFile= m_config.getString(Configuration.SERIALIZED_INPUT, null);
          if (serializedFile != null) {
              m_serializedTree= loadTree(serializedFile);
***************
*** 444,448 ****
  
          System.out.println();
!         if (Monitor.logLevel > 3)
              m_monitor.logIteration(
                                     iterNo,
--- 444,448 ----
  
          System.out.println();
!         if (Monitor.logLevel > 1)
              m_monitor.logIteration(
                                     iterNo,
***************
*** 581,586 ****
          int counter= 0;
          start= System.currentTimeMillis();
!         boolean sampling= m_config.getBool(ControllerConfiguration.SAMPLE_TRAINING_DATA, false);
!         double threshold= m_config.getDouble(ControllerConfiguration.SAMPLE_THRESHOLD_WEIGHT, 0.500);
  
          while ((example= m_trainStream.getExample()) != null) {
--- 581,586 ----
          int counter= 0;
          start= System.currentTimeMillis();
!         boolean sampling= m_config.getBool(Configuration.SAMPLE_TRAINING_DATA, false);
!         double threshold= m_config.getDouble(Configuration.SAMPLE_THRESHOLD_WEIGHT, 0.500);
  
          while ((example= m_trainStream.getExample()) != null) {