[Jboost-cvs] jboost/src/jboost/monitor Monitor.java,1.8,1.9

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	Monitor.java 
Log Message:
Moved ExampleSets from the ControllerConfig to the Controller.  --Aaron

Index: Monitor.java
===================================================================
RCS file: /cvsroot/jboost/jboost/src/jboost/monitor/Monitor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Monitor.java	23 Oct 2007 22:45:40 -0000	1.8
--- Monitor.java	3 Jun 2008 03:17:39 -0000	1.9
***************
*** 18,22 ****
   * A class whose responsibility is to generate the log files that will later be
   * analyzed with perl scripts that were written for the C++ version of Atrees
!  * 
   * @author Yoav Freund
   */
--- 18,22 ----
   * A class whose responsibility is to generate the log files that will later be
   * analyzed with perl scripts that were written for the C++ version of Atrees
!  *
   * @author Yoav Freund
   */
***************
*** 33,37 ****
      /** a high-level log of the program's progress. */
      private String infoFilename;
!     private PrintWriter infoStream; 
  
  
--- 33,37 ----
      /** a high-level log of the program's progress. */
      private String infoFilename;
!     private PrintWriter infoStream;
  
  
***************
*** 51,55 ****
      /** log file info */
      private static String logOutputFilename;
!     private static PrintWriter logStream; 
  
  
--- 51,55 ----
      /** log file info */
      private static String logOutputFilename;
!     private static PrintWriter logStream;
  
  
***************
*** 67,92 ****
      public static int logLevel= 0;
      public static void init_log(Configuration config) throws IOException {
! 	String stem= config.getString("S", "data");
! 	logOutputFilename= config.getString("log", stem + ".log");
! 	logLevel= config.getInt("loglevel", 2);
! 	if (logLevel < 2) {
! 	    logStream= new PrintWriter(System.out);
! 	} else {
! 	    logStream=
! 		new PrintWriter(new BufferedWriter(new FileWriter(logOutputFilename)));
! 	}
! 	startTime= new Date(); // remember time at start to report it later
      }
      /** a central place to print debugging logs */
      public static void log(Object message) {
! 	logStream.println(message);
      }
      /** close the logging file */
      public static void closeLog() {
! 	logStream.close();
      }
      /**
       * The constructor
!      * 
       * @param config a configuration object with the run-time parameters
       * @param trainSet the training set (to calcualte training error)
--- 67,92 ----
      public static int logLevel= 0;
      public static void init_log(Configuration config) throws IOException {
!         String stem= config.getString("S", "data");
!         logOutputFilename= config.getString("log", stem + ".log");
!         logLevel= config.getInt("loglevel", 2);
!         if (logLevel < 2) {
!             logStream= new PrintWriter(System.out);
!         } else {
!             logStream=
!                 new PrintWriter(new BufferedWriter(new FileWriter(logOutputFilename)));
!         }
!         startTime= new Date(); // remember time at start to report it later
      }
      /** a central place to print debugging logs */
      public static void log(Object message) {
!         logStream.println(message);
      }
      /** close the logging file */
      public static void closeLog() {
!         logStream.close();
      }
      /**
       * The constructor
!      *
       * @param config a configuration object with the run-time parameters
       * @param trainSet the training set (to calcualte training error)
***************
*** 94,179 ****
       * @param m_booster the m_booster (to compute m_margins)
       */
