diff options
Diffstat (limited to 'src/Skeleton_blocker/include')
19 files changed, 78 insertions, 40 deletions
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h index 8584cd16..822282fd 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h @@ -35,7 +35,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { /** \defgroup skbl Skeleton-Blocker @@ -243,7 +243,9 @@ their collaboration to write the two initial papers */ /** @} */ // end defgroup -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_complex_visitor.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_complex_visitor.h index 4ade68e7..32f40a4b 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_complex_visitor.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_complex_visitor.h @@ -26,7 +26,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { // todo rajouter les const /** @@ -128,7 +128,9 @@ class Print_complex_visitor : public Skeleton_blocker_complex_visitor< } }; -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_link_superior.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_link_superior.h index 876bdba9..3bfb5d11 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_link_superior.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_link_superior.h @@ -26,7 +26,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { template<class ComplexType> class Skeleton_blocker_sub_complex; @@ -70,7 +70,9 @@ class Skeleton_blocker_link_superior : public Skeleton_blocker_link_complex< } }; -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_off_io.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_off_io.h index ad2d2f85..ba46c49e 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_off_io.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_off_io.h @@ -30,7 +30,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { /** *@brief Off reader visitor that can be passed to Off_reader to read a Skeleton_blocker_complex. @@ -193,7 +193,9 @@ class Skeleton_blocker_off_writer { } }; -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simple_geometric_traits.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simple_geometric_traits.h index 8508d9a5..fb4a1106 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simple_geometric_traits.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simple_geometric_traits.h @@ -29,7 +29,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { /** * @extends SkeletonBlockerGeometricDS @@ -39,7 +39,7 @@ namespace skbl { */ template<typename GeometryTrait> struct Skeleton_blocker_simple_geometric_traits : - public skbl::Skeleton_blocker_simple_traits { + public Skeleton_blocker_simple_traits { public: typedef GeometryTrait GT; typedef typename GT::Point Point; @@ -87,7 +87,9 @@ struct Skeleton_blocker_simple_geometric_traits : typedef Skeleton_blocker_simple_traits::Graph_edge Graph_edge; }; -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi 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 0d2de767..31bec3b6 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 @@ -29,7 +29,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { /** * @extends SkeletonBlockerDS @@ -175,7 +175,9 @@ struct Skeleton_blocker_simple_traits { }; }; -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simplex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simplex.h index 714bf23c..3c7f1dd5 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simplex.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simplex.h @@ -33,7 +33,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { /** *@brief Abstract simplex used in Skeleton blockers data-structure. @@ -367,7 +367,9 @@ class Skeleton_blocker_simplex { } }; -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_sub_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_sub_complex.h index 0dd5dd54..196fe8c0 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_sub_complex.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_sub_complex.h @@ -32,7 +32,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { /** * @brief Simplicial subcomplex of a complex represented by a skeleton/blockers pair. @@ -282,7 +282,9 @@ bool proper_faces_in_union( return true; } -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/internal/Top_faces.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/internal/Top_faces.h index eb970195..39d95661 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/internal/Top_faces.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/internal/Top_faces.h @@ -28,7 +28,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { template<typename SimplexHandle> std::list<SimplexHandle> subfaces(SimplexHandle top_face) { @@ -63,7 +63,9 @@ void register_faces(std::vector< std::set<SimplexHandle> >& simplices_per_dimens } } -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi 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 499980c4..cdc47b8a 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/internal/Trie.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/internal/Trie.h @@ -32,7 +32,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { template<typename SimplexHandle> struct Trie { @@ -261,7 +261,9 @@ struct Tries { std::vector<STrie*> cofaces_; }; -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi 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 4a437ac6..4dbc9ed3 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 @@ -26,7 +26,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { /** * @brief Iterator through the blockers of a vertex. @@ -124,7 +124,9 @@ ReturnType } }; -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_edges_iterators.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_edges_iterators.h index ef4c7970..15618932 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_edges_iterators.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_edges_iterators.h @@ -29,7 +29,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { template<typename SkeletonBlockerComplex> class Edge_around_vertex_iterator : public boost::iterator_facade <Edge_around_vertex_iterator<SkeletonBlockerComplex> @@ -137,7 +137,9 @@ class Edge_iterator : public boost::iterator_facade <Edge_iterator<SkeletonBlock } }; -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi 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 b8d99201..3b941be5 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 @@ -35,7 +35,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { /** * Link may be Skeleton_blocker_link_complex<SkeletonBlockerComplex> to iterate over all @@ -61,7 +61,7 @@ public boost::iterator_facade < Simplex_around_vertex_iterator<SkeletonBlockerCo // Link_vertex_handle == Complex_Vertex_handle but this renaming helps avoiding confusion typedef typename Link::Vertex_handle Link_vertex_handle; - typedef typename Gudhi::skbl::Trie<Simplex> Trie; + typedef typename Gudhi::skeleton_blocker::Trie<Simplex> Trie; private: const Complex* complex; @@ -391,7 +391,9 @@ private: }; -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_triangles_iterators.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_triangles_iterators.h index 116023d7..b2dd9a21 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_triangles_iterators.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_triangles_iterators.h @@ -27,7 +27,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { /** * \brief Iterator over the triangles that are @@ -213,7 +213,9 @@ typename SkeletonBlockerComplex::Simplex const } }; -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_vertices_iterators.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_vertices_iterators.h index 14ae136a..f06cab71 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_vertices_iterators.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_vertices_iterators.h @@ -28,7 +28,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { /** *@brief Iterator on the vertices of a simplicial complex @@ -163,7 +163,9 @@ class Neighbors_vertices_iterator: public boost::iterator_facade < Neighbors_ver } }; -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h index fd85f0c2..7a6d1d50 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h @@ -52,7 +52,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { /** *@class Skeleton_blocker_complex @@ -1595,7 +1595,9 @@ Complex make_complex_from_top_faces(SimplexHandleIterator simplices_begin, Simpl return Complex(simplices.begin(), simplices.end(), is_flag_complex); } -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_geometric_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_geometric_complex.h index 040f7950..1130ca9f 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_geometric_complex.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_geometric_complex.h @@ -28,7 +28,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { /** * @brief Class that represents a geometric complex that can be simplified. @@ -217,7 +217,9 @@ SkeletonBlockerGeometricComplex make_complex_from_top_faces( return complex; } -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi 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 e3c16d88..1bd66289 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h @@ -27,7 +27,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { template<class ComplexType> class Skeleton_blocker_sub_complex; @@ -290,7 +290,9 @@ class Skeleton_blocker_link_complex : public Skeleton_blocker_sub_complex< } }; -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi 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 94a125c1..171efd4b 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h @@ -30,7 +30,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { /** * Returns true iff the blocker 'sigma' is popable. @@ -459,7 +459,9 @@ Skeleton_blocker_complex<SkeletonBlockerDS>::notify_changed_edges(Vertex_handle } -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi |