c++ version to trigger exact/inexact kernel

2 files changed, 68 insertions, 64 deletions

diff --git a/src/python/gudhi/alpha_complex.pyx b/src/python/gudhi/alpha_complex.pyx
index 700fa738..5bc9ebc4 100644
--- a/src/python/gudhi/alpha_complex.pyx
+++ b/src/python/gudhi/alpha_complex.pyx
@@ -26,18 +26,10 @@ __copyright__ = "Copyright (C) 2016 Inria"
 __license__ = "GPL v3"
 
 cdef extern from "Alpha_complex_interface.h" namespace "Gudhi":
-    cdef cppclass Alpha_complex_exact_interface "Gudhi::alpha_complex::Alpha_complex_interface<Gudhi::alpha_complex::Exact_kernel>":
-        Alpha_complex_exact_interface(vector[vector[double]] points) nogil except +
+    cdef cppclass Alpha_complex_interface "Gudhi::alpha_complex::Alpha_complex_interface":
+        Alpha_complex_interface(vector[vector[double]] points, bool fast_version) nogil except +
         # bool from_file is a workaround for cython to find the correct signature
-        Alpha_complex_exact_interface(string off_file, bool from_file) nogil except +
-        vector[double] get_point(int vertex) nogil except +
-        void create_simplex_tree(Simplex_tree_interface_full_featured* simplex_tree, double max_alpha_square, bool exact_version, bool default_filtration_value) nogil except +
-
-cdef extern from "Alpha_complex_interface.h" namespace "Gudhi":
-    cdef cppclass Alpha_complex_inexact_interface "Gudhi::alpha_complex::Alpha_complex_interface<Gudhi::alpha_complex::Inexact_kernel>":
-        Alpha_complex_inexact_interface(vector[vector[double]] points) nogil except +
-        # bool from_file is a workaround for cython to find the correct signature
-        Alpha_complex_inexact_interface(string off_file, bool from_file) nogil except +
+        Alpha_complex_interface(string off_file, bool fast_version, bool from_file) nogil except +
         vector[double] get_point(int vertex) nogil except +
         void create_simplex_tree(Simplex_tree_interface_full_featured* simplex_tree, double max_alpha_square, bool exact_version, bool default_filtration_value) nogil except +
 
@@ -61,8 +53,7 @@ cdef class AlphaComplex:
 
     """
 
-    cdef Alpha_complex_exact_interface * exact_ptr
-    cdef Alpha_complex_inexact_interface * inexact_ptr
+    cdef Alpha_complex_interface * this_ptr
     cdef bool fast
     cdef bool exact
 
@@ -91,10 +82,7 @@ cdef class AlphaComplex:
         cdef vector[vector[double]] pts
         if off_file:
             if os.path.isfile(off_file):
-                if self.fast:
-                    self.inexact_ptr = new Alpha_complex_inexact_interface(off_file.encode('utf-8'), True)
-                else:
-                    self.exact_ptr = new Alpha_complex_exact_interface(off_file.encode('utf-8'), True)
+                self.this_ptr = new Alpha_complex_interface(off_file.encode('utf-8'), self.fast, True)
             else:
                 print("file " + off_file + " not found.")
         else:
@@ -102,28 +90,17 @@ cdef class AlphaComplex:
                 # Empty Alpha construction
                 points=[]
             pts = points
-            if self.fast:
-                with nogil:
-                    self.inexact_ptr = new Alpha_complex_inexact_interface(pts)
-            else:
-                with nogil:
-                    self.exact_ptr = new Alpha_complex_exact_interface(pts)
+            with nogil:
+                self.this_ptr = new Alpha_complex_interface(pts, self.fast)
 
     def __dealloc__(self):
-        if self.fast:
-            if self.inexact_ptr != NULL:
-                del self.inexact_ptr
-        else:
-            if self.exact_ptr != NULL:
-                del self.exact_ptr
+        if self.this_ptr != NULL:
+            del self.this_ptr
 
     def __is_defined(self):
         """Returns true if AlphaComplex pointer is not NULL.
          """
-        if self.fast:
-            return self.inexact_ptr != NULL
-        else:
-            return self.exact_ptr != NULL
+        return self.this_ptr != NULL
 
     def get_point(self, vertex):
         """This function returns the point corresponding to a given vertex.
@@ -133,10 +110,7 @@ cdef class AlphaComplex:
         :rtype: list of float
         :returns: the point.
         """
-        if self.fast:
-            return self.inexact_ptr.get_point(vertex)
-        else:
-            return self.exact_ptr.get_point(vertex)
+        return self.this_ptr.get_point(vertex)
 
     def create_simplex_tree(self, max_alpha_square = float('inf'), default_filtration_value = False):
         """
@@ -153,12 +127,7 @@ cdef class AlphaComplex:
         cdef double mas = max_alpha_square
         cdef intptr_t stree_int_ptr=stree.thisptr
         cdef bool compute_filtration = default_filtration_value == True
-        if self.fast:
-            with nogil:
-                self.inexact_ptr.create_simplex_tree(<Simplex_tree_interface_full_featured*>stree_int_ptr,
-                    mas, False, compute_filtration)
-        else:
-            with nogil:
-                self.exact_ptr.create_simplex_tree(<Simplex_tree_interface_full_featured*>stree_int_ptr,
-                    mas, self.exact, compute_filtration)
+        with nogil:
+            self.this_ptr.create_simplex_tree(<Simplex_tree_interface_full_featured*>stree_int_ptr,
+                                              mas, self.exact, compute_filtration)
         return stree
