cpplint fixes on Contraction + warning fixes + Hide Hasse complex for Gudhi version 1.2.0

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

Former-commit-id: ed7bf90a9ae0b000b995c6ae4bbdaedbb1a65dd5

10 files changed, 419 insertions, 421 deletions

diff --git a/src/Contraction/include/gudhi/Contraction/CGAL_queue/Modifiable_priority_queue.h b/src/Contraction/include/gudhi/Contraction/CGAL_queue/Modifiable_priority_queue.h
index f4eb59fd..28ae535d 100644
--- a/src/Contraction/include/gudhi/Contraction/CGAL_queue/Modifiable_priority_queue.h
+++ b/src/Contraction/include/gudhi/Contraction/CGAL_queue/Modifiable_priority_queue.h
@@ -21,10 +21,12 @@
 
 #define CGAL_SURFACE_MESH_SIMPLIFICATION_USE_RELAXED_HEAP
 
-#include <climits> // Neeeded by the following Boost header for CHAR_BIT.
 #include <boost/optional.hpp>
 #include <boost/pending/relaxed_heap.hpp>
 
+#include <climits>  // Neeeded by the following Boost header for CHAR_BIT.
+#include <functional>  // for less
+
 namespace CGAL {
 
 template <class IndexedType_, class Compare_ = std::less<IndexedType_>, class ID_ = boost::identity_property_map>
@@ -94,6 +96,6 @@ class Modifiable_priority_queue {
   Heap mHeap;
 };
 
-}  //namespace CGAL
+}  // namespace CGAL
 
 #endif  // CONTRACTION_CGAL_MODIFIABLE_PRIORITY_QUEUE_H
diff --git a/src/Contraction/include/gudhi/Contraction/policies/Contraction_visitor.h b/src/Contraction/include/gudhi/Contraction/policies/Contraction_visitor.h
index b8b1e87a..7ee05aad 100644
--- a/src/Contraction/include/gudhi/Contraction/policies/Contraction_visitor.h
+++ b/src/Contraction/include/gudhi/Contraction/policies/Contraction_visitor.h
@@ -1,32 +1,32 @@
- /*    This file is part of the Gudhi Library. The Gudhi library 
-  *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
-  *    library for computational topology.
-  *
-  *    Author(s):       David Salinas
-  *
-  *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
-  *
-  *    This program is free software: you can redistribute it and/or modify
-  *    it under the terms of the GNU General Public License as published by
-  *    the Free Software Foundation, either version 3 of the License, or
-  *    (at your option) any later version.
-  *
-  *    This program is distributed in the hope that it will be useful,
-  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *    GNU General Public License for more details.
-  *
-  *    You should have received a copy of the GNU General Public License
-  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#ifndef GUDHI_CONTRACTION_VISITOR_H_
-#define GUDHI_CONTRACTION_VISITOR_H_
-
-#include "gudhi/Contraction/Edge_profile.h"
-#include "boost/optional.hpp"
-
-namespace Gudhi{
+/*    This file is part of the Gudhi Library. The Gudhi library 
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
+ *    library for computational topology.
+ *
+ *    Author(s):       David Salinas
+ *
+ *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CONTRACTION_POLICIES_CONTRACTION_VISITOR_H_
+#define CONTRACTION_POLICIES_CONTRACTION_VISITOR_H_
+
+#include <gudhi/Contraction/Edge_profile.h>
+#include <boost/optional.hpp>
+
+namespace Gudhi {
 
 namespace contraction {
 
@@ -36,66 +36,56 @@ namespace contraction {
  *@ingroup contr
  */
 template <typename EdgeProfile>
