From 49a3c4fa3910ba53af57ca02ea3281831302011b Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Fri, 24 Mar 2017 13:32:33 +0000 Subject: cpplint fixes git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@2233 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: e82750380435d5f3e2972a65c5322ce268e4b559 --- src/Contraction/example/Rips_contraction.cpp | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'src/Contraction/example/Rips_contraction.cpp') 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 #include -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 Complex_geometric_traits; -typedef Skeleton_blocker_geometric_complex< Complex_geometric_traits > Complex; -typedef Edge_profile Profile; -typedef Skeleton_blocker_contractor Complex_contractor; +using Complex_geometric_traits = Gudhi::skeleton_blocker::Skeleton_blocker_simple_geometric_traits; +using Complex = Gudhi::skeleton_blocker::Skeleton_blocker_geometric_complex< Complex_geometric_traits >; +using Profile = Gudhi::contraction::Edge_profile; +using Complex_contractor = Gudhi::contraction::Skeleton_blocker_contractor; + template 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 off_reader(argv[1], complex, true); + Gudhi::skeleton_blocker::Skeleton_blocker_off_reader 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, - contraction::make_first_vertex_placement(), - contraction::make_link_valid_contraction(), - contraction::make_remove_popable_blockers_visitor()); + new Gudhi::contraction::Edge_length_cost, + Gudhi::contraction::make_first_vertex_placement(), + Gudhi::contraction::make_link_valid_contraction(), + Gudhi::contraction::make_remove_popable_blockers_visitor()); contractor.contract_edges(); std::cout << "Counting final number of simplices \n"; -- cgit v1.2.3