diff options
| author | MathieuCarriere <mathieu.carriere3@gmail.com> | 2022-12-13 23:21:47 +0100 |
|---|---|---|
| committer | MathieuCarriere <mathieu.carriere3@gmail.com> | 2022-12-13 23:21:47 +0100 |
| commit | d71f261aec2c5369f71cfde6b520c183dbfc56b3 (patch) | |
| tree | 7c1d8bce1cd54d909b17455e78ab20023617b5f0 /src | |
| parent | dde17f59bef478399c224fa57c1b7e809d0b87c7 (diff) | |
| parent | 55155afc5e9c9201476b9a2d9096a7ae874a27f6 (diff) | |
Merge branch 'master' of https://github.com/GUDHI/gudhi-devel into perslay
Diffstat (limited to 'src')
| -rw-r--r-- | src/Cech_complex/utilities/cechcomplex.md | 4 | ||||
| -rw-r--r-- | src/Tangential_complex/include/gudhi/Tangential_complex.h | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/Cech_complex/utilities/cechcomplex.md b/src/Cech_complex/utilities/cechcomplex.md index 0e82674d..54c4e88d 100644 --- a/src/Cech_complex/utilities/cechcomplex.md +++ b/src/Cech_complex/utilities/cechcomplex.md @@ -36,14 +36,14 @@ where * `-h [ --help ]` Produce help message * `-o [ --output-file ]` Name of file in which the persistence diagram is written. Default print in standard output. -* `-r [ --max-edge-length ]` (default = inf) Maximal length of an edge for the Čech complex construction. +* `-r [ --max-radius ]` (default = inf) Maximal radius for the Čech complex construction. * `-d [ --cpx-dimension ]` (default = 1) Maximal dimension of the Čech complex we want to compute. * `-p [ --field-charac ]` (default = 11) Characteristic p of the coefficient field Z/pZ for computing homology. * `-m [ --min-persistence ]` (default = 0) Minimal lifetime of homology feature to be recorded. Enter a negative value to see zero length intervals. * `-e [ --exact ]` for the exact computation version. * `-f [ --fast ]` for the fast computation version. -Beware: this program may use a lot of RAM and take a lot of time if `max-edge-length` is set to a large value. +Beware: this program may use a lot of RAM and take a lot of time if `max-radius` is set to a large value. **Example 1 with Z/2Z coefficients** diff --git a/src/Tangential_complex/include/gudhi/Tangential_complex.h b/src/Tangential_complex/include/gudhi/Tangential_complex.h index b448db2d..ab203ca5 100644 --- a/src/Tangential_complex/include/gudhi/Tangential_complex.h +++ b/src/Tangential_complex/include/gudhi/Tangential_complex.h @@ -56,6 +56,7 @@ #include <string> #include <cstddef> // for std::size_t #include <optional> +#include <numeric> // for std::iota #ifdef GUDHI_USE_TBB #include <tbb/parallel_for.h> @@ -624,6 +625,11 @@ class Tangential_complex { int max_dim = -1; + // Ordered vertices to be inserted first by the create_complex method to avoid quadratic complexity. + std::vector<typename Simplex_tree_::Vertex_handle> vertices(m_points.size()); + std::iota(vertices.begin(), vertices.end(), 0); + tree.insert_batch_vertices(vertices); + // For each triangulation for (std::size_t idx = 0; idx < m_points.size(); ++idx) { // For each cell of the star |