-class Contraction_visitor {//: public Dummy_complex_visitor<typename EdgeProfile::Vertex_handle>  {
-public:
-	//typedef typename ComplexType::GeometryTrait GT;
-	typedef EdgeProfile Profile;
-	typedef double FT;
-	typedef typename Profile::Complex Complex;
-	typedef Complex ComplexType;
-	typedef typename ComplexType::Point Point;
-
-
-	virtual ~Contraction_visitor(){};
-
-	/**
-	 * @brief Called before the edge contraction process starts.
-	 */
-	virtual void on_started (ComplexType & complex){}
-
-	/**
-	 * @brief Called when the algorithm stops.
-	 */
-	virtual void on_stop_condition_reached (){}
-
-
-	/**
-	 * @brief Called during the collecting phase (when a cost is assigned to the edges), for each edge collected.
-	 */
-	virtual void on_collected (const Profile &profile, boost::optional< FT > cost){}
-
-	/**
-	 * @brief Called during the processing phase (when edges are contracted), for each edge that is selected.
-	 */
-	virtual void on_selected (const Profile &profile, boost::optional< FT > cost, int initial_count, int current_count){}
-
-
-	/**
-	 * @brief Called when an edge is about to be contracted and replaced by a vertex whose position is *placement.
-	 */
-	virtual void on_contracting(const Profile &profile, boost::optional< Point > placement){
-	}
-
-
-
-	/**
-	 * @brief Called when after an edge has been contracted onto a new point placement.
-	 * A possibility would to remove popable blockers at this point for instance.
-	 */
-	virtual void on_contracted(const Profile  &profile, boost::optional< Point > placement){
-
-	}
-
-
-	/**
-	 * @brief Called for each selected edge which cannot be contracted because the ValidContractionPredicate is false
-	 */
-	virtual void on_non_valid(const Profile  &profile){}
-
+class Contraction_visitor {  // : public Dummy_complex_visitor<typename EdgeProfile::Vertex_handle>  {
+ public:
+  // typedef typename ComplexType::GeometryTrait GT;
+  typedef EdgeProfile Profile;
+  typedef double FT;
+  typedef typename Profile::Complex Complex;
+  typedef Complex ComplexType;
+  typedef typename ComplexType::Point Point;
+
+  virtual ~Contraction_visitor() { }
+
+  /**
+   * @brief Called before the edge contraction process starts.
+   */
+  virtual void on_started(ComplexType & complex) { }
+
+  /**
+   * @brief Called when the algorithm stops.
+   */
+  virtual void on_stop_condition_reached() { }
+
+  /**
+   * @brief Called during the collecting phase (when a cost is assigned to the edges), for each edge collected.
+   */
+  virtual void on_collected(const Profile &profile, boost::optional< FT > cost) { }
+
+  /**
+   * @brief Called during the processing phase (when edges are contracted), for each edge that is selected.
+   */
+  virtual void on_selected(const Profile &profile, boost::optional< FT > cost, int initial_count, int current_count) { }
+
+  /**
+   * @brief Called when an edge is about to be contracted and replaced by a vertex whose position is *placement.
+   */
+  virtual void on_contracting(const Profile &profile, boost::optional< Point > placement) { }
+
+  /**
+   * @brief Called when after an edge has been contracted onto a new point placement.
+   * A possibility would to remove popable blockers at this point for instance.
+   */
+  virtual void on_contracted(const Profile &profile, boost::optional< Point > placement) { }
+
+  /**
+   * @brief Called for each selected edge which cannot be contracted because the ValidContractionPredicate is false
+   */
+  virtual void on_non_valid(const Profile &profile) { }
 };
 
 }  // namespace contraction
 
-}  // namespace GUDHI
+}  // namespace Gudhi
 
