X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=parsing_pool.cc;h=cc73379120bfef3d31f71aa673f01eee8ec09cbe;hb=bd7db9aaf937bdba66445231a39518f2ae30b0d3;hp=696477a30f642f08b50802c86081cf79ff9d3497;hpb=d922ad61d35e9a6996730bec24b16f8bf7bc426c;p=folded-ctf.git
diff --git a/parsing_pool.cc b/parsing_pool.cc
index 696477a..cc73379 100644
--- a/parsing_pool.cc
+++ b/parsing_pool.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 . //
-// //
-// Written by Francois Fleuret, (C) IDIAP //
-// Contact 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
+ *
+ * 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 .
+ *
+ */
#include "parsing_pool.h"
#include "tools.h"
@@ -88,6 +94,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 +126,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 +210,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 +229,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;
}