!     public Monitor(Booster booster, ControllerConfiguration config) {
! 	trainSet= config.getTrainSet();
! 	testSet= config.getTestSet(); 
! 	m_booster= booster;
! 	outputStem= config.getString("S", "noname_out");
! 	infoFilename= config.getString("info", outputStem + ".info");
  
! 	trainBoostingFilename = outputStem + ".train.boosting.info";
! 	testBoostingFilename = outputStem + ".test.boosting.info";
  
! 	try {
! 	    infoStream=
! 		new PrintWriter(
! 				new BufferedWriter(new FileWriter(outputStem + ".info")));
! 	    infoStream.println("Command line parameters: " + config.getString("args"));
! 	    infoStream.println();
! 	    infoStream.println("Configuration parameters:\n" + config);
! 	    infoStream.println("");
! 	    infoStream.println("FILENAMES");
! 	    infoStream.println("specFilename = " + config.getSpecFileName());
! 	    infoStream.println("trainFilename = " + config.getTrainFileName());
! 	    infoStream.println("testFilename = " + config.getTestFileName());
! 	    infoStream.println("trainBoostingInfo = " + trainBoostingFilename);
! 	    infoStream.println("testBoostingInfo = " + testBoostingFilename);
! 	    infoStream.println("resultOutputFilename = " + 
! 			       config.getResultOutputFileName());
! 	    infoStream.println("logOutputFilename = " + logOutputFilename);
! 	    infoStream.println("");
! 	    infoStream.println("Train set size = " + trainSet.getExampleNo());
! 	    infoStream.println("Test set size = " + testSet.getExampleNo());
! 	    infoStream.println("");
! 	    boostingPrintRate= config.getInt("a", 0);
  
! 	    if (boostingPrintRate != 0) {
! 		trainBoostingStream = new PrintWriter(
! 			      new BufferedWriter(
! 			      new FileWriter(trainBoostingFilename)));
! 		testBoostingStream = new PrintWriter(
! 			      new BufferedWriter(
! 			      new FileWriter(testBoostingFilename)));
! 	    }
! 	    afterInitTime= new Date();
! 	    infoStream.println("Init  Start time = " + startTime);
! 	    infoStream.println("Learn Start time = " + afterInitTime);
! 	    infoStream.println("iter \tbound \ttrain \ttest");
! 	    infoStream.flush();
! 	} catch (IOException e) {
! 	    throw new RuntimeException(
! 				       "monitor failed to open file for output\n" + e.getMessage());
! 	}
      }
!   
      /** print the m_labels of trainSet and testSet onto samplingStream */
      /*
      private void logLabels() {
! 	ArrayList labels= trainSet.getBinaryLabels();
! 	samplingStream.println("train labels, elements=" + labels.size());
! 	for (int i= 0; i < labels.size(); i++) {
! 	    samplingStream.println(((Boolean) labels.get(i)).booleanValue() ? "+1" : "-1");
! 	}
! 	labels.clear(); // release memory
! 	labels= testSet.getBinaryLabels();
! 	samplingStream.println("test labels, elements=" + labels.size());
! 	for (int i= 0; i < labels.size(); i++) {
! 	    samplingStream.println(((Boolean) labels.get(i)).booleanValue() ? "+1" : "-1");
! 	}
! 	labels.clear(); // release memory
! 	labels= null;
      }
      */
!   
      /** generate logs for current boosting iteration */
      public void logIteration(int iter, Predictor combined, Predictor base) {
! 	double trainError= trainSet.calcError(iter, combined, base);
! 	double testError= testSet.calcError(iter, combined, base);
! 	double theoryBound= m_booster.getTheoryBound();
! 	NumberFormat f= new DecimalFormat("0.0000");
! 	infoStream.print(iter + "\t" + f.format(theoryBound) + "\t" 
! 			 + f.format(trainError) + "\t" + f.format(testError));
! 	infoStream.flush();
! 	logBoosting(iter, combined, base);
! 	infoStream.println("");
      }
  
--- 94,180 ----
       * @param m_booster the m_booster (to compute m_margins)
       */
