Merge last trunk modifications

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

Former-commit-id: 9b430e79ecc94bee975d748eb3e2106c7dbab3ce

1 files changed, 6 insertions, 6 deletions

diff --git a/src/Persistent_cohomology/example/weighted_alpha_complex_3d_persistence.cpp b/src/Persistent_cohomology/example/weighted_alpha_complex_3d_persistence.cpp
index 5203548a..34b90933 100644
--- a/src/Persistent_cohomology/example/weighted_alpha_complex_3d_persistence.cpp
+++ b/src/Persistent_cohomology/example/weighted_alpha_complex_3d_persistence.cpp
@@ -20,10 +20,11 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <boost/variant.hpp>
+
 #include <gudhi/Simplex_tree.h>
 #include <gudhi/Persistent_cohomology.h>
 #include <gudhi/Points_3D_off_io.h>
-#include <boost/variant.hpp>
 
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Regular_triangulation_euclidean_traits_3.h>
@@ -31,8 +32,6 @@
 #include <CGAL/Alpha_shape_3.h>
 #include <CGAL/iterator.h>
 
-#include "alpha_complex_3d_helper.h"
-
 #include <fstream>
 #include <cmath>
 #include <string>
@@ -43,13 +42,15 @@
 #include <vector>
 #include <cstdlib>
 
+#include "alpha_complex_3d_helper.h"
+
 // Traits
 using Kernel = CGAL::Exact_predicates_inexact_constructions_kernel;
 using Gt = CGAL::Regular_triangulation_euclidean_traits_3<Kernel>;
 using Vb = CGAL::Alpha_shape_vertex_base_3<Gt>;
 using Fb = CGAL::Alpha_shape_cell_base_3<Gt>;
 using Tds = CGAL::Triangulation_data_structure_3<Vb, Fb>;
-using Triangulation_3 = CGAL::Regular_triangulation_3<Gt,Tds>;
+using Triangulation_3 = CGAL::Regular_triangulation_3<Gt, Tds>;
 using Alpha_shape_3 = CGAL::Alpha_shape_3<Triangulation_3>;
 
 // From file type definition
@@ -115,8 +116,7 @@ int main(int argc, char * const argv[]) {
     double weight = 0.0;
     std::size_t index = 0;
     // Attempt read the weight in a double format, return false if it fails
-    while((weights_ifstr >> weight) && (index < lp.size()))
-    {
+    while ((weights_ifstr >> weight) && (index < lp.size())) {
       wp.push_back(Weighted_point_3(lp[index], weight));
       index++;
     }