-#endif /* GUDHI_CONTRACTION_VISITOR_H_ */
+#endif  // CONTRACTION_POLICIES_CONTRACTION_VISITOR_H_
diff --git a/src/Contraction/include/gudhi/Contraction/policies/Cost_policy.h b/src/Contraction/include/gudhi/Contraction/policies/Cost_policy.h
index 3cb18c86..f4d343ec 100644
--- a/src/Contraction/include/gudhi/Contraction/policies/Cost_policy.h
+++ b/src/Contraction/include/gudhi/Contraction/policies/Cost_policy.h
@@ -1,51 +1,53 @@
- /*    This file is part of the Gudhi Library. The Gudhi library 
-  *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
-  *    library for computational topology.
-  *
-  *    Author(s):       David Salinas
-  *
-  *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
-  *
-  *    This program is free software: you can redistribute it and/or modify
-  *    it under the terms of the GNU General Public License as published by
-  *    the Free Software Foundation, either version 3 of the License, or
-  *    (at your option) any later version.
-  *
-  *    This program is distributed in the hope that it will be useful,
-  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *    GNU General Public License for more details.
-  *
-  *    You should have received a copy of the GNU General Public License
-  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#ifndef GUDHI_COST_POLICY_H_
-#define GUDHI_COST_POLICY_H_
+/*    This file is part of the Gudhi Library. The Gudhi library 
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
+ *    library for computational topology.
+ *
+ *    Author(s):       David Salinas
+ *
+ *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CONTRACTION_POLICIES_COST_POLICY_H_
+#define CONTRACTION_POLICIES_COST_POLICY_H_
 
 #include <boost/optional.hpp>
 
-namespace Gudhi{
+namespace Gudhi {
 
 namespace contraction {
 
 /**
-*@brief Policy to specify the cost of contracting an edge.
+ *@brief Policy to specify the cost of contracting an edge.
  *@ingroup contr
-*/ 
-template< typename EdgeProfile> class Cost_policy{
-public:
-	typedef typename EdgeProfile::Point Point;
-	typedef typename EdgeProfile::Graph_vertex Graph_vertex;
+ */
+template< typename EdgeProfile>
+class Cost_policy {
+ public:
+  typedef typename EdgeProfile::Point Point;
+  typedef typename EdgeProfile::Graph_vertex Graph_vertex;
 
-	typedef boost::optional<double> Cost_type;
+  typedef boost::optional<double> Cost_type;
 
-	virtual Cost_type operator()(const EdgeProfile& profile, const boost::optional<Point>& placement) const =0;
-	virtual ~Cost_policy(){
-	};
+  virtual Cost_type operator()(const EdgeProfile& profile, const boost::optional<Point>& placement) const = 0;
+
+  virtual ~Cost_policy() { }
 };
 
 }  // namespace contraction
 
-}  // namespace GUDHI
-#endif /* GUDHI_COST_POLICY_H_ */
+}  // namespace Gudhi
+
+#endif  // CONTRACTION_POLICIES_COST_POLICY_H_
diff --git a/src/Contraction/include/gudhi/Contraction/policies/Dummy_valid_contraction.h b/src/Contraction/include/gudhi/Contraction/policies/Dummy_valid_contraction.h
index de473944..5d329496 100644
--- a/src/Contraction/include/gudhi/Contraction/policies/Dummy_valid_contraction.h
+++ b/src/Contraction/include/gudhi/Contraction/policies/Dummy_valid_contraction.h
@@ -1,51 +1,49 @@
- /*    This file is part of the Gudhi Library. The Gudhi library 
-  *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
-  *    library for computational topology.
-  *
-  *    Author(s):       David Salinas
-  *
-  *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
-  *
-  *    This program is free software: you can redistribute it and/or modify
-  *    it under the terms of the GNU General Public License as published by
-  *    the Free Software Foundation, either version 3 of the License, or
-  *    (at your option) any later version.
-  *
-  *    This program is distributed in the hope that it will be useful,
-  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *    GNU General Public License for more details.
-  *
-  *    You should have received a copy of the GNU General Public License
-  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#ifndef GUDHI_DUMMY_VALID_CONTRACTION_H_
-#define GUDHI_DUMMY_VALID_CONTRACTION_H_
-
-#include "Valid_contraction_policy.h"
-
-namespace Gudhi{
+/*    This file is part of the Gudhi Library. The Gudhi library 
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
+ *    library for computational topology.
+ *
+ *    Author(s):       David Salinas
+ *
+ *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CONTRACTION_POLICIES_DUMMY_VALID_CONTRACTION_H_
+#define CONTRACTION_POLICIES_DUMMY_VALID_CONTRACTION_H_
+
+#include <gudhi/Contraction/policies/Valid_contraction_policy.h>
+
+namespace Gudhi {
 
 namespace contraction {
 
-
-
-  /**
-  *@brief Policy that accept all edge contraction.
-  */
-template< typename EdgeProfile> class Dummy_valid_contraction : public Valid_contraction_policy<EdgeProfile>{
-public:
-	typedef typename EdgeProfile::Point Point;
-	bool operator()(const EdgeProfile& profile,const boost::optional<Point>& placement){
-		return true;
-	}
+/**
+ *@brief Policy that accept all edge contraction.
+ */
+template< typename EdgeProfile>
+class Dummy_valid_contraction : public Valid_contraction_policy<EdgeProfile> {
+ public:
+  typedef typename EdgeProfile::Point Point;
+
+  bool operator()(const EdgeProfile& profile, const boost::optional<Point>& placement) {
+    return true;
+  }
 };
 
 }  // namespace contraction
 