!     public Monitor(Booster booster, ExampleSet training,
!                    ExampleSet testing, ControllerConfiguration config) {
!         trainSet= training;
!         testSet= testing;
!         m_booster= booster;
!         outputStem= config.getString("S", "noname_out");
!         infoFilename= config.getString("info", outputStem + ".info");
  
!         trainBoostingFilename = outputStem + ".train.boosting.info";
!         testBoostingFilename = outputStem + ".test.boosting.info";
  
!         try {
!             infoStream=
!                 new PrintWriter(
!                                 new BufferedWriter(new FileWriter(outputStem + ".info")));
!             infoStream.println("Command line parameters: " + config.getString("args"));
!             infoStream.println();
!             infoStream.println("Configuration parameters:\n" + config);
!             infoStream.println("");
!             infoStream.println("FILENAMES");
!             infoStream.println("specFilename = " + config.getSpecFileName());
!             infoStream.println("trainFilename = " + config.getTrainFileName());
!             infoStream.println("testFilename = " + config.getTestFileName());
!             infoStream.println("trainBoostingInfo = " + trainBoostingFilename);
!             infoStream.println("testBoostingInfo = " + testBoostingFilename);
!             infoStream.println("resultOutputFilename = " +
!                                config.getResultOutputFileName());
!             infoStream.println("logOutputFilename = " + logOutputFilename);
!             infoStream.println("");
!             infoStream.println("Train set size = " + trainSet.getExampleNo());
!             infoStream.println("Test set size = " + testSet.getExampleNo());
!             infoStream.println("");
!             boostingPrintRate= config.getInt("a", 0);
  
!             if (boostingPrintRate != 0) {
!                 trainBoostingStream = new PrintWriter(
!                               new BufferedWriter(
!                               new FileWriter(trainBoostingFilename)));
!                 testBoostingStream = new PrintWriter(
!                               new BufferedWriter(
!                               new FileWriter(testBoostingFilename)));
!             }
!             afterInitTime= new Date();
!             infoStream.println("Init  Start time = " + startTime);
!             infoStream.println("Learn Start time = " + afterInitTime);
!             infoStream.println("iter \tbound \ttrain \ttest");
!             infoStream.flush();
!         } catch (IOException e) {
!             throw new RuntimeException(
!                                        "monitor failed to open file for output\n" + e.getMessage());
!         }
      }
! 
      /** print the m_labels of trainSet and testSet onto samplingStream */
      /*
      private void logLabels() {
!         ArrayList labels= trainSet.getBinaryLabels();
!         samplingStream.println("train labels, elements=" + labels.size());
!         for (int i= 0; i < labels.size(); i++) {
!             samplingStream.println(((Boolean) labels.get(i)).booleanValue() ? "+1" : "-1");
!         }
!         labels.clear(); // release memory
!         labels= testSet.getBinaryLabels();
!         samplingStream.println("test labels, elements=" + labels.size());
!         for (int i= 0; i < labels.size(); i++) {
!             samplingStream.println(((Boolean) labels.get(i)).booleanValue() ? "+1" : "-1");
!         }
!         labels.clear(); // release memory
!         labels= null;
      }
      */
! 
      /** generate logs for current boosting iteration */
      public void logIteration(int iter, Predictor combined, Predictor base) {
!         double trainError= trainSet.calcError(iter, combined, base);
!         double testError= testSet.calcError(iter, combined, base);
!         double theoryBound= m_booster.getTheoryBound();
!         NumberFormat f= new DecimalFormat("0.0000");
!         infoStream.print(iter + "\t" + f.format(theoryBound) + "\t"
!                          + f.format(trainError) + "\t" + f.format(testError));
!         infoStream.flush();
!         logBoosting(iter, combined, base);
!         infoStream.println("");
      }
  