diff --git a/src/python/include/Alpha_complex_interface.h b/src/python/include/Alpha_complex_interface.h
index 3dd01345..46f2ba03 100644
--- a/src/python/include/Alpha_complex_interface.h
+++ b/src/python/include/Alpha_complex_interface.h
@@ -29,40 +29,75 @@ namespace Gudhi {
 
 namespace alpha_complex {
 
-using Exact_kernel = CGAL::Epeck_d< CGAL::Dynamic_dimension_tag >;
-using Inexact_kernel = CGAL::Epick_d< CGAL::Dynamic_dimension_tag >;
-
-template <class Kernel>
 class Alpha_complex_interface {
-  using Point_d = typename Kernel::Point_d;
+ private:
+  using Exact_kernel = CGAL::Epeck_d< CGAL::Dynamic_dimension_tag >;
+  using Inexact_kernel = CGAL::Epick_d< CGAL::Dynamic_dimension_tag >;
+  using Point_exact_kernel = typename Exact_kernel::Point_d;
+  using Point_inexact_kernel = typename Inexact_kernel::Point_d;
+
+  template <typename CgalPointType>
+  std::vector<double> pt_cgal_to_cython(CgalPointType& ph) {
+    std::vector<double> vd;
+    for (auto coord = ph.cartesian_begin(); coord != ph.cartesian_end(); coord++)
+      vd.push_back(CGAL::to_double(*coord));
+    return vd;
+  }
+
+  template <typename CgalPointType>
+  CgalPointType pt_cython_to_cgal(std::vector<double> const& vec) {
+    return CgalPointType(vec.size(), vec.begin(), vec.end());
+  }
 
  public:
-  Alpha_complex_interface(const std::vector<std::vector<double>>& points) {
-    auto mkpt = [](std::vector<double> const& vec){
-      return Point_d(vec.size(), vec.begin(), vec.end());
-    };
-    alpha_complex_ = std::make_unique<Alpha_complex<Kernel>>(boost::adaptors::transform(points, mkpt));
+  Alpha_complex_interface(const std::vector<std::vector<double>>& points, bool fast_version)
+  : fast_version_(fast_version) {
+    auto pt = pt_cython_to_cgal<Point_inexact_kernel>(points[0]);
+    if (fast_version_) {
+      auto mkpt = [](std::vector<double> const& vec) {
+        return Point_inexact_kernel(vec.size(), vec.begin(), vec.end());
+      };
+      ac_inexact_ptr_ = std::make_unique<Alpha_complex<Inexact_kernel>>(boost::adaptors::transform(points, mkpt));
+      //ac_inexact_ptr_ = std::make_unique<Alpha_complex<Inexact_kernel>>(boost::adaptors::transform(points, pt_cython_to_cgal<Point_inexact_kernel>));
+    } else {
+      auto mkpt = [](std::vector<double> const& vec) {
+        return Point_exact_kernel(vec.size(), vec.begin(), vec.end());
+      };
+      ac_exact_ptr_ = std::make_unique<Alpha_complex<Exact_kernel>>(boost::adaptors::transform(points, mkpt));
+      //ac_exact_ptr_ = std::make_unique<Alpha_complex<Exact_kernel>>(boost::adaptors::transform(points, pt_cython_to_cgal<Point_exact_kernel>));
+    }
   }
 
-  Alpha_complex_interface(const std::string& off_file_name, bool from_file = true) {
-    alpha_complex_ = std::make_unique<Alpha_complex<Kernel>>(off_file_name);
+  Alpha_complex_interface(const std::string& off_file_name, bool fast_version, bool from_file = true)
+  : fast_version_(fast_version) {
+    if (fast_version_)
+      ac_inexact_ptr_ = std::make_unique<Alpha_complex<Inexact_kernel>>(off_file_name);
+    else
+      ac_exact_ptr_ = std::make_unique<Alpha_complex<Exact_kernel>>(off_file_name);
   }
 
   std::vector<double> get_point(int vh) {
-    std::vector<double> vd;
-    Point_d const& ph = alpha_complex_->get_point(vh);
-    for (auto coord = ph.cartesian_begin(); coord != ph.cartesian_end(); coord++)
-      vd.push_back(CGAL::to_double(*coord));
-    return vd;
+    if (fast_version_) {
+      Point_inexact_kernel const& ph = ac_inexact_ptr_->get_point(vh);
+      return pt_cgal_to_cython(ph);
+    } else {
+      Point_exact_kernel const& ph = ac_exact_ptr_->get_point(vh);
+      return pt_cgal_to_cython(ph);
+    }
   }
 
   void create_simplex_tree(Simplex_tree_interface<>* simplex_tree, double max_alpha_square,
                            bool exact_version, bool default_filtration_value) {
-    alpha_complex_->create_complex(*simplex_tree, max_alpha_square, exact_version, default_filtration_value);
+    if (fast_version_)
+      ac_inexact_ptr_->create_complex(*simplex_tree, max_alpha_square, exact_version, default_filtration_value);
+    else
+      ac_exact_ptr_->create_complex(*simplex_tree, max_alpha_square, exact_version, default_filtration_value);
   }
 
  private:
-  std::unique_ptr<Alpha_complex<Kernel>> alpha_complex_;
+  bool fast_version_;
+  std::unique_ptr<Alpha_complex<Exact_kernel>> ac_exact_ptr_;
+  std::unique_ptr<Alpha_complex<Inexact_kernel>> ac_inexact_ptr_;
 };
 
 }  // namespace alpha_complex