From bef66102e0ab999724dbb6c1ad9733ee2a5d6813 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Thu, 15 Sep 2016 14:00:35 +0000 Subject: Fix cpplint and warnings git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/warning_fix@1502 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: afc7d137b66225954ebfe37a823f1f0b6bcfe7a5 --- src/Skeleton_blocker/example/Skeleton_blocker_link.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Skeleton_blocker/example/Skeleton_blocker_link.cpp') diff --git a/src/Skeleton_blocker/example/Skeleton_blocker_link.cpp b/src/Skeleton_blocker/example/Skeleton_blocker_link.cpp index 1f937170..e2a04d75 100644 --- a/src/Skeleton_blocker/example/Skeleton_blocker_link.cpp +++ b/src/Skeleton_blocker/example/Skeleton_blocker_link.cpp @@ -4,7 +4,7 @@ * * Author(s): David Salinas * - * Copyright (C) 2014 INRIA Sophia Antipolis-Mediterranee (France) + * Copyright (C) 2014 INRIA * * 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 @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) { // For instance, to test if the link contains the vertex that was labeled i: for (int i = 0; i < 5; ++i) cout << "link.contains_vertex(Root_vertex_handle(" << i << ")):" << - link.contains_vertex(Root_vertex_handle(i)) << endl; + link.contains_vertex(Root_vertex_handle(i)) << endl; return EXIT_SUCCESS; } -- cgit v1.2.3 From 865b64d6b006d7ce8d6ac179ea4df3dbddb8d85f Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Thu, 15 Sep 2016 15:04:01 +0000 Subject: Fix cpplint warnings git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/warning_fix@1503 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: b4e1ec1b6cc95a6a7207e68fb31e064c0e3bd065 --- src/Simplex_tree/doc/Intro_simplex_tree.h | 3 +- .../example/Skeleton_blocker_from_simplices.cpp | 9 +- .../example/Skeleton_blocker_iteration.cpp | 8 +- .../example/Skeleton_blocker_link.cpp | 20 ++-- .../include/gudhi/Skeleton_blocker.h | 11 +- .../Skeleton_blocker_simple_traits.h | 1 - .../include/gudhi/Skeleton_blocker/internal/Trie.h | 3 - .../Skeleton_blockers_blockers_iterators.h | 2 - .../Skeleton_blockers_simplices_iterators.h | 6 +- .../Skeleton_blockers_triangles_iterators.h | 8 +- .../include/gudhi/Skeleton_blocker_complex.h | 6 +- .../include/gudhi/Skeleton_blocker_link_complex.h | 4 +- .../gudhi/Skeleton_blocker_simplifiable_complex.h | 6 +- src/Skeleton_blocker/test/TestGeometricComplex.cpp | 26 ++--- src/Skeleton_blocker/test/TestSimplifiable.cpp | 111 ++++++++++----------- .../test/TestSkeletonBlockerComplex.cpp | 102 +++++++++---------- 16 files changed, 152 insertions(+), 174 deletions(-) (limited to 'src/Skeleton_blocker/example/Skeleton_blocker_link.cpp') diff --git a/src/Simplex_tree/doc/Intro_simplex_tree.h b/src/Simplex_tree/doc/Intro_simplex_tree.h index ddf9ad22..be061785 100644 --- a/src/Simplex_tree/doc/Intro_simplex_tree.h +++ b/src/Simplex_tree/doc/Intro_simplex_tree.h @@ -28,6 +28,7 @@ namespace Gudhi { /** \defgroup simplex_tree Filtered Complexes + * @{ * \author Clément Maria * * A simplicial complex \f$\mathbf{K}\f$ on a set of vertices \f$V = \{1, \cdots ,|V|\}\f$ is a collection of @@ -76,7 +77,7 @@ Number of vertices = 10 Number of simplices = 98 \endcode * compact and harder to construct from scratch. * * \copyright GNU General Public License v3. - * @{ + * @} */ } // namespace Gudhi diff --git a/src/Skeleton_blocker/example/Skeleton_blocker_from_simplices.cpp b/src/Skeleton_blocker/example/Skeleton_blocker_from_simplices.cpp index 5f89536b..076c6a53 100644 --- a/src/Skeleton_blocker/example/Skeleton_blocker_from_simplices.cpp +++ b/src/Skeleton_blocker/example/Skeleton_blocker_from_simplices.cpp @@ -29,11 +29,8 @@ #include #include -using namespace std; -using namespace Gudhi; -using namespace skeleton_blocker; - -typedef Skeleton_blocker_complex Complex; +typedef Gudhi::skeleton_blocker::Skeleton_blocker_simple_traits Traits; +typedef Gudhi::skeleton_blocker::Skeleton_blocker_complex Complex; typedef Complex::Vertex_handle Vertex_handle; typedef Complex::Simplex Simplex; @@ -47,7 +44,7 @@ int main(int argc, char *argv[]) { simplices.push_back(Simplex(Vertex_handle(3), Vertex_handle(0), Vertex_handle(1))); // get complex from top faces - Complex complex(make_complex_from_top_faces(simplices.begin(), simplices.end())); + Complex complex(Gudhi::skeleton_blocker::make_complex_from_top_faces(simplices.begin(), simplices.end())); std::cout << "Simplices:" << std::endl; diff --git a/src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp b/src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp index 7df0e3c9..6a1bc480 100644 --- a/src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp +++ b/src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp @@ -30,12 +30,8 @@ #include #include - -using namespace std; -using namespace Gudhi; -using namespace skeleton_blocker; - -typedef Skeleton_blocker_complex Complex; +typedef Gudhi::skeleton_blocker::Skeleton_blocker_simple_traits Traits; +typedef Gudhi::skeleton_blocker::Skeleton_blocker_complex Complex; typedef Complex::Vertex_handle Vertex_handle; typedef Complex::Simplex Simplex; diff --git a/src/Skeleton_blocker/example/Skeleton_blocker_link.cpp b/src/Skeleton_blocker/example/Skeleton_blocker_link.cpp index e2a04d75..58322038 100644 --- a/src/Skeleton_blocker/example/Skeleton_blocker_link.cpp +++ b/src/Skeleton_blocker/example/Skeleton_blocker_link.cpp @@ -28,11 +28,8 @@ #include #include -using namespace std; -using namespace Gudhi; -using namespace skeleton_blocker; - -typedef Skeleton_blocker_complex Complex; +typedef Gudhi::skeleton_blocker::Skeleton_blocker_simple_traits Traits; +typedef Gudhi::skeleton_blocker::Skeleton_blocker_complex Complex; typedef Complex::Vertex_handle Vertex_handle; typedef Complex::Root_vertex_handle Root_vertex_handle; typedef Complex::Simplex Simplex; @@ -47,25 +44,26 @@ int main(int argc, char *argv[]) { Simplex tetrahedron(Vertex_handle(0), Vertex_handle(1), Vertex_handle(2), Vertex_handle(3)); complex.add_simplex(tetrahedron); - cout << "complex:" << complex.to_string() << endl; + std::cout << "complex:" << complex.to_string() << std::endl; // build the link of vertex 1, eg a triangle {0,2,3} auto link = complex.link(Vertex_handle(1)); - cout << "link:" << link.to_string() << endl; + std::cout << "link:" << link.to_string() << std::endl; // Internally link is a subcomplex of 'complex' and its vertices are stored in a vector. // They can be accessed via Vertex_handle(x) where x is an index of the vector. // In that example, link has three vertices and thus it contains only // Vertex_handle(0),Vertex_handle(1) and Vertex_handle(2) are). for (int i = 0; i < 5; ++i) - cout << "link.contains_vertex(Vertex_handle(" << i << ")):" << link.contains_vertex(Vertex_handle(i)) << endl; - cout << endl; + std::cout << "link.contains_vertex(Vertex_handle(" << i << ")):" << link.contains_vertex(Vertex_handle(i)) << + std::endl; + std::cout << std::endl; // To access to the initial vertices eg (0,1,2,3,4), Root_vertex_handle must be used. // For instance, to test if the link contains the vertex that was labeled i: for (int i = 0; i < 5; ++i) - cout << "link.contains_vertex(Root_vertex_handle(" << i << ")):" << - link.contains_vertex(Root_vertex_handle(i)) << endl; + std::cout << "link.contains_vertex(Root_vertex_handle(" << i << ")):" << + link.contains_vertex(Root_vertex_handle(i)) << std::endl; return EXIT_SUCCESS; } diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h index 85fada4f..bd907131 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h @@ -37,7 +37,8 @@ namespace Gudhi { namespace skeleton_blocker { -/** \defgroup skbl Skeleton-Blocker +/** \defgroup skbl Skeleton-Blocker +@{ \author David Salinas @@ -236,12 +237,12 @@ The author wishes to thank Dominique Attali and AndrĂ© Lieutier for their collaboration to write the two initial papers \cite socg_blockers_2011,\cite blockers2012 about this data-structure - and also Dominique for leaving him use a prototype. + and also Dominique for leaving him use a prototype. -\copyright GNU General Public License v3. - */ -/** @} */ // end defgroup +\copyright GNU General Public License v3. + +@} */ } // namespace skeleton_blocker diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simple_traits.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simple_traits.h index 469717ae..3835cf77 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simple_traits.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simple_traits.h @@ -148,7 +148,6 @@ struct Skeleton_blocker_simple_traits { int index_; public: - Graph_edge() : a_(-1), b_(-1), diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/internal/Trie.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/internal/Trie.h index ccc7c36b..b0ee35f5 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/internal/Trie.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/internal/Trie.h @@ -45,7 +45,6 @@ struct Trie { const Trie* parent_; public: - Trie() : parent_(0) { } Trie(Vertex_handle v_) : v(v_), parent_(0) { } @@ -80,7 +79,6 @@ struct Trie { private: // go down recursively in the tree while advancing the simplex iterator. // when it reaches a leaf, it inserts the remaining that is not present - void add_simplex_helper(Simplex_vertex_const_iterator s_it, Simplex_vertex_const_iterator s_end) { assert(*s_it == v); ++s_it; @@ -106,7 +104,6 @@ struct Trie { } public: - /** * adds the simplex to the trie */ diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_blockers_iterators.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_blockers_iterators.h index 4049fb0b..d2fff960 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_blockers_iterators.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_blockers_iterators.h @@ -47,7 +47,6 @@ ReturnType MapIteratorType end_of_map; public: - Blocker_iterator_internal() : current_position() { } Blocker_iterator_internal(MapIteratorType position, MapIteratorType end_of_map_) : @@ -66,7 +65,6 @@ ReturnType } private: - /** * Let the current pair be (v,sigma) where v is a vertex and sigma is a blocker. * If v is not the first vertex of sigma then we already have seen sigma as a blocker diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_simplices_iterators.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_simplices_iterators.h index c9482263..20d5600c 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_simplices_iterators.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_simplices_iterators.h @@ -69,7 +69,8 @@ public boost::iterator_facade < Simplex_around_vertex_iterator link_v; std::shared_ptr trie; - std::list nodes_to_be_seen; // todo deque + // TODO(DS): use a deque instead + std::list nodes_to_be_seen; public: Simplex_around_vertex_iterator() : complex(0) { } @@ -161,7 +162,8 @@ public boost::iterator_facade < Simplex_around_vertex_iteratorvertex_range().begin()), - current_triangle_(complex, *current_vertex_), // xxx this line is problematic is the complex is empty + current_triangle_(complex, *current_vertex_), // this line is problematic is the complex is empty is_end_(false) { assert(!complex->empty()); gotoFirstTriangle(); @@ -185,8 +185,10 @@ typename SkeletonBlockerComplex::Simplex const // goto the next vertex that has a triangle pending or the // end vertex iterator if none exists void goto_next_vertex() { - assert(current_triangle_.finished()); // we mush have consume all triangles passing through the vertex - assert(!is_finished()); // we must not be done + // we must have consume all triangles passing through the vertex + assert(current_triangle_.finished()); + // we must not be done + assert(!is_finished()); ++current_vertex_; diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h index c1a0cf2d..4f052ba5 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h @@ -104,8 +104,8 @@ class Skeleton_blocker_complex { typedef typename Simplex::Simplex_vertex_const_iterator Simplex_handle_iterator; protected: - typedef typename boost::adjacency_list Graph; // todo/remark : edges are not sorted, it heavily penalizes computation for SuperiorLink // (eg Link with greater vertices) @@ -445,7 +445,7 @@ class Skeleton_blocker_complex { boost::optional res; int num_vertices = boost::num_vertices(skeleton); if (id.vertex < num_vertices) - res = Vertex_handle(id.vertex); // xxx + res = Vertex_handle(id.vertex); return res; } diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h index 906d3e86..4db075b0 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h @@ -201,8 +201,8 @@ ComplexType> { * corresponding address in 'other_complex'. * It assumes that other_complex have a vertex 'this.get_id(address)' */ - boost::optional give_equivalent_vertex( - const ComplexType & other_complex, Vertex_handle address) const { + boost::optional give_equivalent_vertex(const ComplexType & other_complex, + Vertex_handle address) const { Root_vertex_handle id((*this)[address].get_id()); return other_complex.get_address(id); } diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h index fcb6bafe..544e02e8 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h @@ -146,8 +146,7 @@ void Skeleton_blocker_complex::remove_star(Vertex_handle v) { * whenever the dimension of tau is at least 2. */ template -void Skeleton_blocker_complex::update_blockers_after_remove_star_of_vertex_or_edge( - const Simplex& simplex_to_be_removed) { +void Skeleton_blocker_complex::update_blockers_after_remove_star_of_vertex_or_edge(const Simplex& simplex_to_be_removed) { std::list blockers_to_update; if (simplex_to_be_removed.empty()) return; @@ -384,7 +383,8 @@ Skeleton_blocker_complex::contract_edge(Vertex_handle a, Vert template void Skeleton_blocker_complex::get_blockers_to_be_added_after_contraction(Vertex_handle a, - Vertex_handle b, std::set& blockers_to_add) { + Vertex_handle b, + std::set& blockers_to_add) { blockers_to_add.clear(); typedef Skeleton_blocker_link_complex > LinkComplexType; diff --git a/src/Skeleton_blocker/test/TestGeometricComplex.cpp b/src/Skeleton_blocker/test/TestGeometricComplex.cpp index 102162c5..c5351b04 100644 --- a/src/Skeleton_blocker/test/TestGeometricComplex.cpp +++ b/src/Skeleton_blocker/test/TestGeometricComplex.cpp @@ -25,26 +25,22 @@ #include #include #include -#include "gudhi/Test.h" -#include "gudhi/Skeleton_blocker.h" +#include +#include -using namespace std; -using namespace Gudhi; -using namespace skeleton_blocker; - struct Geometry_trait { typedef std::vector 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 Gudhi::skeleton_blocker::Skeleton_blocker_simple_geometric_traits Complex_geometric_traits; +typedef Gudhi::skeleton_blocker::Skeleton_blocker_geometric_complex< Complex_geometric_traits > Complex; typedef Complex::Vertex_handle Vertex_handle; bool test_constructor1() { Complex complex; - Skeleton_blocker_off_reader off_reader("test2.off", complex); + Gudhi::skeleton_blocker::Skeleton_blocker_off_reader off_reader("test2.off", complex); if (!off_reader.is_valid()) { std::cerr << "Unable to read file" << std::endl; return false; @@ -60,19 +56,19 @@ bool test_constructor1() { if (complex.num_vertices() != 7 || complex.num_edges() != 12 || complex.num_triangles() != 6) return false; - Skeleton_blocker_off_writer off_writer("tmp.off", complex); + Gudhi::skeleton_blocker::Skeleton_blocker_off_writer off_writer("tmp.off", complex); Complex same; - Skeleton_blocker_off_reader off_reader2("tmp.off", same); + Gudhi::skeleton_blocker::Skeleton_blocker_off_reader off_reader2("tmp.off", same); - std::cout << "\ncomplex:" << complex.to_string() << endl; - std::cout << "\nsame:" << same.to_string() << endl; + std::cout << "\ncomplex:" << complex.to_string() << std::endl; + std::cout << "\nsame:" << same.to_string() << std::endl; return (complex == same); } bool test_constructor2() { Complex complex; - Skeleton_blocker_off_reader off_reader("test2.off", complex); + Gudhi::skeleton_blocker::Skeleton_blocker_off_reader off_reader("test2.off", complex); if (!off_reader.is_valid()) { std::cerr << "Unable to read file" << std::endl; return false; @@ -89,7 +85,7 @@ bool test_constructor2() { auto link_0 = complex.abstract_link(Vertex_handle(0)); - std::cout << "\n link(0):" << link_0.to_string() << endl; + std::cout << "\n link(0):" << link_0.to_string() << std::endl; auto link_geometric_0 = complex.link(Vertex_handle(0)); diff --git a/src/Skeleton_blocker/test/TestSimplifiable.cpp b/src/Skeleton_blocker/test/TestSimplifiable.cpp index 6646734d..b5384318 100644 --- a/src/Skeleton_blocker/test/TestSimplifiable.cpp +++ b/src/Skeleton_blocker/test/TestSimplifiable.cpp @@ -25,21 +25,16 @@ #include #include #include -#include "gudhi/Test.h" -#include "gudhi/Skeleton_blocker.h" +#include +#include -using namespace std; - -using namespace Gudhi; - -using namespace skeleton_blocker; - template class Skeleton_blocker_sub_complex; -typedef Skeleton_blocker_complex Complex; +typedef Gudhi::skeleton_blocker::Skeleton_blocker_simple_traits Traits; +typedef Gudhi::skeleton_blocker::Skeleton_blocker_complex Complex; typedef Complex::Vertex_handle Vertex_handle; typedef Complex::Root_vertex_handle Root_vertex_handle; -typedef Skeleton_blocker_simplex Simplex; +typedef Gudhi::skeleton_blocker::Skeleton_blocker_simplex Simplex; // true iff v \in complex bool assert_vertex(Complex &complex, Vertex_handle v) { @@ -80,12 +75,12 @@ bool test_contraction1() { static_cast (y))); // Print result - cerr << "complex before complex" << complex.to_string() << endl; + std::cerr << "complex before complex" << complex.to_string() << std::endl; - cerr << endl << endl; + std::cerr << std::endl << std::endl; complex.contract_edge(static_cast (a), static_cast (b)); // Print result - cerr << "ContractEdge(0,1)\n"; + std::cerr << "ContractEdge(0,1)\n"; PRINT(complex.to_string()); // verification @@ -120,13 +115,13 @@ bool test_contraction2() { complex.add_blocker(blocker); // Print result - cerr << "complex complex" << complex.to_string(); - cerr << endl << endl; + std::cerr << "complex complex" << complex.to_string(); + std::cerr << std::endl << std::endl; complex.contract_edge(static_cast (a), static_cast (b)); - cerr << "complex.ContractEdge(a,b)" << complex.to_string(); + std::cerr << "complex.ContractEdge(a,b)" << complex.to_string(); - cerr << endl << endl; + std::cerr << std::endl << std::endl; // there should be one blocker (a,c,d,e) in the complex bool test; @@ -145,8 +140,8 @@ bool test_link_condition1() { // Print result - cerr << "complex complex" << complex.to_string(); - cerr << endl << endl; + std::cerr << "complex complex" << complex.to_string(); + std::cerr << std::endl << std::endl; bool weak_link_condition = complex.link_condition(Vertex_handle(1), Vertex_handle(2), true); @@ -162,17 +157,17 @@ bool test_collapse0() { complex.add_edge_without_blockers(static_cast (2), static_cast (4)); complex.add_edge_without_blockers(static_cast (3), static_cast (4)); // Print result - cerr << "initial complex :\n" << complex.to_string(); - cerr << endl << endl; + std::cerr << "initial complex :\n" << complex.to_string(); + std::cerr << std::endl << std::endl; Simplex simplex_123(static_cast (1), static_cast (2), static_cast (3)); complex.remove_star(simplex_123); - cerr << "complex.remove_star(1,2,3):\n" << complex.to_string(); - cerr << endl << endl; + std::cerr << "complex.remove_star(1,2,3):\n" << complex.to_string(); + std::cerr << std::endl << std::endl; // verification bool blocker123_here = complex.contains_blocker(simplex_123); - cerr << "----> Ocomplex \n"; + std::cerr << "----> Ocomplex \n"; return blocker123_here; } @@ -181,18 +176,18 @@ bool test_collapse1() { build_complete(4, complex); complex.add_blocker(Simplex(Vertex_handle(0), Vertex_handle(1), Vertex_handle(2), Vertex_handle(3))); // Print result - cerr << "initial complex :\n" << complex.to_string(); - cerr << endl << endl; + std::cerr << "initial complex :\n" << complex.to_string(); + std::cerr << std::endl << std::endl; Simplex simplex_123(Vertex_handle(1), Vertex_handle(2), Vertex_handle(3)); complex.remove_star(simplex_123); - cerr << "complex.remove_star(1,2,3):\n" << complex.to_string(); - cerr << endl << endl; + std::cerr << "complex.remove_star(1,2,3):\n" << complex.to_string(); + std::cerr << std::endl << std::endl; // verification bool res = complex.contains_blocker(simplex_123); res = res && complex.num_blockers() == 1; - cerr << "----> Ocomplex \n"; + std::cerr << "----> Ocomplex \n"; return res; } @@ -205,13 +200,13 @@ bool test_collapse2() { complex.add_edge_without_blockers(Vertex_handle(3), Vertex_handle(4)); complex.add_blocker(Simplex(Vertex_handle(1), Vertex_handle(2), Vertex_handle(3), Vertex_handle(4))); // Print result - cerr << "initial complex :\n" << complex.to_string(); - cerr << endl << endl; + std::cerr << "initial complex :\n" << complex.to_string(); + std::cerr << std::endl << std::endl; Simplex sigma(Vertex_handle(1), Vertex_handle(2), Vertex_handle(3)); complex.remove_star(sigma); - cerr << "complex.remove_star(1,2,3):\n" << complex.to_string(); - cerr << endl << endl; + std::cerr << "complex.remove_star(1,2,3):\n" << complex.to_string(); + std::cerr << std::endl << std::endl; // verification bool blocker_removed = !complex.contains_blocker(Simplex(Vertex_handle(1), Vertex_handle(2), Vertex_handle(3), Vertex_handle(4))); @@ -228,11 +223,11 @@ bool test_collapse3() { complex.add_edge_without_blockers(Vertex_handle(3), Vertex_handle(4)); complex.add_blocker(Simplex(Vertex_handle(1), Vertex_handle(2), Vertex_handle(3), Vertex_handle(4))); // Print result - cerr << "initial complex:\n" << complex.to_string(); - cerr << endl << endl; + std::cerr << "initial complex:\n" << complex.to_string(); + std::cerr << std::endl << std::endl; complex.remove_star(static_cast (2)); - cerr << "complex after remove star of 2:\n" << complex.to_string(); + std::cerr << "complex after remove star of 2:\n" << complex.to_string(); bool blocker134_here = complex.contains_blocker(Simplex(Vertex_handle(1), Vertex_handle(3), Vertex_handle(4))); bool blocker1234_here = complex.contains_blocker(Simplex(Vertex_handle(1), Vertex_handle(2), Vertex_handle(3), Vertex_handle(4))); @@ -243,11 +238,11 @@ bool test_add_simplex() { Complex complex(4); build_complete(4, complex); complex.add_blocker(Simplex(Vertex_handle(0), Vertex_handle(1), Vertex_handle(3))); - cerr << "initial complex:\n" << complex.to_string(); - cerr << endl << endl; + std::cerr << "initial complex:\n" << complex.to_string(); + std::cerr << std::endl << std::endl; complex.add_simplex(Simplex(Vertex_handle(0), Vertex_handle(1), Vertex_handle(3))); - cerr << "complex after add_simplex:\n" << complex.to_string(); + std::cerr << "complex after add_simplex:\n" << complex.to_string(); return complex.num_blockers() == 1 && complex.contains_blocker(Simplex(Vertex_handle(0), Vertex_handle(1), Vertex_handle(2), Vertex_handle(3))); } @@ -256,8 +251,8 @@ bool test_add_simplex2() { Complex complex; build_complete(4, complex); // Print result - cerr << "initial complex:\n" << complex.to_string(); - cerr << endl << endl; + std::cerr << "initial complex:\n" << complex.to_string(); + std::cerr << std::endl << std::endl; Complex copy(complex.num_vertices()); @@ -273,7 +268,7 @@ bool test_add_simplex2() { } - cerr << "complex after add_simplex:\n" << copy.to_string(); + std::cerr << "complex after add_simplex:\n" << copy.to_string(); return complex.num_blockers() == copy.num_blockers() && @@ -288,11 +283,11 @@ bool test_add_simplex3() { Simplex sigma(Vertex_handle(0), Vertex_handle(1), Vertex_handle(2)); complex.add_blocker(sigma); // Print result - cerr << "initial complex:\n" << complex.to_string(); - cerr << endl << endl; + std::cerr << "initial complex:\n" << complex.to_string(); + std::cerr << std::endl << std::endl; complex.add_simplex(sigma); //should create two blockers 0123 and 0124 - cerr << "complex after adding simplex 012:\n" << complex.to_string(); + std::cerr << "complex after adding simplex 012:\n" << complex.to_string(); return complex.num_blockers() == 2 && complex.contains_blocker(Simplex(Vertex_handle(0), Vertex_handle(1), Vertex_handle(2), Vertex_handle(3))) && complex.contains_blocker(Simplex(Vertex_handle(0), Vertex_handle(1), Vertex_handle(2), Vertex_handle(4))); @@ -334,11 +329,11 @@ bool test_add_edge() { complex.add_edge(Vertex_handle(i), Vertex_handle((i + 1) % 4)); // Print result - cerr << "initial complex:\n" << complex.to_string(); - cerr << endl << endl; + std::cerr << "initial complex:\n" << complex.to_string(); + std::cerr << std::endl << std::endl; complex.add_edge(Vertex_handle(1), Vertex_handle(3)); //should create two blockers 013 and 012 - cerr << "complex after adding edge 13:\n" << complex.to_string(); + std::cerr << "complex after adding edge 13:\n" << complex.to_string(); return complex.num_blockers() == 2 && complex.contains_blocker(Simplex(Vertex_handle(0), Vertex_handle(1), Vertex_handle(3))) && complex.contains_blocker(Simplex(Vertex_handle(1), Vertex_handle(2), Vertex_handle(3))); @@ -355,12 +350,12 @@ bool test_remove_popable_blockers() { complex.add_blocker(sigma1); complex.add_blocker(sigma2); - cerr << "complex complex" << complex.to_string(); - cerr << endl << endl; - cerr << "complex.RemovePopableBlockers();" << endl; + std::cerr << "complex complex" << complex.to_string(); + std::cerr << std::endl << std::endl; + std::cerr << "complex.RemovePopableBlockers();" << std::endl; complex.remove_popable_blockers(); - cerr << "complex complex" << complex.to_string(); - cerr << endl << endl; + std::cerr << "complex complex" << complex.to_string(); + std::cerr << std::endl << std::endl; bool test1 = (complex.num_blockers() == 1); @@ -380,13 +375,13 @@ bool test_remove_popable_blockers() { complex.add_blocker(sigma1); complex.add_blocker(sigma2); - cerr << "complex complex" << complex.to_string(); - cerr << endl << endl; - cerr << "complex.RemovePopableBlockers();" << endl; + std::cerr << "complex complex" << complex.to_string(); + std::cerr << std::endl << std::endl; + std::cerr << "complex.RemovePopableBlockers();" << std::endl; complex.remove_popable_blockers(); - cerr << "complex complex" << complex.to_string(); + std::cerr << "complex complex" << complex.to_string(); - cerr << endl << endl; + std::cerr << std::endl << std::endl; bool test2 = (complex.num_blockers() == 0); return test1&&test2; } diff --git a/src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp b/src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp index f61cffac..c74f591e 100644 --- a/src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp +++ b/src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp @@ -24,18 +24,14 @@ #include #include #include -#include "gudhi/Debug_utils.h" -#include "gudhi/Test.h" -#include "gudhi/Skeleton_blocker.h" - -using namespace std; - -using namespace Gudhi; - -using namespace skeleton_blocker; - - -typedef Skeleton_blocker_complex Complex; +#include +#include +#include + +template class Skeleton_blocker_sub_complex; +typedef Gudhi::skeleton_blocker::Skeleton_blocker_simple_traits Traits; +typedef Gudhi::skeleton_blocker::Skeleton_blocker_complex Complex; +typedef Gudhi::skeleton_blocker::Skeleton_blocker_link_complex Skeleton_blocker_link_complex; typedef Complex::Vertex_handle Vertex_handle; typedef Complex::Root_vertex_handle Root_vertex_handle; typedef Complex::Simplex Simplex; @@ -120,10 +116,10 @@ bool test_num_simplices() { bool test_iterator_vertices1() { int n = 10; Complex complex(10); - cerr << "complex.num_vertices():" << complex.num_vertices() << endl; + std::cerr << "complex.num_vertices():" << complex.num_vertices() << std::endl; int num_vertex_seen = 0; for (auto vi : complex.vertex_range()) { - cerr << "vertex:" << vi << endl; + std::cerr << "vertex:" << vi << std::endl; ++num_vertex_seen; } return num_vertex_seen == n; @@ -133,11 +129,11 @@ bool test_iterator_vertices2() { int n = 10; Complex complex; build_complete(10, complex); - cerr << "complex.num_vertices():" << complex.num_vertices() << endl; - cerr << "complex.num_edges():" << complex.num_edges() << endl; + std::cerr << "complex.num_vertices():" << complex.num_vertices() << std::endl; + std::cerr << "complex.num_edges():" << complex.num_edges() << std::endl; int num_vertex_seen = 0; for (auto vi : complex.vertex_range(Vertex_handle(2))) { - cerr << "vertex:" << vi << endl; + std::cerr << "vertex:" << vi << std::endl; ++num_vertex_seen; } std::cerr << "num_vertex_seen:" << num_vertex_seen << std::endl; @@ -152,10 +148,10 @@ bool test_iterator_edge() { complex.add_edge_without_blockers(Vertex_handle(i), Vertex_handle(j)); complex.remove_edge(Vertex_handle(2), Vertex_handle(3)); complex.remove_edge(Vertex_handle(3), Vertex_handle(5)); - cerr << "complex.num_edges():" << complex.num_edges() << endl; + std::cerr << "complex.num_edges():" << complex.num_edges() << std::endl; int num_edges_seen = 0; for (auto edge : complex.edge_range()) { - cerr << "edge :" << complex[edge] << endl; + std::cerr << "edge :" << complex[edge] << std::endl; ++num_edges_seen; } @@ -170,10 +166,10 @@ bool test_iterator_edge2() { complex.add_edge_without_blockers(Vertex_handle(i), Vertex_handle(j)); complex.remove_edge(Vertex_handle(2), Vertex_handle(3)); complex.remove_edge(Vertex_handle(3), Vertex_handle(5)); - cerr << "complex.num_edges():" << complex.num_edges() << endl; + std::cerr << "complex.num_edges():" << complex.num_edges() << std::endl; int num_neigbors_seen = 0; for (auto neighbor : complex.vertex_range(Vertex_handle(2))) { - cerr << "neighbor" << neighbor << endl; + std::cerr << "neighbor" << neighbor << std::endl; ++num_neigbors_seen; } return num_neigbors_seen == 8; @@ -187,7 +183,7 @@ bool test_iterator_edge3() { complex.add_edge_without_blockers(Vertex_handle(i), Vertex_handle(j)); complex.remove_edge(Vertex_handle(2), Vertex_handle(3)); complex.remove_edge(Vertex_handle(3), Vertex_handle(5)); - cerr << "complex.num_edges():" << complex.num_edges() << endl; + std::cerr << "complex.num_edges():" << complex.num_edges() << std::endl; int num_neigbors_seen = 0; for (auto edge : complex.edge_range(Vertex_handle(2))) { std::cerr << edge << std::endl; @@ -432,7 +428,7 @@ bool test_link0() { complex.add_edge_without_blockers(Vertex_handle(b), Vertex_handle(c)); complex.add_edge_without_blockers(Vertex_handle(c), Vertex_handle(d)); Simplex alpha = Simplex(Vertex_handle(c)); - Skeleton_blocker_link_complex L(complex, alpha); + Skeleton_blocker_link_complex L(complex, alpha); auto L2 = complex.link(alpha); if (L != L2) return false; @@ -461,7 +457,7 @@ bool test_link1() { complex.add_edge_without_blockers(Vertex_handle(i), Vertex_handle(j)); } Simplex alpha(Vertex_handle(12), Vertex_handle(14)); - Skeleton_blocker_link_complex L(complex, alpha); + Skeleton_blocker_link_complex L(complex, alpha); // Complexes built auto L2 = complex.link(alpha); @@ -479,7 +475,7 @@ bool test_link1() { simplex.add_vertex(Root_vertex_handle(13)); bool test6(L.get_simplex_address(simplex)); bool test7 = L.contains(*(L.get_simplex_address(simplex))); - cerr << "----> Ocomplex \n"; + std::cerr << "----> Ocomplex \n"; return test1 && test2 && test3 && test4 && test5 && test6&&test7; } @@ -499,13 +495,13 @@ bool test_link2() { } complex.add_blocker(Simplex(Vertex_handle(10), Vertex_handle(11), Vertex_handle(13))); alpha = Simplex(Vertex_handle(12), Vertex_handle(14)); - Skeleton_blocker_link_complex L(complex, alpha); + Skeleton_blocker_link_complex L(complex, alpha); // Complexes built // Print result - cerr << "complex complex" << complex.to_string(); - cerr << endl << endl; - cerr << "L= Link_complex(" << alpha << ") : \n" << L.to_string(); + std::cerr << "complex complex" << complex.to_string(); + std::cerr << std::endl << std::endl; + std::cerr << "L= Link_complex(" << alpha << ") : \n" << L.to_string(); auto L2 = complex.link(alpha); if (L != L2) return false; @@ -522,7 +518,7 @@ bool test_link2() { simplex.add_vertex(Root_vertex_handle(11)); simplex.add_vertex(Root_vertex_handle(13)); bool test6 = L.contains_blocker(*(L.get_simplex_address(simplex))); - cerr << "----> Ocomplex \n"; + std::cerr << "----> Ocomplex \n"; return test1 && test2 && test3 && test4 && test5&&test6; } @@ -541,13 +537,13 @@ bool test_link3() { } complex.add_blocker(Simplex(Vertex_handle(10), Vertex_handle(11), Vertex_handle(12))); alpha = Simplex(Vertex_handle(12), Vertex_handle(14)); - Skeleton_blocker_link_complex L(complex, alpha); + Skeleton_blocker_link_complex L(complex, alpha); // Complexes built // Print result - cerr << "complex complex" << complex.to_string(); - cerr << endl << endl; - cerr << "L= Link_complex(" << alpha << ") : \n" << L.to_string(); + std::cerr << "complex complex" << complex.to_string(); + std::cerr << std::endl << std::endl; + std::cerr << "L= Link_complex(" << alpha << ") : \n" << L.to_string(); auto L2 = complex.link(alpha); if (L != L2) return false; @@ -577,7 +573,7 @@ bool test_link4() { } complex.add_blocker(Simplex(Vertex_handle(10), Vertex_handle(11), Vertex_handle(12), Vertex_handle(13))); Simplex alpha(Vertex_handle(12), Vertex_handle(14)); - Skeleton_blocker_link_complex L(complex, alpha); + Skeleton_blocker_link_complex L(complex, alpha); // Complexes built // verification @@ -591,7 +587,7 @@ bool test_link4() { simplex.add_vertex(Root_vertex_handle(11)); simplex.add_vertex(Root_vertex_handle(13)); bool test6 = L.contains_blocker(*(L.get_simplex_address(simplex))); - cerr << "----> Ocomplex \n"; + std::cerr << "----> Ocomplex \n"; return test1 && test2 && test3 && test4 && test5&&test6; } @@ -605,11 +601,11 @@ bool test_link5() { Simplex alpha(Vertex_handle(0), Vertex_handle(1), Vertex_handle(2)); - Skeleton_blocker_link_complex L(complex, alpha); // Complexes built + Skeleton_blocker_link_complex L(complex, alpha); // Complexes built // Print result PRINT(complex.to_string()); - cerr << endl << endl; + std::cerr << std::endl << std::endl; PRINT(L.to_string()); // verification @@ -624,13 +620,13 @@ bool test_link6() { Simplex alpha(Vertex_handle(0), Vertex_handle(1), Vertex_handle(2)); - Skeleton_blocker_link_complex link_blocker_alpha; + Skeleton_blocker_link_complex link_blocker_alpha; build_link_of_blocker(complex, alpha, link_blocker_alpha); // Print result PRINT(complex.to_string()); - cerr << endl << endl; + std::cerr << std::endl << std::endl; PRINT(link_blocker_alpha.to_string()); // verification @@ -653,7 +649,7 @@ bool test_link7() { Simplex alpha(Vertex_handle(3), Vertex_handle(4), Vertex_handle(5)); - Skeleton_blocker_link_complex link_blocker_alpha; + Skeleton_blocker_link_complex link_blocker_alpha; build_link_of_blocker(complex, alpha, link_blocker_alpha); @@ -661,10 +657,10 @@ bool test_link7() { // Print result PRINT(complex.to_string()); - cerr << endl << endl; + std::cerr << std::endl << std::endl; DBGVALUE(link_blocker_alpha.to_string()); - Skeleton_blocker_link_complex link_blocker_alpha_cpy = link_blocker_alpha; + Skeleton_blocker_link_complex link_blocker_alpha_cpy = link_blocker_alpha; DBGVALUE(link_blocker_alpha_cpy.to_string()); @@ -684,7 +680,7 @@ bool test_link7() { } template -void add_triangle_edges(int a, int b, int c, list& simplices) { +void add_triangle_edges(int a, int b, int c, std::list& simplices) { typedef SimplexHandle Simplex; typedef typename SimplexHandle::Vertex_handle Vertex_handle; @@ -694,14 +690,14 @@ void add_triangle_edges(int a, int b, int c, list& simplices) { } template -void add_triangle(int a, int b, int c, list& simplices) { +void add_triangle(int a, int b, int c, std::list& simplices) { typedef SimplexHandle Simplex; typedef typename SimplexHandle::Vertex_handle Vertex_handle; simplices.push_back(Simplex(Vertex_handle(a), Vertex_handle(b), Vertex_handle(c))); } bool test_constructor() { - list simplices; + std::list simplices; simplices.push_back(Simplex(Vertex_handle(0))); simplices.push_back(Simplex(Vertex_handle(1))); @@ -732,8 +728,8 @@ bool test_constructor() { return ( complex.num_vertices() == 6 && complex.num_edges() == 10 && complex.num_blockers() == 2); } -list subfaces(Simplex top_face) { - list res; +std::list subfaces(Simplex top_face) { + std::list res; if (top_face.dimension() == -1) return res; if (top_face.dimension() == 0) { res.push_back(top_face); @@ -742,7 +738,7 @@ list subfaces(Simplex top_face) { Vertex_handle first_vertex = top_face.first_vertex(); top_face.remove_vertex(first_vertex); res = subfaces(top_face); - list copy = res; + std::list copy = res; for (auto& simplex : copy) { simplex.add_vertex(first_vertex); } @@ -757,7 +753,7 @@ bool test_constructor2() { for (int i = 0; i < 5; ++i) simplex.add_vertex(static_cast (i)); - list simplices(subfaces(simplex)); + std::list simplices(subfaces(simplex)); simplices.remove(simplex); Complex complex(simplices.begin(), simplices.end()); @@ -765,7 +761,7 @@ bool test_constructor2() { PRINT(complex.to_string()); for (auto b : complex.const_blocker_range()) { - cout << "b:" << b << endl; + std::cout << "b:" << b << std::endl; } return ( complex.num_vertices() == 5 && complex.num_edges() == 10 && complex.num_blockers() == 1); @@ -873,7 +869,7 @@ bool test_constructor7() { simplices.push_back(Sh(Vh(3), Vh(0), Vh(1))); //get complex from top faces - Complex complex(make_complex_from_top_faces(simplices.begin(), simplices.end())); + Complex complex(Gudhi::skeleton_blocker::make_complex_from_top_faces(simplices.begin(), simplices.end())); DBGVALUE(complex.to_string()); @@ -895,7 +891,7 @@ bool test_constructor8() { simplices.push_back(Sh(Vh(2), Vh(3))); //get complex from top faces - Complex complex(make_complex_from_top_faces(simplices.begin(), simplices.end())); + Complex complex(Gudhi::skeleton_blocker::make_complex_from_top_faces(simplices.begin(), simplices.end())); DBGVALUE(complex.to_string()); -- cgit v1.2.3