-}  // namespace GUDHI
-
-
+}  // namespace Gudhi
 
-#endif /* GUDHI_DUMMY_VALID_CONTRACTION_H_ */
+#endif  // CONTRACTION_POLICIES_DUMMY_VALID_CONTRACTION_H_
diff --git a/src/Contraction/include/gudhi/Contraction/policies/Edge_length_cost.h b/src/Contraction/include/gudhi/Contraction/policies/Edge_length_cost.h
index b22ada0d..e4beb220 100644
--- a/src/Contraction/include/gudhi/Contraction/policies/Edge_length_cost.h
+++ b/src/Contraction/include/gudhi/Contraction/policies/Edge_length_cost.h
@@ -1,56 +1,56 @@
- /*    This file is part of the Gudhi Library. The Gudhi library 
-  *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
-  *    library for computational topology.
-  *
-  *    Author(s):       David Salinas
-  *
-  *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
-  *
-  *    This program is free software: you can redistribute it and/or modify
-  *    it under the terms of the GNU General Public License as published by
-  *    the Free Software Foundation, either version 3 of the License, or
-  *    (at your option) any later version.
-  *
-  *    This program is distributed in the hope that it will be useful,
-  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *    GNU General Public License for more details.
-  *
-  *    You should have received a copy of the GNU General Public License
-  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#ifndef GUDHI_EDGE_LENGTH_COST_H_
-#define GUDHI_EDGE_LENGTH_COST_H_
-
-#include "Cost_policy.h"
-
-namespace Gudhi{
+/*    This file is part of the Gudhi Library. The Gudhi library 
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
+ *    library for computational topology.
+ *
+ *    Author(s):       David Salinas
+ *
+ *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-namespace contraction {
+#ifndef CONTRACTION_POLICIES_DUMMY_EDGE_LENGTH_COST_H_
+#define CONTRACTION_POLICIES_DUMMY_EDGE_LENGTH_COST_H_
+
+#include <gudhi/Contraction/policies/Cost_policy.h>
 
+namespace Gudhi {
+
+namespace contraction {
 
 /**
  * @brief return a cost corresponding to the squared length of the edge
  */
-template< typename EdgeProfile> class Edge_length_cost : public Cost_policy<EdgeProfile>{
-public:
-	typedef typename Cost_policy<EdgeProfile>::Cost_type Cost_type;
-	typedef typename EdgeProfile::Point Point;
-	Cost_type operator()(const EdgeProfile& profile, const boost::optional<Point>& placement) const override{
-		double res = 0;
-		auto p0_coord = profile.p0().begin();
-		auto p1_coord = profile.p1().begin();
-		for(; p0_coord != profile.p0().end(); p0_coord++, p1_coord++){
-			res += (*p0_coord - *p1_coord) * (*p0_coord - *p1_coord);
-		}
-		return res;
-	}
-
+template< typename EdgeProfile>
+class Edge_length_cost : public Cost_policy<EdgeProfile> {
+ public:
+  typedef typename Cost_policy<EdgeProfile>::Cost_type Cost_type;
+  typedef typename EdgeProfile::Point Point;
+
+  Cost_type operator()(const EdgeProfile& profile, const boost::optional<Point>& placement) const override {
+    double res = 0;
+    auto p0_coord = profile.p0().begin();
+    auto p1_coord = profile.p1().begin();
+    for (; p0_coord != profile.p0().end(); p0_coord++, p1_coord++) {
+      res += (*p0_coord - *p1_coord) * (*p0_coord - *p1_coord);
+    }
+    return res;
+  }
 };
 
 }  // namespace contraction
 
