Menu
▾
▴
[Jboost-cvs] jboost/src/jboost/controller jboost.config, 1.2, 1.3 Configuration.java, 1.2, 1.3 Controller.java, 1.2, 1.3 ControllerConfiguration.java, 1.1.1.1, 1.2 ControllerTest.java, 1.1.1.1, 1.2 weightedjboost.config, 1.1.1.1, 1.2
Update of /cvsroot/jboost/jboost/src/jboost/controller In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3586/src/jboost/controller Modified Files: Configuration.java Controller.java ControllerConfiguration.java ControllerTest.java weightedjboost.config Added Files: jboost.config Log Message: Serialized Tree and BrownBoost options added Index: ControllerConfiguration.java =================================================================== RCS file: /cvsroot/jboost/jboost/src/jboost/controller/ControllerConfiguration.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ControllerConfiguration.java 16 May 2007 04:06:02 -0000 1.1.1.1 --- ControllerConfiguration.java 27 May 2007 11:20:23 -0000 1.2 *************** *** 45,49 **** public static final String MATLAB_OUTPUT_FILENAME="matlabCodeOutputFileName"; public static final String SERIALIZED_OUTPUT_FILENAME="serializationOutputFileName"; ! public static final String SERIALIZED_INPUT="controller.serialized.input"; public static final String SAMPLE_TRAINING_DATA="controller.sampling"; public static final String SAMPLE_THRESHOLD_WEIGHT="controller.threshold.weight"; --- 45,49 ---- public static final String MATLAB_OUTPUT_FILENAME="matlabCodeOutputFileName"; public static final String SERIALIZED_OUTPUT_FILENAME="serializationOutputFileName"; ! public static final String SERIALIZED_INPUT="serialTreeInput"; public static final String SAMPLE_TRAINING_DATA="controller.sampling"; public static final String SAMPLE_THRESHOLD_WEIGHT="controller.threshold.weight"; *************** *** 55,58 **** --- 55,59 ---- public static final String YABA_C2="c2"; public static final String YABA_THETA="theta"; + public static final String BROWN_BOOST_POTENTIAL="brownBoostPotential"; public static final String DEFAULT_BOOSTER = "AdaBoost"; *************** *** 77,81 **** addOption(JAVA_OUTPUT_FILENAME, getString("j", null)); addOption(MATLAB_OUTPUT_FILENAME, getString("m", null)); ! addOption(SERIALIZED_OUTPUT_FILENAME, getString("controller.serialized.output", null)); addOption(N_THREADS, getString("p", null)); addOption(BOOSTER_RUNTIME, getString("r", "1.0")); --- 78,83 ---- addOption(JAVA_OUTPUT_FILENAME, getString("j", null)); addOption(MATLAB_OUTPUT_FILENAME, getString("m", null)); ! addOption(SERIALIZED_OUTPUT_FILENAME, getString("serialTreeOutput", null)); ! addOption(SERIALIZED_INPUT, getString("serialTreeInput", null)); addOption(N_THREADS, getString("p", null)); addOption(BOOSTER_RUNTIME, getString("r", "1.0")); *************** *** 85,88 **** --- 87,91 ---- addOption(YABA_C2, getString("c2", null)); addOption(YABA_THETA, getString("theta", null)); + addOption(BROWN_BOOST_POTENTIAL, getString("potential", null)); } *************** *** 218,221 **** --- 221,231 ---- /** + * @return Returns the name of the serialized input file + */ + public String getSerializationInputFileName() { + return getString(SERIALIZED_INPUT); + } + + /** * @return Returns the specified number of threads */ *************** *** 247,249 **** --- 257,276 ---- return true; } + + + + /** + * @return should we print potential and exit? + */ + public boolean getPrintPotential() { + String str = getString(BROWN_BOOST_POTENTIAL); + if (str == null) { + return false; + } + return true; + } + + + + } Index: weightedjboost.config =================================================================== RCS file: /cvsroot/jboost/jboost/src/jboost/controller/weightedjboost.config,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** weightedjboost.config 16 May 2007 04:06:02 -0000 1.1.1.1 --- weightedjboost.config 27 May 2007 11:20:24 -0000 1.2 *************** *** 3,7 **** -t src/jboost/controller/weighteddata.train -a -1 ! -controller.serialized.output src/jboost/controller/weightedatree.serialized -O src/jboost/controller/weighted.output.tree -j Predict.java --- 3,7 ---- -t src/jboost/controller/weighteddata.train -a -1 ! -serialTreeOutput src/jboost/controller/weightedatree.serialized -O src/jboost/controller/weighted.output.tree -j Predict.java --- NEW FILE: jboost.config --- -n src/jboost/controller/data.spec -T src/jboost/controller/data.test -t src/jboost/controller/data.train -a -1 -serialTreeOutput src/jboost/controller/atree.serialized Index: Controller.java =================================================================== RCS file: /cvsroot/jboost/jboost/src/jboost/controller/Controller.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Controller.java 16 May 2007 21:16:29 -0000 1.2 --- Controller.java 27 May 2007 11:20:23 -0000 1.3 *************** *** 18,21 **** --- 18,22 ---- import jboost.atree.InstrumentedAlternatingTree; import jboost.booster.AbstractBooster; + import jboost.booster.BrownBoost; import jboost.booster.Booster; import jboost.booster.Prediction; *************** *** 51,677 **** public class Controller { [...1240 lines suppressed...] ! predictor.toJava( ! procedureName, ! m_config.getString("javaOutputMethod", "predict"), ! (m_config.getBool("javaStandAlone", false) ? null : m_config.getSpecFileName()), ! m_exampleDescription); ! else ! throw new RuntimeException( ! "Controller.generateCode: Unrecognized language:" + language); ! PrintWriter codeOutputStream= ! new PrintWriter(new BufferedWriter(new FileWriter(codeOutputFileName))); ! codeOutputStream.println(code); ! codeOutputStream.close(); ! } catch (Exception e) { ! System.err.println( ! "Exception occured while attempting to write " + language + " code"); ! System.err.println("Message:" + e); ! e.printStackTrace(); ! } } } Index: Configuration.java =================================================================== RCS file: /cvsroot/jboost/jboost/src/jboost/controller/Configuration.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Configuration.java 19 May 2007 01:57:57 -0000 1.2 --- Configuration.java 27 May 2007 11:20:23 -0000 1.3 *************** *** 62,68 **** + "\t-p N Specify number of threads (default: 1)\n" + "\t-CONFIG The name of the configuration file (default \"jboost.config\")\n" ! + "\t All options (below) can be specified in this file.\n" + "\t-V Print version and exit\n" - + "\t All options (below) can be specified in this file.\n" + "\n" + "** Data File Options:\n" --- 62,68 ---- + "\t-p N Specify number of threads (default: 1)\n" + "\t-CONFIG The name of the configuration file (default \"jboost.config\")\n" [...1048 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: ControllerTest.java =================================================================== RCS file: /cvsroot/jboost/jboost/src/jboost/controller/ControllerTest.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ControllerTest.java 16 May 2007 04:06:02 -0000 1.1.1.1 --- ControllerTest.java 27 May 2007 11:20:23 -0000 1.2 *************** *** 127,131 **** m_controller.outputLearningResults(); // set config option for loading tree ! m_config.addOption("controller.serialized.input","src/jboost/controller/atree.serialized"); m_controller.startLearning(); // do some sort of comparison? --- 127,131 ---- m_controller.outputLearningResults(); // set config option for loading tree ! m_config.addOption("serialTreeInput","src/jboost/controller/atree.serialized"); m_controller.startLearning(); // do some sort of comparison? *************** *** 150,154 **** setUp(); m_config.addOption("numRounds", Integer.toString(rounds/2)); ! m_config.addOption("controller.serialized.input","src/jboost/controller/atree.serialized"); m_controller.startLearning(); InstrumentedAlternatingTree firstTree= m_controller.getTree(); --- 150,154 ---- setUp(); m_config.addOption("numRounds", Integer.toString(rounds/2)); ! m_config.addOption("serialTreeInput","src/jboost/controller/atree.serialized"); m_controller.startLearning(); InstrumentedAlternatingTree firstTree= m_controller.getTree(); *************** *** 185,189 **** m_config.addOption("numRounds", Integer.toString(rounds/2)); m_config.addOption("booster_type", "jboost.booster.LogLossBoost"); ! m_config.addOption("controller.serialized.input","src/jboost/controller/atree.serialized"); m_controller= new Controller(m_config); m_controller.startLearning(); --- 185,189 ---- m_config.addOption("numRounds", Integer.toString(rounds/2)); m_config.addOption("booster_type", "jboost.booster.LogLossBoost"); ! m_config.addOption("serialTreeInput","src/jboost/controller/atree.serialized"); m_controller= new Controller(m_config); m_controller.startLearning(); *************** *** 228,232 **** m_config.addOption("numRounds", Integer.toString(rounds/2)); m_config.addOption("booster_type", "jboost.booster.LogLossBoost"); ! m_config.addOption("controller.serialized.input","src/jboost/controller/atree.serialized"); m_controller= new Controller(m_config); m_controller.startLearning(); --- 228,232 ---- m_config.addOption("numRounds", Integer.toString(rounds/2)); m_config.addOption("booster_type", "jboost.booster.LogLossBoost"); ! m_config.addOption("serialTreeInput","src/jboost/controller/atree.serialized"); m_controller= new Controller(m_config); m_controller.startLearning(); *************** *** 264,268 **** m_config.addOption("numRounds", Integer.toString(rounds/2)); m_config.addOption("booster_type", "jboost.booster.LogLossBoost"); ! m_config.addOption("controller.serialized.output","src/jboost/controller/multilabelatree.serialized"); m_controller= new Controller(m_config); m_controller.startLearning(); --- 264,268 ---- m_config.addOption("numRounds", Integer.toString(rounds/2)); m_config.addOption("booster_type", "jboost.booster.LogLossBoost"); ! m_config.addOption("serialTreeOutput","src/jboost/controller/multilabelatree.serialized"); m_controller= new Controller(m_config); m_controller.startLearning(); *************** *** 271,275 **** m_config.addOption("numRounds", Integer.toString(rounds/2)); m_config.addOption("booster_type", "jboost.booster.LogLossBoost"); ! m_config.addOption("controller.serialized.input","src/jboost/controller/multilabelatree.serialized"); m_controller= new Controller(m_config); m_controller.startLearning(); --- 271,275 ---- m_config.addOption("numRounds", Integer.toString(rounds/2)); m_config.addOption("booster_type", "jboost.booster.LogLossBoost"); ! m_config.addOption("serialTreeInput","src/jboost/controller/multilabelatree.serialized"); m_controller= new Controller(m_config); m_controller.startLearning(); *************** *** 341,345 **** m_config.addOption("numRounds", Integer.toString(rounds/2)); m_config.addOption("booster_type", "jboost.booster.LogLossBoost"); ! m_config.addOption("controller.serialized.input","src/jboost/controller/atree.serialized"); m_controller= new Controller(m_config); m_controller.startLearning(); --- 341,345 ---- m_config.addOption("numRounds", Integer.toString(rounds/2)); m_config.addOption("booster_type", "jboost.booster.LogLossBoost"); ! m_config.addOption("serialTreeInput","src/jboost/controller/atree.serialized"); m_controller= new Controller(m_config); m_controller.startLearning(); |
