automatic commit

[folded-ctf.git] / pose_cell_hierarchy.cc

diff --git a/pose_cell_hierarchy.cc b/pose_cell_hierarchy.cc
index b8c5eff..273a186 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.  //
 //                                                                       //
-// Written by Francois Fleuret, (C) IDIAP                                //
+// Written by Francois Fleuret                                           //
+// (C) Idiap Research Institute                                          //
+//                                                                       //
 // Contact <francois.fleuret@idiap.ch> 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_radius;
+  _root_cell_nb_xy_per_radius = global.root_cell_nb_xy_per_radius;
 
   LabelledImage *image;
   int nb_total_targets = 0;
@@ -300,7 +302,7 @@ int PoseCellHierarchy::nb_incompatible_poses(LabelledImagePool *pool) {
 void PoseCellHierarchy::write(ostream *os) {
   write_var(os, &_min_head_radius);
   write_var(os, &_max_head_radius);
-  write_var(os, &_root_cell_nb_xy_per_scale);
+  write_var(os, &_root_cell_nb_xy_per_radius);
   write_var(os, &_nb_belly_cells);
   for(int k = 0; k < _nb_belly_cells; k++)
     write_var(os, &_belly_cells[k]);
@@ -310,7 +312,7 @@ void PoseCellHierarchy::read(istream *is) {
   delete[] _belly_cells;
   read_var(is, &_min_head_radius);
   read_var(is, &_max_head_radius);
-  read_var(is, &_root_cell_nb_xy_per_scale);
+  read_var(is, &_root_cell_nb_xy_per_radius);
   read_var(is, &_nb_belly_cells);
   delete[] _belly_cells;
   _belly_cells = new RelativeBellyPoseCell[_nb_belly_cells];