summaryrefslogtreecommitdiff
path: root/src/Cech_complex/include
diff options
context:
space:
mode:
authorvrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2018-03-22 10:10:08 +0000
committervrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2018-03-22 10:10:08 +0000
commit1f3716292673a56413d3501b4b98b54416d193ed (patch)
tree987e487ff243271328398d4d2110ee4936ebaba7 /src/Cech_complex/include
parent81c9548a189aa46ab7e71bbcf15a185ee68df24a (diff)
code review : Rename Radius_distance Minimal_enclosing_ball_radius
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/cechcomplex_vincent@3304 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 204aa7a7098773b2d290e35a12a1c92449743d7d
Diffstat (limited to 'src/Cech_complex/include')
-rw-r--r--src/Cech_complex/include/gudhi/Cech_complex.h11
-rw-r--r--src/Cech_complex/include/gudhi/Cech_complex_blocker.h4
2 files changed, 8 insertions, 7 deletions
diff --git a/src/Cech_complex/include/gudhi/Cech_complex.h b/src/Cech_complex/include/gudhi/Cech_complex.h
index 612c73c3..8b1a9221 100644
--- a/src/Cech_complex/include/gudhi/Cech_complex.h
+++ b/src/Cech_complex/include/gudhi/Cech_complex.h
@@ -23,7 +23,7 @@
#ifndef CECH_COMPLEX_H_
#define CECH_COMPLEX_H_
-#include <gudhi/distance_functions.h> // for Gudhi::Radius_distance
+#include <gudhi/distance_functions.h> // for Gudhi::Minimal_enclosing_ball_radius
#include <gudhi/graph_simplicial_complex.h> // for Gudhi::Proximity_graph
#include <gudhi/Debug_utils.h> // for GUDHI_CHECK
#include <gudhi/Cech_complex_blocker.h> // for Gudhi::cech_complex::Cech_blocker
@@ -43,7 +43,7 @@ namespace cech_complex {
*
* \details
* The data structure is a proximity graph, containing edges when the edge length is less or equal
- * to a given max_radius. Edge length is computed from `Gudhi::Radius_distance` distance function.
+ * to a given max_radius. Edge length is computed from `Gudhi::Minimal_enclosing_ball_radius` distance function.
*
* \tparam SimplicialComplexForProximityGraph furnishes `Vertex_handle` and `Filtration_value` type definition required
* by `Gudhi::Proximity_graph`.
@@ -71,9 +71,10 @@ class Cech_complex {
Cech_complex(const ForwardPointRange& points, Filtration_value max_radius)
: max_radius_(max_radius),
point_cloud_(points) {
- cech_skeleton_graph_ = Gudhi::compute_proximity_graph<SimplicialComplexForProximityGraph>(point_cloud_,
- max_radius_,
- Gudhi::Radius_distance());
+ cech_skeleton_graph_ =
+ Gudhi::compute_proximity_graph<SimplicialComplexForProximityGraph>(point_cloud_,
+ max_radius_,
+ Gudhi::Minimal_enclosing_ball_radius());
}
/** \brief Initializes the simplicial complex from the proximity graph and expands it until a given maximal
diff --git a/src/Cech_complex/include/gudhi/Cech_complex_blocker.h b/src/Cech_complex/include/gudhi/Cech_complex_blocker.h
index 5ba17c51..c082815d 100644
--- a/src/Cech_complex/include/gudhi/Cech_complex_blocker.h
+++ b/src/Cech_complex/include/gudhi/Cech_complex_blocker.h
@@ -24,7 +24,7 @@
#define CECH_COMPLEX_BLOCKER_H_
#include <gudhi/Cech_complex.h> // Cech_blocker is using a pointer on Gudhi::cech_complex::Cech_complex
-#include <gudhi/distance_functions.h> // for Gudhi::Radius_distance
+#include <gudhi/distance_functions.h> // for Gudhi::Minimal_enclosing_ball_radius
#include <iostream>
#include <vector>
@@ -75,7 +75,7 @@ class Cech_blocker {
std::cout << "#(" << vertex << ")#";
#endif // DEBUG_TRACES
}
- Filtration_value radius = Gudhi::Radius_distance()(points);
+ Filtration_value radius = Gudhi::Minimal_enclosing_ball_radius()(points);
#ifdef DEBUG_TRACES
if (radius > cc_ptr_->max_radius())
std::cout << "radius > max_radius => expansion is blocked\n";