X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=global.h;h=8a1978f00c9a479bbb906533042a01af1b42c608;hb=aed34255065b18c445d096f51bd2091833810a81;hp=a053d3d4f46d64912ba2e5f6dc4cdc0c3360901e;hpb=d922ad61d35e9a6996730bec24b16f8bf7bc426c;p=folded-ctf.git
diff --git a/global.h b/global.h
index a053d3d..8a1978f 100644
--- a/global.h
+++ b/global.h
@@ -12,10 +12,18 @@
// 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 //
+// Written by Francois Fleuret //
+// (C) Idiap Research Institute //
+// //
// Contact for comments & bug reports //
///////////////////////////////////////////////////////////////////////////
+/*
+
+ We stuff all the global values in there.
+
+ */
+
#ifndef GLOBAL_H
#define GLOBAL_H
@@ -28,7 +36,6 @@ using namespace std;
#include "progress_bar.h"
enum { LOSS_EXPONENTIAL,
- LOSS_EV_REGULARIZED,
LOSS_HINGE,
LOSS_LOGISTIC };
@@ -43,12 +50,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;
@@ -73,7 +78,7 @@ public:
int nb_scales_per_power_of_two;
scalar_t min_head_radius;
scalar_t max_head_radius;
- int root_cell_nb_xy_per_scale;
+ int root_cell_nb_xy_per_radius;
scalar_t pi_feature_window_min_size;