From 6b7a6c4ab5e643393ac9ef9ccec25d9d9afac822 Mon Sep 17 00:00:00 2001 From: skachano Date: Wed, 18 Jan 2017 10:21:00 +0000 Subject: Fixed doc for non-Euclidean complexes. Concept is left git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/relaxed-witness@1946 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 949925ad85a74418a53bff1c934ce2f7669c483e --- .../include/gudhi/Strong_witness_complex.h | 17 ++++------------- src/Witness_complex/include/gudhi/Witness_complex.h | 12 ++++-------- .../include/gudhi/Witness_complex/all_faces_in.h | 2 +- 3 files changed, 9 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/Witness_complex/include/gudhi/Strong_witness_complex.h b/src/Witness_complex/include/gudhi/Strong_witness_complex.h index 164d8ffe..20f9da8d 100644 --- a/src/Witness_complex/include/gudhi/Strong_witness_complex.h +++ b/src/Witness_complex/include/gudhi/Strong_witness_complex.h @@ -40,18 +40,10 @@ namespace witness_complex { /** * \private * \class Strong_witness_complex - * \brief Constructs strong witness complex for the given sets of witnesses and landmarks. + * \brief Constructs strong witness complex for a given table of nearest landmarks with respect to witnesses. * \ingroup witness_complex * - * \tparam Kernel_ requires a CGAL::Epick_d class, which - * can be static if you know the ambiant dimension at compile-time, or dynamic if you don't. - * \tparam DimensionTag can be either Dimension_tag - * if you know the intrinsic dimension at compile-time, - * or CGAL::Dynamic_dimension_tag - * if you don't. + * \tparam Nearest_landmark_table_ needs to be a range of a model of NearestLandmarkRange concept. */ template< class Nearest_landmark_table_ > class Strong_witness_complex { @@ -78,9 +70,8 @@ private: /** * \brief Initializes member variables before constructing simplicial complex. - * \details Records landmarks from the range 'landmarks' into a - * table internally, as well as witnesses from the range 'witnesses'. - * Both ranges should have value_type Kernel_::Point_d. + * \details Records nearest landmark table. + * @param[in] nearest_landmark_table should be a range of a model of NearestLandmarkRange concept. */ Strong_witness_complex(Nearest_landmark_table_ & nearest_landmark_table) : nearest_landmark_table_(nearest_landmark_table) diff --git a/src/Witness_complex/include/gudhi/Witness_complex.h b/src/Witness_complex/include/gudhi/Witness_complex.h index 2cd7a178..70d51677 100644 --- a/src/Witness_complex/include/gudhi/Witness_complex.h +++ b/src/Witness_complex/include/gudhi/Witness_complex.h @@ -41,12 +41,10 @@ namespace witness_complex { /** * \private * \class Witness_complex - * \brief Constructs (weak) witness complex for the given sets of witnesses and landmarks. + * \brief Constructs (weak) witness complex for a given table of nearest landmarks with respect to witnesses. * \ingroup witness_complex * - * \tparam Kernel_ requires a CGAL::Epick_d class, which - * can be static if you know the ambiant dimension at compile-time, or dynamic if you don't. + * \tparam Nearest_landmark_table_ needs to be a range of a model of NearestLandmarkRange concept. */ template< class Nearest_landmark_table_ > class Witness_complex { @@ -73,9 +71,8 @@ private: /** * \brief Initializes member variables before constructing simplicial complex. - * \details Records landmarks from the range 'landmarks' into a - * table internally, as well as witnesses from the range 'witnesses'. - * Both ranges should have value_type Kernel_::Point_d. + * \details Records nearest landmark table. + @param[in] nearest_landmark_table should be a range of a model of NearestLandmarkRange concept. */ Witness_complex(Nearest_landmark_table_ & nearest_landmark_table) @@ -98,7 +95,6 @@ private: double max_alpha_square, Landmark_id limit_dimension = std::numeric_limits::max()) { - // std::size_t nbL = landmarks_.size(); if (complex.num_vertices() > 0) { std::cerr << "Witness complex cannot create complex - complex is not empty.\n"; return false; diff --git a/src/Witness_complex/include/gudhi/Witness_complex/all_faces_in.h b/src/Witness_complex/include/gudhi/Witness_complex/all_faces_in.h index 899022f8..b69719a3 100644 --- a/src/Witness_complex/include/gudhi/Witness_complex/all_faces_in.h +++ b/src/Witness_complex/include/gudhi/Witness_complex/all_faces_in.h @@ -23,7 +23,7 @@ template < typename SimplicialComplexForWitness, for (typename Simplex::iterator it = simplex.begin(); it != simplex.end(); ++it) if (it != not_it) facet.push_back(*it); - typename SimplicialComplexForWitness::Simplex_handle facet_sh = sc.find(facet); + Simplex_handle facet_sh = sc.find(facet); if (facet_sh == sc.null_simplex()) return false; else if (sc.filtration(facet_sh) > *filtration_value) -- cgit v1.2.3