summaryrefslogtreecommitdiff
path: root/src/Cech_complex
diff options
context:
space:
mode:
authorvrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2018-04-09 12:14:26 +0000
committervrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2018-04-09 12:14:26 +0000
commita80c1adb219494f909e55ea274b39355218a5138 (patch)
treed95e0c99761980e1ed5b8a03fcc47310e2715663 /src/Cech_complex
parentf81e76fc676f79660cc47fbe96f5ee591cb169c9 (diff)
Code review : Rename ForwardPointIterator with InputPointRange
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/cechcomplex_vincent@3358 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 6f90e228c4c546b28b9fe610e5f59bbab047cd27
Diffstat (limited to 'src/Cech_complex')
-rw-r--r--src/Cech_complex/include/gudhi/Cech_complex.h14
-rw-r--r--src/Cech_complex/include/gudhi/Cech_complex_blocker.h8
2 files changed, 11 insertions, 11 deletions
diff --git a/src/Cech_complex/include/gudhi/Cech_complex.h b/src/Cech_complex/include/gudhi/Cech_complex.h
index 1cae7b0b..52f03d6b 100644
--- a/src/Cech_complex/include/gudhi/Cech_complex.h
+++ b/src/Cech_complex/include/gudhi/Cech_complex.h
@@ -48,16 +48,16 @@ namespace cech_complex {
* \tparam SimplicialComplexForProximityGraph furnishes `Vertex_handle` and `Filtration_value` type definition required
* by `Gudhi::Proximity_graph`.
*
- * \tparam ForwardPointRange must be a range for which `std::begin()` and `std::end()` methods return input
+ * \tparam InputPointRange must be a range for which `std::begin()` and `std::end()` methods return input
* iterators on a point. `std::begin()` and `std::end()` methods are also required for a point.
*/
-template<typename SimplicialComplexForProximityGraph, typename ForwardPointRange>
+template<typename SimplicialComplexForProximityGraph, typename InputPointRange>
class Cech_complex {
private:
using Vertex_handle = typename SimplicialComplexForProximityGraph::Vertex_handle;
using Filtration_value = typename SimplicialComplexForProximityGraph::Filtration_value;
using Proximity_graph = Gudhi::Proximity_graph<SimplicialComplexForProximityGraph>;
- using Point_iterator = typename boost::range_const_iterator<ForwardPointRange>::type;
+ using Point_iterator = typename boost::range_const_iterator<InputPointRange>::type;
using Point= typename std::iterator_traits<Point_iterator>::value_type;
using Point_cloud = std::vector<Point>;
@@ -67,11 +67,11 @@ class Cech_complex {
* @param[in] points Range of points.
* @param[in] max_radius Maximal radius value.
*
- * \tparam ForwardPointRange must be a range for which `std::begin()` and `std::end()` methods return input
+ * \tparam InputPointRange must be a range for which `std::begin()` and `std::end()` methods return input
* iterators on a point. `std::begin()` and `std::end()` methods are also required for a point.
*
*/
- Cech_complex(const ForwardPointRange& points, Filtration_value max_radius)
+ Cech_complex(const InputPointRange& points, Filtration_value max_radius)
: max_radius_(max_radius),
point_cloud_(std::begin(points), std::end(points)) {
cech_skeleton_graph_ =
@@ -97,7 +97,7 @@ class Cech_complex {
complex.insert_graph(cech_skeleton_graph_);
// expand the graph until dimension dim_max
complex.expansion_with_blockers(dim_max,
- Cech_blocker<SimplicialComplexForCechComplex, ForwardPointRange>(&complex, this));
+ Cech_blocker<SimplicialComplexForCechComplex, InputPointRange>(&complex, this));
}
/** @return max_radius value given at construction. */
@@ -109,7 +109,7 @@ class Cech_complex {
* @return A const iterator on the point.
* @exception std::out_of_range In debug mode, if point position in the range is out.
*/
- typename ForwardPointRange::const_iterator point_iterator(std::size_t vertex) const {
+ typename InputPointRange::const_iterator point_iterator(std::size_t vertex) const {
GUDHI_CHECK((std::begin(point_cloud_) + vertex) < std::end(point_cloud_),
std::out_of_range("Cech_complex::point - simplicial complex is not empty"));
return (std::begin(point_cloud_) + vertex);
diff --git a/src/Cech_complex/include/gudhi/Cech_complex_blocker.h b/src/Cech_complex/include/gudhi/Cech_complex_blocker.h
index 6755c826..ab56c10d 100644
--- a/src/Cech_complex/include/gudhi/Cech_complex_blocker.h
+++ b/src/Cech_complex/include/gudhi/Cech_complex_blocker.h
@@ -35,7 +35,7 @@ namespace Gudhi {
namespace cech_complex {
// Just declaring Cech_complex class because used and not yet defined.
-template<typename SimplicialComplexForCechComplex, typename ForwardPointRange>
+template<typename SimplicialComplexForCechComplex, typename InputPointRange>
class Cech_complex;
/** \internal
@@ -50,16 +50,16 @@ class Cech_complex;
* \tparam SimplicialComplexForProximityGraph furnishes `Simplex_handle` and `Filtration_value` type definition,
* `simplex_vertex_range(Simplex_handle sh)`and `assign_filtration(Simplex_handle sh, Filtration_value filt)` methods.
*
- * \tparam ForwardPointRange is required by the pointer on Chech_complex for type definition.
+ * \tparam InputPointRange is required by the pointer on Chech_complex for type definition.
*/
-template <typename SimplicialComplexForCech, typename ForwardPointRange>
+template <typename SimplicialComplexForCech, typename InputPointRange>
class Cech_blocker {
private:
using Point = std::vector<double>;
using Point_cloud = std::vector<Point>;
using Simplex_handle = typename SimplicialComplexForCech::Simplex_handle;
using Filtration_value = typename SimplicialComplexForCech::Filtration_value;
- using Cech_complex = Gudhi::cech_complex::Cech_complex<SimplicialComplexForCech, ForwardPointRange>;
+ using Cech_complex = Gudhi::cech_complex::Cech_complex<SimplicialComplexForCech, InputPointRange>;
public:
/** \internal \brief Cech complex blocker operator() - the oracle - assigns the filtration value from the simplex