-}  // namespace GUDHI
+}  // namespace Gudhi
 
-#endif /* GUDHI_EDGE_LENGTH_COST_H_ */
+#endif  // CONTRACTION_POLICIES_DUMMY_EDGE_LENGTH_COST_H_
diff --git a/src/Contraction/include/gudhi/Contraction/policies/First_vertex_placement.h b/src/Contraction/include/gudhi/Contraction/policies/First_vertex_placement.h
index 93abac35..1f68db0d 100644
--- a/src/Contraction/include/gudhi/Contraction/policies/First_vertex_placement.h
+++ b/src/Contraction/include/gudhi/Contraction/policies/First_vertex_placement.h
@@ -1,53 +1,52 @@
- /*    This file is part of the Gudhi Library. The Gudhi library 
-  *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
-  *    library for computational topology.
-  *
-  *    Author(s):       David Salinas
-  *
-  *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
-  *
-  *    This program is free software: you can redistribute it and/or modify
-  *    it under the terms of the GNU General Public License as published by
-  *    the Free Software Foundation, either version 3 of the License, or
-  *    (at your option) any later version.
-  *
-  *    This program is distributed in the hope that it will be useful,
-  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *    GNU General Public License for more details.
-  *
-  *    You should have received a copy of the GNU General Public License
-  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#ifndef GUDHI_FIRST_VERTEX_PLACEMENT_H_
-#define GUDHI_FIRST_VERTEX_PLACEMENT_H_
-
-#include "Placement_policy.h"
-
-namespace Gudhi{
+/*    This file is part of the Gudhi Library. The Gudhi library 
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
+ *    library for computational topology.
+ *
+ *    Author(s):       David Salinas
+ *
+ *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-namespace contraction {
+#ifndef CONTRACTION_POLICIES_FIRST_VERTEX_PLACEMENT_H_
+#define CONTRACTION_POLICIES_FIRST_VERTEX_PLACEMENT_H_
+
+#include <gudhi/Contraction/policies/Placement_policy.h>
+
+namespace Gudhi {
 
+namespace contraction {
 
 /**
  * @brief Places the contracted point onto the first point of the edge
  */
-template< typename EdgeProfile> class First_vertex_placement : public Placement_policy<EdgeProfile>{
-
-public:
-	typedef typename EdgeProfile::Point Point;
-	typedef typename EdgeProfile::Edge_handle Edge_handle;
+template< typename EdgeProfile>
+class First_vertex_placement : public Placement_policy<EdgeProfile> {
+ public:
+  typedef typename EdgeProfile::Point Point;
+  typedef typename EdgeProfile::Edge_handle Edge_handle;
 
-	typedef typename Placement_policy<EdgeProfile>::Placement_type Placement_type;
+  typedef typename Placement_policy<EdgeProfile>::Placement_type Placement_type;
 
-	Placement_type operator()(const EdgeProfile& profile) const override{
-		return Placement_type(profile.p0());
-	}
+  Placement_type operator()(const EdgeProfile& profile) const override {
+    return Placement_type(profile.p0());
+  }
 };
-}  // namespace contraction
 
-}  // namespace GUDHI
+}  // namespace contraction
 
+}  // namespace Gudhi
 