***************
*** 183,275 ****
       */
      private void logBoostingTrainTest(PrintWriter boostingStream, ExampleSet tSet, int iter, Predictor combined, Predictor base) {
! 	// Output the training data
! 	boostingStream.println("iteration=" + iter + FIELD_SEPARATOR + 
! 			       "elements=" + tSet.size() + FIELD_SEPARATOR + 
! 			       "boosting_params=" + m_booster.getParamString() + FIELD_SEPARATOR 
! 			       );
! 	
! 	// Get the relavant data structures (arrays and lists)
! 	ArrayList tMargin = tSet.calcMargins(iter, combined, base);
! 	ArrayList tScores = tSet.calcScores(iter, combined, base);
! 	ArrayList tLabelIndices = tSet.getBinaryLabels();
! 	double[][] tWeights = null;
! 	double[][] tPotentials = null;
! 	if (boostingStream.equals(trainBoostingStream)) {
! 	    tWeights = m_booster.getWeights();
! 	    tPotentials = m_booster.getPotentials();
! 	}
  
! 	NumberFormat f= new DecimalFormat("0.00000");
! 	double[] tmp = null;
! 	Boolean[] labeltmp = null;
! 	int j = 0;
! 	for (int i=0; i < tMargin.size(); i++) {
! 	    // output the example number
! 	    boostingStream.print("" + i + FIELD_SEPARATOR);
  
! 	    // output the margins
! 	    tmp = ((double[]) tMargin.get(i));
! 	    for (j= 0; j < tmp.length; j++){
! 		boostingStream.print(f.format(tmp[j]));
! 		if (j != tmp.length -1)
! 		    boostingStream.print(SEPARATOR);
! 	    }
! 	    boostingStream.print(FIELD_SEPARATOR);
! 	    
  
! 	    // output the scores
! 	    tmp = ((double[]) tScores.get(i));
! 	    for (j= 0; j < tmp.length; j++){
! 		boostingStream.print(f.format(tmp[j]));
! 		if (j != tmp.length -1)
! 		    boostingStream.print(SEPARATOR);
! 	    }
! 	    boostingStream.print(FIELD_SEPARATOR);
  
  
! 	    if (boostingStream.equals(trainBoostingStream)) {
! 		// output the weights
! 		for (j= 0; j < tWeights[i].length; j++){
! 		    boostingStream.print(f.format(tWeights[i][j]));
! 		    if (j != tmp.length -1)
! 			boostingStream.print(SEPARATOR);
! 		}
! 		boostingStream.print(FIELD_SEPARATOR);
! 		
! 		
! 		
! 		// output the potentials
! 		for (j= 0; j < tPotentials[i].length; j++){
! 		    boostingStream.print(f.format(tPotentials[i][j]));
! 		    if (j != tmp.length -1)
! 			boostingStream.print(SEPARATOR);
! 		}
! 		boostingStream.print(FIELD_SEPARATOR);
! 		
! 		
! 	    }
! 	    
  
- 	    // output the labels
- 	    labeltmp = ((Boolean[]) tLabelIndices.get(i));
- 	    for (j= 0; j < labeltmp.length; j++){
- 		boostingStream.print(labeltmp[j].booleanValue() ? "+1" : "-1");
- 		if (j != tmp.length -1)
- 		    boostingStream.print(SEPARATOR);
- 	    }
- 	    boostingStream.print(FIELD_SEPARATOR);
- 	    boostingStream.println("");
- 	}
  
! 	
! 	// release memory	
! 	tMargin.clear(); 
! 	tScores.clear();
! 	tLabelIndices.clear();
! 	tMargin= null;
! 	tScores= null; 
! 	tLabelIndices = null;
! 	tWeights = null;
! 	tPotentials = null;
      }
  
--- 184,276 ----
       */
      private void logBoostingTrainTest(PrintWriter boostingStream, ExampleSet tSet, int iter, Predictor combined, Predictor base) {
!         // Output the training data
!         boostingStream.println("iteration=" + iter + FIELD_SEPARATOR +
!                                "elements=" + tSet.size() + FIELD_SEPARATOR +
!                                "boosting_params=" + m_booster.getParamString() + FIELD_SEPARATOR
!                                );
  
!         // Get the relavant data structures (arrays and lists)
!         ArrayList tMargin = tSet.calcMargins(iter, combined, base);
!         ArrayList tScores = tSet.calcScores(iter, combined, base);
!         ArrayList tLabelIndices = tSet.getBinaryLabels();
!         double[][] tWeights = null;
!         double[][] tPotentials = null;
!         if (boostingStream.equals(trainBoostingStream)) {
!             tWeights = m_booster.getWeights();
!             tPotentials = m_booster.getPotentials();
!         }
  
!         NumberFormat f= new DecimalFormat("0.00000");
!         double[] tmp = null;
!         Boolean[] labeltmp = null;
!         int j = 0;
!         for (int i=0; i < tMargin.size(); i++) {
!             // output the example number
!             boostingStream.print("" + i + FIELD_SEPARATOR);
  
!             // output the margins
!             tmp = ((double[]) tMargin.get(i));
!             for (j= 0; j < tmp.length; j++){
!                 boostingStream.print(f.format(tmp[j]));
!                 if (j != tmp.length -1)
!                     boostingStream.print(SEPARATOR);
!             }
!             boostingStream.print(FIELD_SEPARATOR);
  
  
!             // output the scores
!             tmp = ((double[]) tScores.get(i));
!             for (j= 0; j < tmp.length; j++){
!                 boostingStream.print(f.format(tmp[j]));
!                 if (j != tmp.length -1)
!                     boostingStream.print(SEPARATOR);
!             }
!             boostingStream.print(FIELD_SEPARATOR);
  
  
!             if (boostingStream.equals(trainBoostingStream)) {
!                 // output the weights
!                 for (j= 0; j < tWeights[i].length; j++){
!                     boostingStream.print(f.format(tWeights[i][j]));
!                     if (j != tmp.length -1)
!                         boostingStream.print(SEPARATOR);
!                 }
!                 boostingStream.print(FIELD_SEPARATOR);
! 
! 
! 
!                 // output the potentials
!                 for (j= 0; j < tPotentials[i].length; j++){
!                     boostingStream.print(f.format(tPotentials[i][j]));
!                     if (j != tmp.length -1)
!                         boostingStream.print(SEPARATOR);
!                 }
!                 boostingStream.print(FIELD_SEPARATOR);
! 
! 
!             }
! 
! 
!             // output the labels
!             labeltmp = ((Boolean[]) tLabelIndices.get(i));
!             for (j= 0; j < labeltmp.length; j++){
!                 boostingStream.print(labeltmp[j].booleanValue() ? "+1" : "-1");
!                 if (j != tmp.length -1)
!                     boostingStream.print(SEPARATOR);
!             }
!             boostingStream.print(FIELD_SEPARATOR);
!             boostingStream.println("");
!         }
! 
! 
!         // release memory
!         tMargin.clear();
!         tScores.clear();
!         tLabelIndices.clear();
!         tMargin= null;
!         tScores= null;
!         tLabelIndices = null;
!         tWeights = null;
!         tPotentials = null;
      }
  
