cpplint fixes

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

Former-commit-id: e82750380435d5f3e2972a65c5322ce268e4b559

2 files changed, 18 insertions, 25 deletions

diff --git a/src/Contraction/example/Garland_heckbert.cpp b/src/Contraction/example/Garland_heckbert.cpp
index 9f449b0d..8b5a6a6c 100644
--- a/src/Contraction/example/Garland_heckbert.cpp
+++ b/src/Contraction/example/Garland_heckbert.cpp
@@ -35,10 +35,6 @@
 
 #include "Garland_heckbert/Error_quadric.h"
 
-using namespace Gudhi;
-using namespace skeleton_blocker;
-using namespace contraction;
-
 struct Geometry_trait {
   typedef Point_d Point;
 };
@@ -46,7 +42,8 @@ struct Geometry_trait {
 /**
  * The vertex stored in the complex contains a quadric.
  */
-struct Garland_heckbert_traits : public Skeleton_blocker_simple_geometric_traits<Geometry_trait> {
+struct Garland_heckbert_traits
+    : public Gudhi::skeleton_blocker::Skeleton_blocker_simple_geometric_traits<Geometry_trait> {
  public:
   struct Garland_heckbert_vertex : public Simple_geometric_vertex {
     Error_quadric<Geometry_trait::Point> quadric;
@@ -54,9 +51,9 @@ struct Garland_heckbert_traits : public Skeleton_blocker_simple_geometric_traits
   typedef Garland_heckbert_vertex Graph_vertex;
 };
 
-typedef Skeleton_blocker_geometric_complex< Garland_heckbert_traits > Complex;
-typedef Edge_profile<Complex> EdgeProfile;
-typedef Skeleton_blocker_contractor<Complex> Complex_contractor;
+using Complex = Gudhi::skeleton_blocker::Skeleton_blocker_geometric_complex< Garland_heckbert_traits >;
+using EdgeProfile = Gudhi::contraction::Edge_profile<Complex>;
+using Complex_contractor = Gudhi::contraction::Skeleton_blocker_contractor<Complex>;
 
 /**
  * How the new vertex is placed after an edge collapse : here it is placed at
@@ -153,7 +150,7 @@ int main(int argc, char *argv[]) {
   typedef Complex::Vertex_handle Vertex_handle;
 
   // load the points
-  Skeleton_blocker_off_reader<Complex> off_reader(argv[1], complex);
+  Gudhi::skeleton_blocker::Skeleton_blocker_off_reader<Complex> off_reader(argv[1], complex);
   if (!off_reader.is_valid()) {
     std::cerr << "Unable to read file:" << argv[1] << std::endl;
     return EXIT_FAILURE;
@@ -174,7 +171,7 @@ int main(int argc, char *argv[]) {
   Complex_contractor contractor(complex,
                                 new GH_cost(complex),
                                 new GH_placement(complex),
-                                contraction::make_link_valid_contraction<EdgeProfile>(),
+                                Gudhi::contraction::make_link_valid_contraction<EdgeProfile>(),
                                 new GH_visitor(complex));
 
   std::cout << "Contract " << num_contractions << " edges" << std::endl;
@@ -186,7 +183,7 @@ int main(int argc, char *argv[]) {
       complex.num_triangles() << " triangles." << std::endl;
 
   // write simplified complex
-  Skeleton_blocker_off_writer<Complex> off_writer(argv[2], complex);
+  Gudhi::skeleton_blocker::Skeleton_blocker_off_writer<Complex> off_writer(argv[2], complex);
 
   return EXIT_SUCCESS;
 }
diff --git a/src/Contraction/example/Rips_contraction.cpp b/src/Contraction/example/Rips_contraction.cpp
index 7f19e239..8289b1d3 100644
--- a/src/Contraction/example/Rips_contraction.cpp
+++ b/src/Contraction/example/Rips_contraction.cpp
@@ -27,19 +27,15 @@
 #include <boost/timer/timer.hpp>
 #include <iostream>
 
-using namespace Gudhi;
-using namespace skeleton_blocker;
-using namespace contraction;
-
 struct Geometry_trait {
   typedef Point_d Point;
 };
 
-typedef Geometry_trait::Point Point;
-typedef Skeleton_blocker_simple_geometric_traits<Geometry_trait> Complex_geometric_traits;
-typedef Skeleton_blocker_geometric_complex< Complex_geometric_traits > Complex;
-typedef Edge_profile<Complex> Profile;
-typedef Skeleton_blocker_contractor<Complex> Complex_contractor;
+using Complex_geometric_traits = Gudhi::skeleton_blocker::Skeleton_blocker_simple_geometric_traits<Geometry_trait>;
+using Complex = Gudhi::skeleton_blocker::Skeleton_blocker_geometric_complex< Complex_geometric_traits >;
+using Profile = Gudhi::contraction::Edge_profile<Complex>;
+using Complex_contractor = Gudhi::contraction::Skeleton_blocker_contractor<Complex>;
+
 
 template<typename ComplexType>
 void build_rips(ComplexType& complex, double offset) {
@@ -62,7 +58,7 @@ int main(int argc, char *argv[]) {
   Complex complex;
 
   // load only the points
-  Skeleton_blocker_off_reader<Complex> off_reader(argv[1], complex, true);
+  Gudhi::skeleton_blocker::Skeleton_blocker_off_reader<Complex> off_reader(argv[1], complex, true);
   if (!off_reader.is_valid()) {
     std::cerr << "Unable to read file:" << argv[1] << std::endl;
     return EXIT_FAILURE;
@@ -79,10 +75,10 @@ int main(int argc, char *argv[]) {
       complex.num_edges() << " edges" << std::endl;
 
   Complex_contractor contractor(complex,
-                                new Edge_length_cost<Profile>,
-                                contraction::make_first_vertex_placement<Profile>(),
-                                contraction::make_link_valid_contraction<Profile>(),
-                                contraction::make_remove_popable_blockers_visitor<Profile>());
+                                new Gudhi::contraction::Edge_length_cost<Profile>,
+                                Gudhi::contraction::make_first_vertex_placement<Profile>(),
+                                Gudhi::contraction::make_link_valid_contraction<Profile>(),
+                                Gudhi::contraction::make_remove_popable_blockers_visitor<Profile>());
   contractor.contract_edges();
 
   std::cout << "Counting final number of simplices \n";