From 7e21b356485e8f5baf10df62d882c1af85afc210 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Mon, 19 Nov 2018 22:03:05 +0000
Subject: Merge last trunk modifications and remove the note about
 create_complex max_alpha_square

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

Former-commit-id: 64548e4d0674fb5dd07645eee5c63785b099a168
---
 src/Alpha_complex/include/gudhi/Alpha_complex.h    | 3 ---
 src/Alpha_complex/include/gudhi/Alpha_complex_3d.h | 6 ++----
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'src/Alpha_complex/include/gudhi')

diff --git a/src/Alpha_complex/include/gudhi/Alpha_complex.h b/src/Alpha_complex/include/gudhi/Alpha_complex.h
index 53216e2f..08db14fb 100644
--- a/src/Alpha_complex/include/gudhi/Alpha_complex.h
+++ b/src/Alpha_complex/include/gudhi/Alpha_complex.h
@@ -240,9 +240,6 @@ class Alpha_complex {
    * 
    * @return true if creation succeeds, false otherwise.
    * 
-   * @note Setting the max_alpha_square with a smaller value will not accelerate the complex creation. On the contrary
-   * it will launch SimplicialComplexForAlpha::prune_above_filtration after the complete creation.
-   *
    * @pre Delaunay triangulation must be already constructed with dimension strictly greater than 0.
    * @pre The simplicial complex must be empty (no vertices)
    * 
diff --git a/src/Alpha_complex/include/gudhi/Alpha_complex_3d.h b/src/Alpha_complex/include/gudhi/Alpha_complex_3d.h
index 9c9bc929..f40a08f9 100644
--- a/src/Alpha_complex/include/gudhi/Alpha_complex_3d.h
+++ b/src/Alpha_complex/include/gudhi/Alpha_complex_3d.h
@@ -433,13 +433,11 @@ class Alpha_complex_3d {
    * \tparam SimplicialComplexForAlpha3d must meet `SimplicialComplexForAlpha3d` concept.
    *
    * @param[in] complex SimplicialComplexForAlpha3d to be created.
-   * @param[in] max_alpha_square maximum for alpha square value. Default value is +\f$\infty\f$.
+   * @param[in] max_alpha_square maximum for alpha square value. Default value is +\f$\infty\f$, and there is very
+   * little point using anything else since it does not save time.
    *
    * @return true if creation succeeds, false otherwise.
    *
-   * @note Setting the max_alpha_square with a smaller value will not accelerate the complex creation. On the contrary
-   * it will launch SimplicialComplexForAlpha3d::prune_above_filtration after the complete creation.
-   *
    * @pre The simplicial complex must be empty (no vertices).
    *
    */
-- 
cgit v1.2.3