Removed the definition of basename, which confuses an existing system one.

[folded-ctf.git] / pose_cell.cc

diff --git a/pose_cell.cc b/pose_cell.cc
index 4e5e7e2..21bdd08 100644 (file)
--- a/pose_cell.cc
+++ b/pose_cell.cc
@@ -1,20 +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 <http://www.gnu.org/licenses/>.  //
-//                                                                       //
-// Written by Francois Fleuret, (C) IDIAP                                //
-// Contact <francois.fleuret@idiap.ch> 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 <francois.fleuret@idiap.ch>
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ *
+ */
 
 #include "pose_cell.h"
 #include "global.h"
@@ -25,8 +31,8 @@ bool PoseCell::contains(Pose *pose) {
     _head_xc.contains(pose->_head_xc) &&
     _head_yc.contains(pose->_head_yc) &&
     _head_radius.contains(pose->_head_radius) &&
-    _body_xc.contains(pose->_body_xc) &&
-    _body_yc.contains(pose->_body_yc);
+    _belly_xc.contains(pose->_belly_xc) &&
+    _belly_yc.contains(pose->_belly_yc);
 }
 
 bool PoseCell::negative_for_train(Pose *pose) {
@@ -49,8 +55,8 @@ void PoseCell::get_centroid(Pose *pose) {
   pose->_head_radius = sqrt(_head_radius.min * _head_radius.max);
   pose->_head_xc = _head_xc.middle();
   pose->_head_yc = _head_yc.middle();
-  pose->_body_xc = _body_xc.middle();
-  pose->_body_yc = _body_yc.middle();
+  pose->_belly_xc = _belly_xc.middle();
+  pose->_belly_yc = _belly_yc.middle();
 }
 
 void PoseCell::print(ostream *out) {
@@ -58,6 +64,6 @@ void PoseCell::print(ostream *out) {
   (*out) << "  _head_yc " << _head_yc << endl;
   (*out) << "  _head_radius " << _head_radius << endl;
   (*out) << "  _head_tilt " << _head_tilt << endl;
-  (*out) << "  _body_xc " << _body_xc << endl;
-  (*out) << "  _body_yc " << _body_yc << endl;
+  (*out) << "  _belly_xc " << _belly_xc << endl;
+  (*out) << "  _belly_yc " << _belly_yc << endl;
 }