diff options
| author | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-09-28 21:25:57 +0000 |
|---|---|---|
| committer | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-09-28 21:25:57 +0000 |
| commit | 41e6d3213b7d6c3d170239ae2fca24e5d19569c1 (patch) | |
| tree | 7717f3a8f77763171c5c0975f869bac4f174da66 /src/Persistent_cohomology | |
| parent | fb0a592e87816c30101c2a69e72b59e98d44c2fa (diff) | |
| parent | 5dcc9dd4b14705b655c0129cf390c35a51b57dfe (diff) | |
Reintegrate branch pool.
Stop using boost::object_pool, which sucks.
When coefficients are mpz_class, we could still gain time by recycling live cells instead of running the destructor, recycling the storage, and running the constructor again.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@804 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: eef5f693411adafbdf45584462116b7e06ef1c3e
Diffstat (limited to 'src/Persistent_cohomology')
| -rw-r--r-- | src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h index efe20151..5f399f1a 100644 --- a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h +++ b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h @@ -25,12 +25,12 @@ #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> @@ -268,8 +268,8 @@ class Persistent_cohomology { ~Persistent_cohomology() { // Clean the transversal lists for (auto & transverse_ref : transverse_idx_) { - // Release all the cells - transverse_ref.second.row_->clear_and_dispose([&](Cell*p){cell_pool_.destroy(p);}); + // Destruct all the cells + transverse_ref.second.row_->clear_and_dispose([&](Cell*p){p->~Cell();}); delete transverse_ref.second.row_; } } @@ -764,8 +764,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 |