1 files changed, 25 insertions, 25 deletions

diff --git a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h
index c6593cc4..d096792f 100644
--- a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h
+++ b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h
@@ -20,17 +20,17 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SRC_PERSISTENT_COHOMOLOGY_INCLUDE_GUDHI_PERSISTENT_COHOMOLOGY_H_
-#define SRC_PERSISTENT_COHOMOLOGY_INCLUDE_GUDHI_PERSISTENT_COHOMOLOGY_H_
+#ifndef PERSISTENT_COHOMOLOGY_H_
+#define PERSISTENT_COHOMOLOGY_H_
 
 #include <gudhi/Persistent_cohomology/Persistent_cohomology_column.h>
 #include <gudhi/Persistent_cohomology/Field_Zp.h>
+#include <gudhi/Simple_object_pool.h>
 
 #include <boost/tuple/tuple.hpp>
 #include <boost/intrusive/set.hpp>
 #include <boost/pending/disjoint_sets.hpp>
 #include <boost/intrusive/list.hpp>
-#include <boost/pool/object_pool.hpp>
 
 #include <map>
 #include <utility>
@@ -38,6 +38,10 @@
 #include <vector>
 #include <set>
 #include <fstream>  // std::ofstream
+#include <limits>  // for numeric_limits<>
+#include <tuple>
+#include <algorithm>
+#include <string>
 
 namespace Gudhi {
 
@@ -266,13 +270,10 @@ class Persistent_cohomology {
   }
 
   ~Persistent_cohomology() {
-// Clean the remaining columns in the matrix.
-    for (auto & cam_ref : cam_) {
-      cam_ref.col_.clear();
-    }
-// Clean the transversal lists
+    // Clean the transversal lists
     for (auto & transverse_ref : transverse_idx_) {
-      transverse_ref.second.row_->clear();
+      // Destruct all the cells
+      transverse_ref.second.row_->clear_and_dispose([&](Cell*p){p->~Cell();});
       delete transverse_ref.second.row_;
     }
   }
@@ -527,8 +528,8 @@ class Persistent_cohomology {
                       Arith_element charac) {
     Simplex_key key = cpx_->key(sigma);
     // Create a column containing only one cell,
-    Column * new_col = column_pool_.construct(Column(key));
-    Cell * new_cell = cell_pool_.construct(Cell(key, x, new_col));
+    Column * new_col = column_pool_.construct(key);
+    Cell * new_cell = cell_pool_.construct(key, x, new_col);
     new_col->col_.push_back(*new_cell);
     // and insert it in the matrix, in constant time thanks to the hint cam_.end().
     // Indeed *new_col has the biggest lexicographic value because key is the
@@ -572,9 +573,8 @@ class Persistent_cohomology {
         Column * curr_col = row_cell_it->self_col_;
         ++row_cell_it;
         // Disconnect the column from the rows in the CAM.
-        for (auto col_cell_it = curr_col->col_.begin();
-            col_cell_it != curr_col->col_.end(); ++col_cell_it) {
-          col_cell_it->base_hook_cam_h::unlink();
+        for (auto& col_cell : curr_col->col_) {
+          col_cell.base_hook_cam_h::unlink();
         }
 
         // Remove the column from the CAM before modifying its value
@@ -589,9 +589,9 @@ class Persistent_cohomology {
           // Find whether the column obtained is already in the CAM
           result_insert_cam = cam_.insert(*curr_col);
           if (result_insert_cam.second) {  // If it was not in the CAM before: insertion has succeeded
-            for (auto col_cell_it = curr_col->col_.begin(); col_cell_it != curr_col->col_.end(); ++col_cell_it) {
+            for (auto& col_cell : curr_col->col_) {
               // re-establish the row links
-              transverse_idx_[col_cell_it->key_].row_->push_front(*col_cell_it);
+              transverse_idx_[col_cell.key_].row_->push_front(col_cell);
             }
           } else {  // There is already an identical column in the CAM:
             // merge two disjoint sets.
@@ -601,6 +601,8 @@ class Persistent_cohomology {
             Simplex_key key_tmp = dsets_.find_set(curr_col->class_key_);
             ds_repr_[key_tmp] = &(*(result_insert_cam.first));
             result_insert_cam.first->class_key_ = key_tmp;
+            // intrusive containers don't own their elements, we have to release them manually
+            curr_col->col_.clear_and_dispose([&](Cell*p){cell_pool_.destroy(p);});
             column_pool_.destroy(curr_col);  // delete curr_col;
           }
         }
@@ -711,13 +713,11 @@ class Persistent_cohomology {
     }
   }
 
-  void write_output_diagram(std::string diagram_name)
-  {
-    std::ofstream           diagram_out(diagram_name.c_str());
-    cmp_intervals_by_length cmp( cpx_ );
+  void write_output_diagram(std::string diagram_name) {
+    std::ofstream diagram_out(diagram_name.c_str());
+    cmp_intervals_by_length cmp(cpx_);
     std::sort(std::begin(persistent_pairs_), std::end(persistent_pairs_), cmp);
-    for(auto pair : persistent_pairs_)
-    {
+    for (auto pair : persistent_pairs_) {
     diagram_out << cpx_->dimension(get<0>(pair)) << " "
           << cpx_->filtration(get<0>(pair)) << " "
           << cpx_->filtration(get<1>(pair)) << std::endl;
@@ -766,8 +766,8 @@ class Persistent_cohomology {
   std::vector<Persistent_interval> persistent_pairs_;
   length_interval interval_length_policy;
 
-  boost::object_pool<Column> column_pool_;
-  boost::object_pool<Cell> cell_pool_;
+  Simple_object_pool<Column> column_pool_;
+  Simple_object_pool<Cell> cell_pool_;
 };
 
 /** @} */  // end defgroup persistent_cohomology
@@ -776,4 +776,4 @@ class Persistent_cohomology {
 
 }  // namespace Gudhi
 
-#endif  // SRC_PERSISTENT_COHOMOLOGY_INCLUDE_GUDHI_PERSISTENT_COHOMOLOGY_H_
+#endif  // PERSISTENT_COHOMOLOGY_H_