satisfies_link_condition->does_satisfy_link_condition to match naming convention

This commit is contained in:
Sébastien Loriot 2015-07-21 10:27:27 +02:00
parent 5f9b2d28b3
commit a220686d02
5 changed files with 18 additions and 10 deletions

View File

@ -179,7 +179,7 @@ user might encounter.
- `CGAL::Euler::add_vertex_and_face_to_border()` - `CGAL::Euler::add_vertex_and_face_to_border()`
- `CGAL::Euler::add_face_to_border()` - `CGAL::Euler::add_face_to_border()`
- `CGAL::Euler::collapse_edge()` - `CGAL::Euler::collapse_edge()`
- `CGAL::Euler::satisfies_link_condition()` - `CGAL::Euler::does_satisfy_link_condition()`
*/ */

View File

@ -1035,7 +1035,7 @@ add_face_to_border(typename boost::graph_traits<Graph>::halfedge_descriptor h1,
* </UL> * </UL>
* \returns vertex `vkept` (which can be either `v0` or `v1`). * \returns vertex `vkept` (which can be either `v0` or `v1`).
* \pre g must be a triangulated graph * \pre g must be a triangulated graph
* \pre `satisfies_link_condition(v0v1,g) == true`. * \pre `does_satisfy_link_condition(v0v1,g) == true`.
*/ */
template<typename Graph> template<typename Graph>
typename boost::graph_traits<Graph>::vertex_descriptor typename boost::graph_traits<Graph>::vertex_descriptor
@ -1349,7 +1349,7 @@ flip_edge(typename boost::graph_traits<Graph>::halfedge_descriptor h,
*/ */
template<typename Graph> template<typename Graph>
bool bool
satisfies_link_condition(typename boost::graph_traits<Graph>::edge_descriptor e, does_satisfy_link_condition(typename boost::graph_traits<Graph>::edge_descriptor e,
Graph& g) Graph& g)
{ {
typedef typename boost::graph_traits<Graph>::vertex_descriptor vertex_descriptor; typedef typename boost::graph_traits<Graph>::vertex_descriptor vertex_descriptor;
@ -1454,7 +1454,15 @@ bool
return true ; return true ;
} }
#ifndef CGAL_NO_DEPRECATED_CODE
template<typename Graph>
bool
satisfies_link_condition(typename boost::graph_traits<Graph>::edge_descriptor e,
Graph& g)
{
return does_satisfy_link_condition(e, g);
}
#endif
/// @} /// @}
} // CGAL } // CGAL

View File

@ -348,11 +348,11 @@ join_split_inverse()
template <typename T> template <typename T>
void void
satisfies_link_condition() does_satisfy_link_condition()
{ {
Surface_fixture_7<T> f; Surface_fixture_7<T> f;
assert(CGAL::Euler::satisfies_link_condition(*edges(f.m).first,f.m)); assert(CGAL::Euler::does_satisfy_link_condition(*edges(f.m).first,f.m));
} }
@ -374,7 +374,7 @@ test_Euler_operations()
make_hole_test<Graph>(); make_hole_test<Graph>();
remove_center_vertex_test<Graph>(); remove_center_vertex_test<Graph>();
join_split_inverse<Graph>(); join_split_inverse<Graph>();
satisfies_link_condition<Graph>(); does_satisfy_link_condition<Graph>();
} }
int main() int main()

View File

@ -310,7 +310,7 @@ std::size_t remove_degenerate_faces(TriangleMesh& tmesh,
halfedge_descriptor h = halfedge(ed, tmesh); halfedge_descriptor h = halfedge(ed, tmesh);
if (CGAL::Euler::satisfies_link_condition(ed,tmesh)) if (CGAL::Euler::does_satisfy_link_condition(ed,tmesh))
{ {
// remove edges that could also be set for removal // remove edges that could also be set for removal
if ( face(h, tmesh)!=GT::null_face() ) if ( face(h, tmesh)!=GT::null_face() )
@ -553,7 +553,7 @@ std::size_t remove_degenerate_faces(TriangleMesh& tmesh,
h=opposite(h, tmesh); h=opposite(h, tmesh);
ed=edge(h, tmesh); ed=edge(h, tmesh);
} while(!CGAL::Euler::satisfies_link_condition(ed,tmesh)); } while(!CGAL::Euler::does_satisfy_link_condition(ed,tmesh));
null_edges_to_remove.insert( ed ); null_edges_to_remove.insert( ed );
#endif #endif

View File

@ -1377,7 +1377,7 @@ std::size_t Mean_curvature_flow_skeletonization<TriangleMesh, Traits_, VertexPoi
// skip the edge is it became long enough // skip the edge is it became long enough
if ( !edge_should_be_collapsed(ed) ) continue; if ( !edge_should_be_collapsed(ed) ) continue;
if ( !Euler::satisfies_link_condition(ed,m_tmesh) ) if ( !Euler::does_satisfy_link_condition(ed,m_tmesh) )
{ {
non_topologically_valid_collapses.insert(ed); non_topologically_valid_collapses.insert(ed);
continue; continue;