diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-03-22 10:25:27 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-03-22 10:25:27 +0100 |
| commit | bb6f10aff11e05baec2d2d10c544a2ea1c302bc6 (patch) | |
| tree | 665b6fcbdf6c951d31206852a2d356ef103ada18 /src/Simplex_tree/example | |
| parent | f78d65f0bd6aaf5f92639e2b809e1711acf929f7 (diff) | |
| parent | 2ec0ac1f006577d520accbe605a61fc10ede3352 (diff) | |
Merge master and fix conflicts
Diffstat (limited to 'src/Simplex_tree/example')
| -rw-r--r-- | src/Simplex_tree/example/simple_simplex_tree.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/Simplex_tree/example/simple_simplex_tree.cpp b/src/Simplex_tree/example/simple_simplex_tree.cpp index ca39df5b..e8bec596 100644 --- a/src/Simplex_tree/example/simple_simplex_tree.cpp +++ b/src/Simplex_tree/example/simple_simplex_tree.cpp @@ -166,7 +166,6 @@ int main(int argc, char* const argv[]) { // ++ GENERAL VARIABLE SET std::clog << "********************************************************************\n"; - // Display the Simplex_tree - Can not be done in the middle of 2 inserts std::clog << "* The complex contains " << simplexTree.num_simplices() << " simplices\n"; std::clog << " - dimension " << simplexTree.dimension() << "\n"; std::clog << "* Iterator on Simplices in the filtration, with [filtration value]:\n"; |