1 files changed, 26 insertions, 19 deletions

diff --git a/src/Cech_complex/include/gudhi/Cech_complex.h b/src/Cech_complex/include/gudhi/Cech_complex.h
index b0871e10..0031d861 100644
--- a/src/Cech_complex/include/gudhi/Cech_complex.h
+++ b/src/Cech_complex/include/gudhi/Cech_complex.h
@@ -11,14 +11,13 @@
 #ifndef CECH_COMPLEX_H_
 #define CECH_COMPLEX_H_
 
-#include <gudhi/distance_functions.h>        // for Gudhi::Minimal_enclosing_ball_radius
+#include <gudhi/Cech_complex/Cech_kernel.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
 
 #include <iostream>
 #include <stdexcept>  // for exception management
-#include <vector>
 
 namespace Gudhi {
 
@@ -40,7 +39,7 @@ namespace cech_complex {
  * \tparam ForwardPointRange 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 ForwardPointRange, typename Kernel, typename SimplicialComplexForCechComplex>
 class Cech_complex {
  private:
   // Required by compute_proximity_graph
@@ -48,16 +47,17 @@ class Cech_complex {
   using Filtration_value = typename SimplicialComplexForProximityGraph::Filtration_value;
   using Proximity_graph = Gudhi::Proximity_graph<SimplicialComplexForProximityGraph>;
 
-  // Retrieve Coordinate type from ForwardPointRange
-  using Point_from_range_iterator = typename boost::range_const_iterator<ForwardPointRange>::type;
-  using Point_from_range = typename std::iterator_traits<Point_from_range_iterator>::value_type;
-  using Coordinate_iterator = typename boost::range_const_iterator<Point_from_range>::type;
-  using Coordinate = typename std::iterator_traits<Coordinate_iterator>::value_type;
-
  public:
-  // Point and Point_cloud type definition
-  using Point = std::vector<Coordinate>;
-  using Point_cloud = std::vector<Point>;
+
+  using cech_blocker = Cech_blocker<SimplicialComplexForCechComplex, Cech_complex, Kernel>;
+
+  using Point_d = typename cech_blocker::Point_d;
+  using Point_cloud = std::vector<Point_d>;
+
+  // Numeric type of coordinates in the kernel
+  using FT = typename cech_blocker::FT;
+  // Sphere is a pair of point and squared radius.
+  using Sphere = typename std::pair<Point_d, FT>;
 
  public:
   /** \brief Cech_complex constructor from a list of points.
@@ -70,11 +70,14 @@ class Cech_complex {
    */
   Cech_complex(const ForwardPointRange& points, Filtration_value max_radius) : max_radius_(max_radius) {
     // Point cloud deep copy
-    point_cloud_.reserve(boost::size(points));
-    for (auto&& point : points) point_cloud_.emplace_back(std::begin(point), std::end(point));
+
+//     point_cloud_.reserve(boost::size(points));
+//     for (auto&& point : points) point_cloud_.emplace_back(point.cartesian_begin(), point.cartesian_end());
+
+    point_cloud_.assign(points.begin(), points.end());
 
     cech_skeleton_graph_ = Gudhi::compute_proximity_graph<SimplicialComplexForProximityGraph>(
-        point_cloud_, max_radius_, Gudhi::Minimal_enclosing_ball_radius());
+        point_cloud_, max_radius_, Gudhi::Minimal_enclosing_ball_radius<Kernel>());
   }
 
   /** \brief Initializes the simplicial complex from the proximity graph and expands it until a given maximal
@@ -85,7 +88,6 @@ class Cech_complex {
    * @exception std::invalid_argument In debug mode, if `complex.num_vertices()` does not return 0.
    *
    */
-  template <typename SimplicialComplexForCechComplex>
   void create_complex(SimplicialComplexForCechComplex& complex, int dim_max) {
     GUDHI_CHECK(complex.num_vertices() == 0,
                 std::invalid_argument("Cech_complex::create_complex - simplicial complex is not empty"));
@@ -93,8 +95,7 @@ class Cech_complex {
     // insert the proximity graph in the simplicial complex
     complex.insert_graph(cech_skeleton_graph_);
     // expand the graph until dimension dim_max
-    complex.expansion_with_blockers(dim_max,
-                                    Cech_blocker<SimplicialComplexForCechComplex, Cech_complex>(&complex, this));
+    complex.expansion_with_blockers(dim_max, cech_blocker(&complex, this));
   }
 
   /** @return max_radius value given at construction. */
@@ -103,12 +104,18 @@ class Cech_complex {
   /** @param[in] vertex Point position in the range.
    * @return The point.
    */
-  const Point& get_point(Vertex_handle vertex) const { return point_cloud_[vertex]; }
+  const Point_d& get_point(Vertex_handle vertex) const { return point_cloud_[vertex]; }
+
+  /**
+   * @return Vector of cached spheres.
+   */
+  std::vector<Sphere> & get_cache() { return cache_; }
 
  private:
   Proximity_graph cech_skeleton_graph_;
   Filtration_value max_radius_;
   Point_cloud point_cloud_;
+  std::vector<Sphere> cache_;
 };
 
 }  // namespace cech_complex