automatic commit

[folded-ctf.git] / parsing_pool.cc

diff --git a/parsing_pool.cc b/parsing_pool.cc
index 696477a..79206dc 100644 (file)
--- a/parsing_pool.cc
+++ b/parsing_pool.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        //
 ///////////////////////////////////////////////////////////////////////////
 
@@ -88,6 +90,7 @@ void ParsingPool::down_one_level(LossMachine *loss_machine, PoseCellHierarchy *h
   loss_machine->subsample(_nb_cells, labels, tmp_responses,
                           _nb_negative_cells, sample_nb_occurences, sample_responses,
                           1);
+
   c = 0;
   for(int i = 0; i < _nb_images; i++) {
     for(int d = 0; d < _parsings[i]->nb_cells(); d++) {
@@ -119,6 +122,9 @@ void ParsingPool::down_one_level(LossMachine *loss_machine, PoseCellHierarchy *h
 
   delete[] sample_responses;
   delete[] sample_nb_occurences;
+
+  delete[] labels;
+  delete[] tmp_responses;
 }
 
 void ParsingPool::update_cell_responses(PiFeatureFamily *pi_feature_family,
@@ -200,8 +206,6 @@ void ParsingPool::weighted_sampling(LossMachine *loss_machine,
   s = 0;
   c = 0;
 
-//   global.bar.init(&cout, _nb_images);
-
   for(int i = 0; i < _nb_images; i++) {
 
     int *to_collect = new int[_parsings[i]->nb_cells()];
@@ -221,12 +225,8 @@ void ParsingPool::weighted_sampling(LossMachine *loss_machine,
     delete[] to_collect;
 
     c += _parsings[i]->nb_cells();
-
-//     global.bar.refresh(&cout, i);
   }
 
-//   global.bar.finish(&cout);
-
   delete[] tmp_responses;
   delete[] labels;
 }