X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=folded-ctf.git;a=blobdiff_plain;f=parsing_pool.cc;h=79206dc9fe0acb6dea5141d816725c5e72e8d580;hp=696477a30f642f08b50802c86081cf79ff9d3497;hb=346c6fdc3c36ca10142234cce291031064fa2b48;hpb=d922ad61d35e9a6996730bec24b16f8bf7bc426c
diff --git a/parsing_pool.cc b/parsing_pool.cc
index 696477a..79206dc 100644
--- 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 . //
// //
-// Written by Francois Fleuret, (C) IDIAP //
+// Written by Francois Fleuret //
+// (C) Idiap Research Institute //
+// //
// Contact 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;
}