X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=global.cc;h=ee1aaca95567fe01c998bb95e33762523aab316f;hb=20778dd434bdf65a4725ed56a6f8a6c4b24a8e1f;hp=bbefd21cc4feda35faa4a6f59787abfaf55e9dd4;hpb=20ec321944108cd1fe74b37ea45db3ba1a2d526a;p=folded-ctf.git
diff --git a/global.cc b/global.cc
index bbefd21..ee1aaca 100644
--- a/global.cc
+++ b/global.cc
@@ -1,22 +1,26 @@
-
-///////////////////////////////////////////////////////////////////////////
-// 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 . //
-// //
-// Written by Francois Fleuret //
-// (C) Idiap Research Institute //
-// //
-// Contact 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
+ *
+ * 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 version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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 .
+ *
+ */
#include
@@ -103,7 +107,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);
@@ -135,8 +139,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)