X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=inline;f=global.h;h=3b46c74d7643454fbc73bb382516ff3362922388;hb=refs%2Fheads%2Fmaster;hp=fae2d81213655d591fc044bd1a48bb238adf88aa;hpb=ccc2785ee823c934edcededc5c6448e4f9488f8b;p=folded-ctf.git
diff --git a/global.h b/global.h
index fae2d81..3b46c74 100644
--- a/global.h
+++ b/global.h
@@ -1,20 +1,32 @@
-
-///////////////////////////////////////////////////////////////////////////
-// 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 //
-// 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 .
+ *
+ */
+
+/*
+
+ We stuff all the global values in there.
+
+ */
#ifndef GLOBAL_H
#define GLOBAL_H
@@ -28,7 +40,6 @@ using namespace std;
#include "progress_bar.h"
enum { LOSS_EXPONENTIAL,
- LOSS_EV_REGULARIZED,
LOSS_HINGE,
LOSS_LOGISTIC };
@@ -43,12 +54,10 @@ public:
char detector_name[buffer_size];
char result_path[buffer_size];
- char materials_image_numbers[buffer_size];
- char materials_pf_numbers[buffer_size];
-
int loss_type;
int nb_images;
+ int material_feature_nb;
int tree_depth_max;