songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5438 from GilesBathgate/performance-object-index 

Calculate indices only when required.
This commit is contained in:
Laurent Rineau 2021-03-24 15:05:34 +01:00
parent 0e49e18bd3 9c6712c3b1
commit 1686e05d3f
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h
View File

@ -273,36 +273,44 @@ The macros are then |CGAL_forall_svertices(v,M)|,
|CGAL_forall_sfaces(f,M)|, |CGAL_forall_sface_cycles_of(fc,F)|
where |M| is a sphere map and |F| is a sface.}*/
private:
std::string get_svertex_index(SVertex_const_handle) const;
}; // SM_const_decorator
template <typename SM_>
std::string SM_const_decorator<SM_>::
get_svertex_index(SVertex_const_handle v) const
{
Object_index<SVertex_const_handle>
VI(svertices_begin(),svertices_end(),'v');
return VI(v);
}
template <typename SM_>
void SM_const_decorator<SM_>::
check_integrity_and_topological_planarity(bool faces) const
{
CGAL_NEF_TRACEN("check_integrity_and_topological_planarity:");
using CGAL::Object_index;
Object_index<SVertex_const_iterator>
VI(svertices_begin(),svertices_end(),'v');
#ifdef CGAL_USE_TRACE
Object_index<SHalfedge_const_iterator>
EI(shalfedges_begin(),shalfedges_end(),'e');
Object_index<SFace_const_iterator>
FI(sfaces_begin(),sfaces_end(),'f');
#endif
SVertex_const_handle v;
int iso_vert_num=0;
/* check the source links of out edges and count isolated vertices */
CGAL_forall_svertices(v,*this) {
if ( is_isolated(v) ) {
if ( faces )
CGAL_assertion_msg(v->incident_sface() != SFace_const_handle(), VI(v).c_str());
CGAL_assertion_msg(v->incident_sface() != SFace_const_handle(), get_svertex_index(v).c_str());
++iso_vert_num;
} else {
CGAL_assertion_msg(first_out_edge(v) != SHalfedge_const_handle(),
VI(v).c_str());
CGAL_NEF_TRACEN(v->point()<<" "<<EI(first_out_edge(v)));
CGAL_assertion_msg(first_out_edge(v)->source() == v,
VI(v).c_str());
CGAL_assertion_code(SHalfedge_const_handle e=first_out_edge(v));
CGAL_assertion_msg(e != SHalfedge_const_handle(), get_svertex_index(v).c_str());
CGAL_NEF_TRACEN(v->point()<<" "<<EI[first_out_edge(v)]);
CGAL_assertion_msg(e->source() == v, get_svertex_index(v).c_str());
}
}