From 8881190bccba9da4af0a07c701369099fd7f2277 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Thu, 12 Nov 2015 16:26:05 +0000
Subject: code review fix prune_above_filtration and remove_maximal_simplex in
 Simplex_tree.h make_filtration_non_decreasing and
 rec_make_filtration_non_decreasing in Simplex_tree.h

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

Former-commit-id: a20c9da65a5a3294e42ad2dd45a399d77fb5ad30
---
 src/Alpha_complex/include/gudhi/Alpha_complex.h | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 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 562b80c3..10b290b5 100644
--- a/src/Alpha_complex/include/gudhi/Alpha_complex.h
+++ b/src/Alpha_complex/include/gudhi/Alpha_complex.h
@@ -105,6 +105,7 @@ class Alpha_complex : public Simplex_tree<> {
    * the Alpha_complex.
    *
    * @param[in] off_file_name OFF file [path and] name.
+   * @param[in] max_alpha_square maximum for alpha square value. Default value is +\f$\infty\f$.
    */
   Alpha_complex(const std::string& off_file_name,
                 Filtration_value max_alpha_square = std::numeric_limits<Filtration_value>::infinity())
@@ -115,25 +116,24 @@ class Alpha_complex : public Simplex_tree<> {
       exit(-1);  // ----- >>
     }
     triangulation_ = off_reader.get_complex();
-    set_filtration(max_alpha_square);
-    init();
+    init(max_alpha_square);
   }
 
   /** \brief Alpha_complex constructor from a Delaunay triangulation.
    *
    * @param[in] triangulation_ptr Pointer on a Delaunay triangulation.
+   * @param[in] max_alpha_square maximum for alpha square value. Default value is +\f$\infty\f$.
    */
   Alpha_complex(Delaunay_triangulation* triangulation_ptr,
                 Filtration_value max_alpha_square = std::numeric_limits<Filtration_value>::infinity())
       : triangulation_(triangulation_ptr) {
-   set_filtration(max_alpha_square);
-   init();
+   init(max_alpha_square);
   }
 
   /** \brief Alpha_complex constructor from a list of points.
    *
-   * @param[in] dimension Dimension of points to be inserted.
    * @param[in] points Range of points to triangulate. Points must be in Kernel::Point_d
+   * @param[in] max_alpha_square maximum for alpha square value. Default value is +\f$\infty\f$.
    * 
    * The type InputPointRange must be a range for which std::begin and
    * std::end return input iterators on a Kernel::Point_d.
@@ -155,8 +155,7 @@ class Alpha_complex : public Simplex_tree<> {
       std::cerr << "Alpha_complex - insertion failed " << inserted << " != " << (last -first) << std::endl;
       exit(-1);  // ----- >>
     }
-    set_filtration(max_alpha_square);
-    init();
+    init(max_alpha_square);
   }
 
   /** \brief Alpha_complex destructor from a Delaunay triangulation.
@@ -180,12 +179,14 @@ class Alpha_complex : public Simplex_tree<> {
  private:
   /** \brief Initialize the Alpha_complex from the Delaunay triangulation.
    *
+   * @param[in] max_alpha_square maximum for alpha square value.
+   * 
    * @warning Delaunay triangulation must be already constructed with at least one vertex and dimension must be more 
    * than 0.
    * 
    * Initialization can be launched once.
    */
-  void init() {
+  void init(Filtration_value max_alpha_square) {
     if (triangulation_ == nullptr) {
       std::cerr << "Alpha_complex init - Cannot init from a NULL triangulation" << std::endl;
       return;  // ----- >>
@@ -287,6 +288,13 @@ class Alpha_complex : public Simplex_tree<> {
       }
     }
     // --------------------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------------------
+    // As Alpha value is an approximation, we have to make filtration non decreasing while increasing the dimension
+    make_filtration_non_decreasing();
+    // Remove all simplices that have a filtration value greater than max_alpha_square
+    prune_above_filtration(max_alpha_square);
+    // --------------------------------------------------------------------------------------------
   }
 
   template<typename Simplex_handle>
-- 
cgit v1.2.3