-#endif /* GUDHI_FIRST_VERTEX_PLACEMENT_H_ */
+#endif  // CONTRACTION_POLICIES_FIRST_VERTEX_PLACEMENT_H_
diff --git a/src/Contraction/include/gudhi/Contraction/policies/Link_condition_valid_contraction.h b/src/Contraction/include/gudhi/Contraction/policies/Link_condition_valid_contraction.h
index c901e629..919df243 100644
--- a/src/Contraction/include/gudhi/Contraction/policies/Link_condition_valid_contraction.h
+++ b/src/Contraction/include/gudhi/Contraction/policies/Link_condition_valid_contraction.h
@@ -1,54 +1,56 @@
- /*    This file is part of the Gudhi Library. The Gudhi library 
-  *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
-  *    library for computational topology.
-  *
-  *    Author(s):       David Salinas
-  *
-  *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
-  *
-  *    This program is free software: you can redistribute it and/or modify
-  *    it under the terms of the GNU General Public License as published by
-  *    the Free Software Foundation, either version 3 of the License, or
-  *    (at your option) any later version.
-  *
-  *    This program is distributed in the hope that it will be useful,
-  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *    GNU General Public License for more details.
-  *
-  *    You should have received a copy of the GNU General Public License
-  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#ifndef GUDHI_LINK_CONDITION_VALID_CONTRACTION_H_
-#define GUDHI_LINK_CONDITION_VALID_CONTRACTION_H_
-
-#include "gudhi/Utils.h"
-#include "Valid_contraction_policy.h"
-
-
-namespace Gudhi{
+/*    This file is part of the Gudhi Library. The Gudhi library 
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
+ *    library for computational topology.
+ *
+ *    Author(s):       David Salinas
+ *
+ *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CONTRACTION_POLICIES_LINK_CONDITION_VALID_CONTRACTION_H_
+#define CONTRACTION_POLICIES_LINK_CONDITION_VALID_CONTRACTION_H_
+
+#include <gudhi/Utils.h>
+#include <gudhi/Contraction/policies/Valid_contraction_policy.h>
+
+
+namespace Gudhi {
 
 namespace contraction {
 
-
-  /**
-  *@brief Policy that only accept edges verifying the link condition (and therefore whose contraction preserving homotopy type). 
-  *@ingroup contr
-  */
-template< typename EdgeProfile> class Link_condition_valid_contraction : public Valid_contraction_policy<EdgeProfile>{
-public:
-	typedef typename EdgeProfile::Edge_handle Edge_handle;
-	typedef typename EdgeProfile::Point Point;
-	//typedef typename EdgeProfile::Edge_handle Edge_handle;
-	bool operator()(const EdgeProfile& profile,const boost::optional<Point>& placement) const override{
-		Edge_handle edge(profile.edge_handle());
-		DBGMSG("Link_condition_valid_contraction:",profile.complex().link_condition(edge));
-		return profile.complex().link_condition(edge);
-	}
+/**
+ *@brief Policy that only accept edges verifying the link condition (and therefore whose contraction preserving homotopy type). 
+ *@ingroup contr
+ */
+template< typename EdgeProfile>
+class Link_condition_valid_contraction : public Valid_contraction_policy<EdgeProfile> {
+ public:
+  typedef typename EdgeProfile::Edge_handle Edge_handle;
+  typedef typename EdgeProfile::Point Point;
+  // typedef typename EdgeProfile::Edge_handle Edge_handle;
+
+  bool operator()(const EdgeProfile& profile, const boost::optional<Point>& placement) const override {
+    Edge_handle edge(profile.edge_handle());
+    DBGMSG("Link_condition_valid_contraction:", profile.complex().link_condition(edge));
+    return profile.complex().link_condition(edge);
+  }
 };
+
 }  // namespace contraction
 
-}  // namespace GUDHI
+}  // namespace Gudhi
 
