X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=folded-ctf.git;a=blobdiff_plain;f=global.cc;h=34ce658536090a173178d854c5e4b16390cdd080;hp=de53962a487a0d0c9ebdb7f2088f1782c57a263f;hb=8a90240a648bc6328c887e10cc31e4b6d6ea9497;hpb=94ef84aef3a1845326c7c43970997b701a919bd6

diff --git a/global.cc b/global.cc
index de53962..34ce658 100644
--- a/global.cc
+++ b/global.cc
@@ -1,20 +1,27 @@
-
-///////////////////////////////////////////////////////////////////////////
-// This program is free software: you can redistribute it and/or modify  //
-// it under the terms of the version 3 of the GNU General Public License //
-// as published by the Free Software Foundation.                         //
-//                                                                       //
-// This program is distributed in the hope that it will be useful, but   //
-// WITHOUT ANY WARRANTY; without even the implied warranty of            //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      //
-// General Public License for more details.                              //
-//                                                                       //
-// 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                                //
-// Contact <francois.fleuret@idiap.ch> for comments & bug reports        //
-///////////////////////////////////////////////////////////////////////////
+/*
+ *  folded-ctf is an implementation of the folded hierarchy of
+ *  classifiers for object detection, developed by Francois Fleuret
+ *  and Donald Geman.
+ *
+ *  Copyright (c) 2008 Idiap Research Institute, http://www.idiap.ch/
+ *  Written by Francois Fleuret <francois.fleuret@idiap.ch>
+ *
+ *  This file is part of folded-ctf.
+ *
+ *  folded-ctf is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published
+ *  by the Free Software Foundation, either version 3 of the License,
+ *  or (at your option) any later version.
+ *
+ *  folded-ctf is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with folded-ctf.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
 #include <string.h>
 
@@ -101,7 +108,7 @@ void Global::init_parser(ParamParser *parser) {
   parser->add_association("min-head-radius", "25", false);
   // What is the maximum size of the heads to detect.
   parser->add_association("max-head-radius", "200", false);
-  // How many translation cell for one scale when generating the "top
+  // How many translation cell per radius when generating the "top
   // level" cells for an image.
   parser->add_association("root-cell-nb-xy-per-radius", "5", false);
 
@@ -133,8 +140,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)