From 85059e058ea651d5d9e849c8462cbe5f01e4743b Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Wed, 24 Jun 2015 15:27:19 +0000
Subject: Alpha complex construction from a list of CGAL points

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@641 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 521269f793f9c16c2305db8c97678bea2bf95092
---
 src/Alpha_complex/include/gudhi/Alpha_complex.h | 32 ++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 6 deletions(-)

(limited to 'src/Alpha_complex/include')

diff --git a/src/Alpha_complex/include/gudhi/Alpha_complex.h b/src/Alpha_complex/include/gudhi/Alpha_complex.h
index 97c30abb..138270ff 100644
--- a/src/Alpha_complex/include/gudhi/Alpha_complex.h
+++ b/src/Alpha_complex/include/gudhi/Alpha_complex.h
@@ -44,6 +44,7 @@
 #include <vector>
 #include <string>
 #include <limits> // NaN
+#include <iterator>     // std::iterator
 
 namespace Gudhi {
 
@@ -62,11 +63,6 @@ namespace alphacomplex {
  * Please refer to \ref alpha_complex for examples.
  *
  */
-template<typename IndexingTag = linear_indexing_tag,
-typename FiltrationValue = double,
-typename SimplexKey = int,  // must be a signed integer type
-typename VertexHandle = int  // must be a signed integer type, int convertible to it
->
 class Alpha_complex : public Simplex_tree<> {
  private:
   // From Simplex_tree
@@ -94,6 +90,9 @@ class Alpha_complex : public Simplex_tree<> {
 
   // Boost bimap type to switch from CGAL vertex iterator to simplex tree vertex handle and vice versa.
   typedef boost::bimap< CGAL_vertex_iterator, Vertex_handle > Bimap_vertex;
+  
+  // size_type type from CGAL.
+  typedef Delaunay_triangulation::size_type size_type;
 
  private:
   /** \brief Boost bimap to switch from CGAL vertex iterator to simplex tree vertex handle and vice versa.*/
@@ -108,7 +107,7 @@ class Alpha_complex : public Simplex_tree<> {
    *
    * @param[in] off_file_name OFF file [path and] name.
    */
-  Alpha_complex(std::string& off_file_name)
+  Alpha_complex(const std::string& off_file_name)
       : triangulation(nullptr) {
     Gudhi::Delaunay_triangulation_off_reader<Delaunay_triangulation> off_reader(off_file_name);
     if (!off_reader.is_valid()) {
@@ -128,6 +127,27 @@ class Alpha_complex : public Simplex_tree<> {
     init();
   }
 
+  /** \brief Alpha_complex constructor from a list of points.
+   * Uses the Delaunay_triangulation_off_reader to construct the Delaunay triangulation required to initialize 
+   * the Alpha_complex.
+   *
+   * @param[in] dimension Dimension of points to be inserted.
+   * @param[in] size Number of points to be inserted.
+   * @param[in] firstPoint Iterator on the first point to be inserted.
+   * @param[in] last Point Iterator on the last point to be inserted.
+   */
+  template<typename ForwardIterator >
+  Alpha_complex(int dimension, size_type size, ForwardIterator firstPoint, ForwardIterator lastPoint)
+      : triangulation(nullptr) {
+    triangulation = new Delaunay_triangulation(dimension);
+    Delaunay_triangulation::size_type inserted = triangulation->insert<ForwardIterator>(firstPoint, lastPoint);
+    if (inserted != size) {
+      std::cerr << "Alpha_complex - insertion failed " << inserted << " != " << size<< std::endl;
+      exit(-1); // ----- >>
+    }
+    init();
+  }
+
   /** \brief Alpha_complex destructor from a Delaunay triangulation.
    *
    * @warning Deletes the Delaunay triangulation.
-- 
cgit v1.2.3