-#endif /* GUDHI_LINK_CONDITION_VALID_CONTRACTION_H_ */
+#endif  // CONTRACTION_POLICIES_LINK_CONDITION_VALID_CONTRACTION_H_
diff --git a/src/Contraction/include/gudhi/Contraction/policies/Middle_placement.h b/src/Contraction/include/gudhi/Contraction/policies/Middle_placement.h
index 30f0a570..4b59f1b5 100644
--- a/src/Contraction/include/gudhi/Contraction/policies/Middle_placement.h
+++ b/src/Contraction/include/gudhi/Contraction/policies/Middle_placement.h
@@ -1,52 +1,51 @@
- /*    This file is part of the Gudhi Library. The Gudhi library 
-  *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
-  *    library for computational topology.
-  *
-  *    Author(s):       David Salinas
-  *
-  *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
-  *
-  *    This program is free software: you can redistribute it and/or modify
-  *    it under the terms of the GNU General Public License as published by
-  *    the Free Software Foundation, either version 3 of the License, or
-  *    (at your option) any later version.
-  *
-  *    This program is distributed in the hope that it will be useful,
-  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *    GNU General Public License for more details.
-  *
-  *    You should have received a copy of the GNU General Public License
-  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#ifndef GUDHI_MIDDLE_PLACEMENT_H_
-#define GUDHI_MIDDLE_PLACEMENT_H_
-
-#include "Placement_policy.h"
-
-
-namespace Gudhi{
+/*    This file is part of the Gudhi Library. The Gudhi library 
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
+ *    library for computational topology.
+ *
+ *    Author(s):       David Salinas
+ *
+ *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CONTRACTION_POLICIES_MIDDLE_PLACEMENT_H_
+#define CONTRACTION_POLICIES_MIDDLE_PLACEMENT_H_
+
+#include <gudhi/Contraction/policies/Placement_policy.h>
+
+namespace Gudhi {
 
 namespace contraction {
 
+template< typename EdgeProfile>
+class Middle_placement : public Placement_policy<EdgeProfile> {
+ public:
+  typedef typename EdgeProfile::Point Point;
+  typedef typename EdgeProfile::Edge_handle Edge_handle;
+  typedef typename EdgeProfile::Graph_vertex Graph_vertex;
 
-  
-template< typename EdgeProfile> class Middle_placement : public Placement_policy<EdgeProfile>{
+  typedef typename Placement_policy<EdgeProfile>::Placement_type Placement_type;
 
-public:
-	typedef typename EdgeProfile::Point Point;
-	typedef typename EdgeProfile::Edge_handle Edge_handle;
-	typedef typename EdgeProfile::Graph_vertex Graph_vertex;
-
-	typedef typename Placement_policy<EdgeProfile>::Placement_type Placement_type;
-
-	Placement_type operator()(const EdgeProfile& profile) const override{
-		//todo compute the middle
-		return Placement_type(profile.p0());
-	}
+  Placement_type operator()(const EdgeProfile& profile) const override {
+    // todo compute the middle
+    return Placement_type(profile.p0());
+  }
 };
+
 }  // namespace contraction
-}  // namespace GUDHI
 
-#endif /* GUDHI_MIDDLE_PLACEMENT_H_ */
+}  // namespace Gudhi
+
+#endif  // CONTRACTION_POLICIES_MIDDLE_PLACEMENT_H_
diff --git a/src/Contraction/include/gudhi/Contraction/policies/Placement_policy.h b/src/Contraction/include/gudhi/Contraction/policies/Placement_policy.h
index 3a804cf0..34ffa49f 100644
--- a/src/Contraction/include/gudhi/Contraction/policies/Placement_policy.h
+++ b/src/Contraction/include/gudhi/Contraction/policies/Placement_policy.h
@@ -1,49 +1,51 @@
- /*    This file is part of the Gudhi Library. The Gudhi library 
-  *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
-  *    library for computational topology.
-  *
-  *    Author(s):       David Salinas
-  *
-  *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
-  *
-  *    This program is free software: you can redistribute it and/or modify
-  *    it under the terms of the GNU General Public License as published by
-  *    the Free Software Foundation, either version 3 of the License, or
-  *    (at your option) any later version.
-  *
-  *    This program is distributed in the hope that it will be useful,
-  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *    GNU General Public License for more details.
-  *
-  *    You should have received a copy of the GNU General Public License
-  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#ifndef GUDHI_PLACEMENT_POLICY_H_
-#define GUDHI_PLACEMENT_POLICY_H_
+/*    This file is part of the Gudhi Library. The Gudhi library 
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
+ *    library for computational topology.
+ *
+ *    Author(s):       David Salinas
+ *
+ *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CONTRACTION_POLICIES_PLACEMENT_POLICY_H_
+#define CONTRACTION_POLICIES_PLACEMENT_POLICY_H_
 
 #include <boost/optional.hpp>
 
 namespace Gudhi {
+
 namespace contraction {
 
+/**
+ *@brief Policy to specify where the merged point had to be placed after an edge contraction. 
+ *@ingroup contr
+ */
+template< typename EdgeProfile>
+class Placement_policy {
+ public:
+  typedef typename EdgeProfile::Point Point;
+  typedef boost::optional<Point> Placement_type;
 
-  /**
-  *@brief Policy to specify where the merged point had to be placed after an edge contraction. 
-  *@ingroup contr
-  */
-template< typename EdgeProfile> class Placement_policy{
-public:
-	typedef typename EdgeProfile::Point Point;
-	typedef boost::optional<Point> Placement_type;
+  virtual Placement_type operator()(const EdgeProfile& profile) const = 0;
 
-	virtual Placement_type operator()(const EdgeProfile& profile) const=0;
-	virtual ~Placement_policy(){};
+  virtual ~Placement_policy() { }
 };
 
-
 }  // namespace contraction
