X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=pose_cell_hierarchy.cc;h=e12a32fe1fb3c66754d7c799639b39376ca17250;hb=cd28e9c7489bae20e3abf67331efd1cab45d83df;hp=cecd3b34ed833fe0ce3ca6a4cdef947172bda0db;hpb=28fa0ccaecec204d1781135c75c2b2ab13153312;p=folded-ctf.git
diff --git a/pose_cell_hierarchy.cc b/pose_cell_hierarchy.cc
index cecd3b3..e12a32f 100644
--- a/pose_cell_hierarchy.cc
+++ b/pose_cell_hierarchy.cc
@@ -12,7 +12,9 @@
// 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 //
///////////////////////////////////////////////////////////////////////////
@@ -27,7 +29,7 @@ PoseCellHierarchy::PoseCellHierarchy(LabelledImagePool *train_pool) {
_nb_levels = global.nb_levels;
_min_head_radius = global.min_head_radius;
_max_head_radius = global.max_head_radius;
- _root_cell_nb_xy_per_scale = global.root_cell_nb_xy_per_scale;
+ _root_cell_nb_xy_per_scale = global.root_cell_nb_xy_per_radius;
LabelledImage *image;
int nb_total_targets = 0;
@@ -92,14 +94,6 @@ PoseCellHierarchy::PoseCellHierarchy(LabelledImagePool *train_pool) {
scalar_t belly_ryc_min = belly_resolution * floor(belly_ryc.min / belly_resolution);
int nb_belly_ryc = int(ceil((belly_ryc.max - belly_ryc_min) / belly_resolution));
- (*global.log_stream) << "belly_rxc = " << belly_rxc << endl
- << "belly_rxc_min = " << belly_rxc_min << endl
- << "belly_rxc_min + nb_belly_rxc * belly_resolution = " << belly_rxc_min + nb_belly_rxc * belly_resolution << endl
- << endl
- << "belly_ryc = " << belly_ryc << endl
- << "belly_ryc_min = " << belly_ryc_min << endl
- << "belly_ryc_min + nb_belly_ryc * belly_resolution = " << belly_ryc_min + nb_belly_ryc * belly_resolution << endl;
-
int used[nb_belly_rxc * nb_belly_rxc];
for(int k = 0; k < nb_belly_rxc * nb_belly_ryc; k++) {
@@ -150,22 +144,6 @@ PoseCellHierarchy::PoseCellHierarchy(LabelledImagePool *train_pool) {
_belly_cells = new RelativeBellyPoseCell[_nb_belly_cells];
- for(int j = 0; j < nb_belly_ryc; j++) {
- for(int i = 0; i < nb_belly_rxc; i++) {
- if(used[i + nb_belly_rxc * j]) {
- if(sq(scalar_t(i) * belly_resolution + belly_resolution/2 + belly_rxc_min) +
- sq(scalar_t(j) * belly_resolution + belly_resolution/2 + belly_ryc_min) <= 1) {
- (*global.log_stream) << "*";
- } else {
- (*global.log_stream) << "X";
- }
- } else {
- (*global.log_stream) << ".";
- }
- }
- (*global.log_stream) << endl;
- }
-
int k = 0;
for(int j = 0; j < nb_belly_ryc; j++) {
for(int i = 0; i < nb_belly_rxc; i++) {
@@ -184,8 +162,6 @@ PoseCellHierarchy::PoseCellHierarchy(LabelledImagePool *train_pool) {
}
}
}
-
- (*global.log_stream) << _nb_belly_cells << " belly cells." << endl;
}
PoseCellHierarchy::~PoseCellHierarchy() {
@@ -221,7 +197,7 @@ void PoseCellHierarchy::add_root_cells(Image *image, PoseCellSet *cell_set) {
scalar_t beta = log(2) / scalar_t(global.nb_scales_per_power_of_two);
for(int s = 0; s < nb_scales; s++) {
- scalar_t cell_xy_size = exp(alpha + scalar_t(s) * beta) / global.root_cell_nb_xy_per_scale;
+ scalar_t cell_xy_size = exp(alpha + scalar_t(s) * beta) / global.root_cell_nb_xy_per_radius;
PoseCell cell;
cell._head_radius.min = exp(alpha + scalar_t(s) * beta);
cell._head_radius.max = exp(alpha + scalar_t(s+1) * beta);