diff options
author | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-10-06 18:11:50 +0000 |
---|---|---|
committer | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-10-06 18:11:50 +0000 |
commit | 07e6b3d053144329a03bf7c8f52538d221e6ea6d (patch) | |
tree | 393f6247f8c5eacd0c3776bb97203676de4b11a5 /src/Witness_complex/include | |
parent | d439da1345822fe25f58adb631f7d0cd9749ecfc (diff) |
Added persistence examples
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/relaxed-witness@1670 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: c7762be9b79ba70cca84a378915c2deef13211fd
Diffstat (limited to 'src/Witness_complex/include')
-rw-r--r-- | src/Witness_complex/include/gudhi/Strong_witness_complex.h | 12 | ||||
-rw-r--r-- | src/Witness_complex/include/gudhi/Witness_complex.h | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/Witness_complex/include/gudhi/Strong_witness_complex.h b/src/Witness_complex/include/gudhi/Strong_witness_complex.h index f5633a98..3a862d71 100644 --- a/src/Witness_complex/include/gudhi/Strong_witness_complex.h +++ b/src/Witness_complex/include/gudhi/Strong_witness_complex.h @@ -27,9 +27,6 @@ #include <boost/iterator/transform_iterator.hpp> #include <algorithm> #include <utility> -#include "gudhi/reader_utils.h" -#include "gudhi/distance_functions.h" -#include "gudhi/Simplex_tree.h" #include <vector> #include <list> #include <set> @@ -39,6 +36,11 @@ #include <ctime> #include <iostream> +#include "Active_witness/Active_witness.h" +#include <gudhi/Simplex_tree.h> +#include <gudhi/Kd_tree_search.h> + + // Needed for nearest neighbours #include <CGAL/Cartesian_d.h> #include <CGAL/Search_traits.h> @@ -142,6 +144,7 @@ private: FT max_alpha_square) { unsigned nbL = landmarks_.size(); + unsigned complex_dim = 0; if (complex.num_vertices() > 0) { std::cerr << "Witness complex cannot create complex - complex is not empty.\n"; return false; @@ -168,7 +171,10 @@ private: complex.insert_simplex_and_subfaces(simplex, aw_it->second - aw.begin()->second); aw_it++; } + if (simplex.size() - 1 > complex_dim) + complex_dim = simplex.size() - 1; } + complex.set_dimension(complex_dim); return true; } diff --git a/src/Witness_complex/include/gudhi/Witness_complex.h b/src/Witness_complex/include/gudhi/Witness_complex.h index a16f9270..7d8fce86 100644 --- a/src/Witness_complex/include/gudhi/Witness_complex.h +++ b/src/Witness_complex/include/gudhi/Witness_complex.h @@ -31,7 +31,6 @@ #include <boost/range/size.hpp> #include "Active_witness/Active_witness.h" -#include <gudhi/distance_functions.h> #include <gudhi/Kd_tree_search.h> #include <algorithm> @@ -175,6 +174,7 @@ private: } k++; } + complex.set_dimension(k-1); return true; } |