automatic commit

[folded-ctf.git] / global.cc

diff --git a/global.cc b/global.cc
index 253733c..76543f8 100644 (file)
--- a/global.cc
+++ b/global.cc
@@ -12,7 +12,9 @@
 // You should have received a copy of the GNU General Public License     //
 // along with this program. If not, see <http://www.gnu.org/licenses/>.  //
 //                                                                       //
-// Written by Francois Fleuret, (C) IDIAP                                //
+// Written by Francois Fleuret                                           //
+// (C) Idiap Research Institute                                          //
+//                                                                       //
 // Contact <francois.fleuret@idiap.ch> for comments & bug reports        //
 ///////////////////////////////////////////////////////////////////////////
 
@@ -32,7 +34,7 @@ Global::~Global() {
 
 void Global::init_parser(ParamParser *parser) {
   // The nice level of the process
-  parser->add_association("niceness", "5", false);
+  parser->add_association("niceness", "15", false);
 
   // Seed to initialize the random generator
   parser->add_association("random-seed", "0", false);
@@ -54,6 +56,8 @@ void Global::init_parser(ParamParser *parser) {
 
   // How many images to produce/process
   parser->add_association("nb-images", "-1", false);
+  // What is the number of the feature to show in the images
+  parser->add_association("material-feature-nb", "-1", false);
 
   // What is the maximum tree depth
   parser->add_association("tree-depth-max", "1", false);
@@ -66,11 +70,11 @@ void Global::init_parser(ParamParser *parser) {
   // Do we allow head-belly registration
   parser->add_association("force-head-belly-independence", "no", false);
   // How many weak-learners in every classifier
-  parser->add_association("nb-weak-learners-per-classifier", "10", false);
+  parser->add_association("nb-weak-learners-per-classifier", "100", false);
   // How many classifiers per level
   parser->add_association("nb-classifiers-per-level", "25", false);
   // How many levels
-  parser->add_association("nb-levels", "1", false);
+  parser->add_association("nb-levels", "2", false);
 
   // Proportion of images from the pool to use for training
   parser->add_association("proportion-for-train", "0.5", false);
@@ -90,7 +94,7 @@ void Global::init_parser(ParamParser *parser) {
   parser->add_association("write-tag-images", "no", false);
 
   // What is the wanted true overall positive rate
-  parser->add_association("wanted-true-positive-rate", "0.5", false);
+  parser->add_association("wanted-true-positive-rate", "0.75", false);
   // How many rates to try for the sequence of tests
   parser->add_association("nb-wanted-true-positive-rates", "10", false);
 
@@ -101,7 +105,7 @@ void Global::init_parser(ParamParser *parser) {
   parser->add_association("max-head-radius", "200", false);
   // How many translation cell for one scale when generating the "top
   // level" cells for an image.
-  parser->add_association("root-cell-nb-xy-per-scale", "5", false);
+  parser->add_association("root-cell-nb-xy-per-radius", "5", false);
 
   // What is the minimum size of the windows
   parser->add_association("pi-feature-window-min-size", "0.1", false);
@@ -131,8 +135,6 @@ void Global::read_parser(ParamParser *parser) {
   char *l = parser->get_association("loss-type");
   if(strcmp(l, "exponential") == 0)
     loss_type = LOSS_EXPONENTIAL;
-  else if(strcmp(l, "ev-regularized") == 0)
-    loss_type = LOSS_EV_REGULARIZED;
   else if(strcmp(l, "hinge") == 0)
     loss_type = LOSS_HINGE;
   else if(strcmp(l, "logistic") == 0)
@@ -143,6 +145,7 @@ void Global::read_parser(ParamParser *parser) {
   }
 
   nb_images = parser->get_association_int("nb-images");
+  material_feature_nb = parser->get_association_int("material-feature-nb");
   tree_depth_max = parser->get_association_int("tree-depth-max");
   nb_weak_learners_per_classifier = parser->get_association_int("nb-weak-learners-per-classifier");
   nb_classifiers_per_level = parser->get_association_int("nb-classifiers-per-level");
@@ -162,7 +165,7 @@ void Global::read_parser(ParamParser *parser) {
 
   min_head_radius = parser->get_association_scalar("min-head-radius");
   max_head_radius = parser->get_association_scalar("max-head-radius");
-  root_cell_nb_xy_per_scale = parser->get_association_int("root-cell-nb-xy-per-scale");
+  root_cell_nb_xy_per_radius = parser->get_association_int("root-cell-nb-xy-per-radius");
 
   pi_feature_window_min_size = parser->get_association_scalar("pi-feature-window-min-size");