***************
*** 277,301 ****
      /** output the scores distribution of the training set */
      private void logBoosting(int iter, Predictor combined, Predictor base) {
! 	if (boostingPrintRate == 0 ||
! 	    (boostingPrintRate > 0  && boostingPrintRate != iter))
! 	    return;
! 	if (boostingPrintRate == -1) {
! 	    // print score when highest order digit in iter changes.
! 	    double m=
! 		java.lang.Math.floor(
! 				     java.lang.Math.log(iter) / java.lang.Math.log(10.0));
! 	    int t= (int) java.lang.Math.pow(10.0, m);
! 	    if (iter == 0)
! 		t= 1; // fix bug in "pow"
! 	    if ((iter % t) != 0)
! 		return;
! 	}
! 	logBoostingTrainTest(trainBoostingStream, trainSet, iter, combined, base);
! 	logBoostingTrainTest(testBoostingStream, testSet, iter, combined, base);
! 	trainBoostingStream.flush();
! 	testBoostingStream.flush();
! 	infoStream.print(" \t# output boosting data #");
      }
!   
  
  
--- 278,302 ----
      /** output the scores distribution of the training set */
      private void logBoosting(int iter, Predictor combined, Predictor base) {
!         if (boostingPrintRate == 0 ||
!             (boostingPrintRate > 0  && boostingPrintRate != iter))
!             return;
!         if (boostingPrintRate == -1) {
!             // print score when highest order digit in iter changes.
!             double m=
!                 java.lang.Math.floor(
!                                      java.lang.Math.log(iter) / java.lang.Math.log(10.0));
!             int t= (int) java.lang.Math.pow(10.0, m);
!             if (iter == 0)
!                 t= 1; // fix bug in "pow"
!             if ((iter % t) != 0)
!                 return;
!         }
!         logBoostingTrainTest(trainBoostingStream, trainSet, iter, combined, base);
!         logBoostingTrainTest(testBoostingStream, testSet, iter, combined, base);
!         trainBoostingStream.flush();
!         testBoostingStream.flush();
!         infoStream.print(" \t# output boosting data #");
      }
! 
  
  
***************
*** 303,314 ****
      /** close the monitor output files */
      public void close() throws IOException {
! 	endTime= new Date();
! 	infoStream.println("End time=" + endTime);
! 	infoStream.close();
! 	if (trainBoostingStream != null)
! 	    trainBoostingStream.close();
! 	if (testBoostingStream != null)
! 	    testBoostingStream.close();
! 	log("finished closing output files");
      }
  }
--- 304,315 ----
      /** close the monitor output files */
      public void close() throws IOException {
!         endTime= new Date();
!         infoStream.println("End time=" + endTime);
!         infoStream.close();
!         if (trainBoostingStream != null)
!             trainBoostingStream.close();
!         if (testBoostingStream != null)
!             testBoostingStream.close();
!         log("finished closing output files");
      }
  }