-}  // namespace GUDHI
 
-#endif /* GUDHI_PLACEMENT_POLICY_H_ */
+}  // namespace Gudhi
+
+#endif  // CONTRACTION_POLICIES_PLACEMENT_POLICY_H_
diff --git a/src/Contraction/include/gudhi/Contraction/policies/Valid_contraction_policy.h b/src/Contraction/include/gudhi/Contraction/policies/Valid_contraction_policy.h
index bee2ecd7..78d61173 100644
--- a/src/Contraction/include/gudhi/Contraction/policies/Valid_contraction_policy.h
+++ b/src/Contraction/include/gudhi/Contraction/policies/Valid_contraction_policy.h
@@ -1,47 +1,51 @@
- /*    This file is part of the Gudhi Library. The Gudhi library 
-  *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
-  *    library for computational topology.
-  *
-  *    Author(s):       David Salinas
-  *
-  *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
-  *
-  *    This program is free software: you can redistribute it and/or modify
-  *    it under the terms of the GNU General Public License as published by
-  *    the Free Software Foundation, either version 3 of the License, or
-  *    (at your option) any later version.
-  *
-  *    This program is distributed in the hope that it will be useful,
-  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *    GNU General Public License for more details.
-  *
-  *    You should have received a copy of the GNU General Public License
-  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#ifndef GUDHI_VALID_CONTRACTION_POLICY_H_
-#define GUDHI_VALID_CONTRACTION_POLICY_H_
+/*    This file is part of the Gudhi Library. The Gudhi library 
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
+ *    library for computational topology.
+ *
+ *    Author(s):       David Salinas
+ *
+ *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CONTRACTION_POLICIES_VALID_CONTRACTION_POLICY_H_
+#define CONTRACTION_POLICIES_VALID_CONTRACTION_POLICY_H_
 
 namespace Gudhi {
+
 namespace contraction {
 
-  /**
-  *@brief Policy to specify if an edge contraction is valid or not. 
-  *@ingroup contr
-  */
-template< typename EdgeProfile> class Valid_contraction_policy{
-public:
-	typedef typename EdgeProfile::Point Point;
-	typedef typename EdgeProfile::Edge_handle Edge_handle;
-	typedef typename EdgeProfile::Graph_vertex Graph_vertex;
-
-	virtual bool operator()(const EdgeProfile& profile,const boost::optional<Point>& placement) const =0;
-	virtual ~Valid_contraction_policy(){};
+/**
+ *@brief Policy to specify if an edge contraction is valid or not. 
+ *@ingroup contr
+ */
+template< typename EdgeProfile>
+class Valid_contraction_policy {
+ public:
+  typedef typename EdgeProfile::Point Point;
+  typedef typename EdgeProfile::Edge_handle Edge_handle;
+  typedef typename EdgeProfile::Graph_vertex Graph_vertex;
+
+  virtual bool operator()(const EdgeProfile& profile, const boost::optional<Point>& placement) const = 0;
+
+  virtual ~Valid_contraction_policy() { }
 };
 
 }  // namespace contraction
-}  // namespace GUDHI
+
+}  // namespace Gudhi
 
 
-#endif /* GUDHI_VALID_CONTRACTION_POLICY_H_ */
+#endif  // CONTRACTION_POLICIES_VALID_CONTRACTION_POLICY_H_