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

Remove duplicate code in SNC_const_decorator/SNC_decorator

This commit is contained in:
Giles Bathgate 2021-05-10 18:26:29 +01:00
parent e7b91b92b8
commit 77054d4f2a
3 changed files with 81 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
Nef_3/include/CGAL/Nef_3/SNC_const_decorator.h
View File

@ -162,8 +162,8 @@ public:
{ return Segment_3(e->source()->point(), { return Segment_3(e->source()->point(),
e->twin()->source()->point()); } e->twin()->source()->point()); }
template <typename Visitor> template <typename Visitor, typename Traits = Self::Decorator_traits>
void visit_shell_objects(SFace_const_handle f, Visitor& V) const; void visit_shell_objects(typename Traits::SFace_handle f, Visitor& V) const;
Vertex_const_iterator vertices_begin() const { Vertex_const_iterator vertices_begin() const {
return this->sncp()->vertices_begin(); } return this->sncp()->vertices_begin(); }
@ -555,84 +555,116 @@ public:
} }
}; };
/* visiting shell objects:
Objects are marked as done, when placed in the output list. We have
to maintain a stack of sface candidates (the spherical rubber sectors
that provide connectivity at the local graphs of vertices) and facet
candiates (the plane pieces in three space also providing
connectivity). Note that we have to take care about the orientation of
sobjects and facets. We have to take care that (1) the search along
the shell extends along the whole shell structure (2) does not visit
any object twice, and (3) all 3-space objects have to be reported and
this also just once.
The facets and sfaces are marked |done| when they are put into their
corresponding queues thus each such object is visited exactly once
when taken out of the queue.
When an sface |sf| is taken out of the queue |SFaceCandiates| its
boundary structure is examined and all 2-skeleton objects (vertices
and edges of 3-space) that are incident to the volume represented by
|sf| are reported. Facets are reported when they are taken out of
|FacetCandiates|.
*/
template <typename EW> template <typename EW>
template <typename Visitor> template <typename Visitor, typename Traits>
void SNC_const_decorator<EW>:: void SNC_const_decorator<EW>::
visit_shell_objects(SFace_const_handle f, Visitor& V) const visit_shell_objects(typename Traits::SFace_handle f, Visitor& V) const
{ {
std::list<SFace_const_handle> SFaceCandidates; typedef typename Traits::Halffacet_cycle_iterator Halffacet_cycle_iterator;
std::list<Halffacet_const_handle> FacetCandidates; typedef typename Traits::Halffacet_handle Halffacet_handle;
CGAL::Unique_hash_map<SFace_const_handle,bool> DoneSF(false); typedef typename Traits::SFace_cycle_iterator SFace_cycle_iterator;
CGAL::Unique_hash_map<Vertex_const_handle,bool> DoneV(false); typedef typename Traits::SFace_handle SFace_handle;
CGAL::Unique_hash_map<SVertex_const_handle,bool> DoneSV(false); typedef typename Traits::SHalfedge_around_facet_circulator SHalfedge_around_facet_circulator;
CGAL::Unique_hash_map<Halffacet_const_handle,bool> DoneF(false); typedef typename Traits::SHalfedge_around_sface_circulator SHalfedge_around_sface_circulator;
SFaceCandidates.push_back(f); DoneSF[f] = true; typedef typename Traits::SHalfedge_handle SHalfedge_handle;
typedef typename Traits::SHalfloop_handle SHalfloop_handle;
typedef typename Traits::SM_decorator SM_decorator;
typedef typename Traits::SVertex_handle SVertex_handle;
std::list<SFace_handle> SFaceCandidates;
std::list<Halffacet_handle> FacetCandidates;
CGAL::Generic_handle_map<bool> Done(false);
SFaceCandidates.push_back(f); Done[f] = true;
while ( true ) { while ( true ) {
if ( SFaceCandidates.empty() && FacetCandidates.empty() ) break; if ( SFaceCandidates.empty() && FacetCandidates.empty() ) break;
if ( !FacetCandidates.empty() ) { if ( !FacetCandidates.empty() ) {
Halffacet_const_handle f = *FacetCandidates.begin(); Halffacet_handle f = *FacetCandidates.begin();
FacetCandidates.pop_front(); FacetCandidates.pop_front();
V.visit(f); // report facet V.visit(f); // report facet
Halffacet_cycle_const_iterator fc; Halffacet_cycle_iterator fc;
CGAL_forall_facet_cycles_of(fc,f) { CGAL_forall_facet_cycles_of(fc,f) {
if (fc.is_shalfedge() ) { if (fc.is_shalfedge() ) {
SHalfedge_const_handle e(fc); SHalfedge_handle e(fc);
SHalfedge_const_handle she; SHalfedge_handle she;
SHalfedge_around_facet_const_circulator ec(e),ee(e); SHalfedge_around_facet_circulator ec(e),ee(e);
CGAL_For_all(ec,ee) { she = ec->twin(); CGAL_For_all(ec,ee) { she = ec->twin();
if ( DoneSF[she->incident_sface()] ) continue; if ( Done[she->incident_sface()] ) continue;
SFaceCandidates.push_back(she->incident_sface()); SFaceCandidates.push_back(she->incident_sface());
DoneSF[she->incident_sface()] = true; Done[she->incident_sface()] = true;
} }
} else if (fc.is_shalfloop() ) { } else if (fc.is_shalfloop() ) {
SHalfloop_const_handle l(fc); SHalfloop_handle l(fc);
SHalfloop_const_handle ll = l->twin(); SHalfloop_handle ll = l->twin();
if ( DoneSF[ll->incident_sface()] ) continue; if ( Done[ll->incident_sface()] ) continue;
SFaceCandidates.push_back(ll->incident_sface()); SFaceCandidates.push_back(ll->incident_sface());
DoneSF[ll->incident_sface()] = true; Done[ll->incident_sface()] = true;
} else CGAL_error_msg("Damn wrong handle."); } else CGAL_error_msg("Damn wrong handle.");
} }
} }
if ( !SFaceCandidates.empty() ) { if ( !SFaceCandidates.empty() ) {
SFace_const_handle sf = *SFaceCandidates.begin(); SFace_handle sf = *SFaceCandidates.begin();
SFaceCandidates.pop_front(); SFaceCandidates.pop_front();
V.visit(sf); V.visit(sf);
if ( !DoneV[sf->center_vertex()] ) if ( !Done[sf->center_vertex()] )
V.visit(sf->center_vertex()); // report vertex V.visit(sf->center_vertex()); // report vertex
DoneV[sf->center_vertex()] = true; Done[sf->center_vertex()] = true;
// SVertex_const_handle sv; // SVertex_const_handle sv;
SM_const_decorator SD(&*sf->center_vertex()); SM_decorator SD(&*sf->center_vertex());
/* /*
CGAL_forall_svertices(sv,SD){ CGAL_forall_svertices(sv,SD){
if(SD.is_isolated(sv) && !DoneSV[sv]) if(SD.is_isolated(sv) && !DoneSV[sv])
V.visit(sv); V.visit(sv);
} }
*/ */
SFace_cycle_const_iterator fc; SFace_cycle_iterator fc;
CGAL_forall_sface_cycles_of(fc,sf) { CGAL_forall_sface_cycles_of(fc,sf) {
if (fc.is_shalfedge() ) { if (fc.is_shalfedge() ) {
SHalfedge_const_handle e(fc); SHalfedge_handle e(fc);
SHalfedge_around_sface_const_circulator ec(e),ee(e); SHalfedge_around_sface_circulator ec(e),ee(e);
CGAL_For_all(ec,ee) { CGAL_For_all(ec,ee) {
V.visit(SHalfedge_const_handle(ec)); V.visit(SHalfedge_handle(ec));
SVertex_const_handle vv = ec->twin()->source(); SVertex_handle vv = ec->twin()->source();
if ( !SD.is_isolated(vv) && !DoneSV[vv] ) { if ( !SD.is_isolated(vv) && !Done[vv] ) {
V.visit(vv); // report edge V.visit(vv); // report edge
DoneSV[vv] = DoneSV[vv->twin()] = true; Done[vv] = Done[vv->twin()] = true;
} }
Halffacet_const_handle f = ec->twin()->facet(); Halffacet_handle f = ec->twin()->facet();
if ( DoneF[f] ) continue; if ( Done[f] ) continue;
FacetCandidates.push_back(f); DoneF[f] = true; FacetCandidates.push_back(f); Done[f] = true;
} }
} else if (fc.is_svertex() ) { } else if (fc.is_svertex() ) {
SVertex_const_handle v(fc); SVertex_handle v(fc);
if ( DoneSV[v] ) continue; if ( Done[v] ) continue;
V.visit(v); // report edge V.visit(v); // report edge
V.visit(v->twin()); V.visit(v->twin());
DoneSV[v] = DoneSV[v->twin()] = true; Done[v] = Done[v->twin()] = true;
CGAL_assertion(SD.is_isolated(v)); CGAL_assertion(SD.is_isolated(v));
SFaceCandidates.push_back(v->twin()->incident_sface()); SFaceCandidates.push_back(v->twin()->incident_sface());
DoneSF[v->twin()->incident_sface()]=true; Done[v->twin()->incident_sface()]=true;
// note that v is isolated, thus twin(v) is isolated too // note that v is isolated, thus twin(v) is isolated too
// SM_const_decorator SD; // SM_const_decorator SD;
// SFace_const_handle fo; // SFace_const_handle fo;
@ -644,11 +676,11 @@ visit_shell_objects(SFace_const_handle f, Visitor& V) const
fo = v->twin()->incident_sface(); fo = v->twin()->incident_sface();
*/ */
} else if (fc.is_shalfloop() ) { } else if (fc.is_shalfloop() ) {
SHalfloop_const_handle l(fc); SHalfloop_handle l(fc);
V.visit(l); V.visit(l);
Halffacet_const_handle f = l->twin()->facet(); Halffacet_handle f = l->twin()->facet();
if ( DoneF[f] ) continue; if ( Done[f] ) continue;
FacetCandidates.push_back(f); DoneF[f] = true; FacetCandidates.push_back(f); Done[f] = true;
} else CGAL_error_msg("Damn wrong handle."); } else CGAL_error_msg("Damn wrong handle.");
} }
} }

131
Nef_3/include/CGAL/Nef_3/SNC_decorator.h
View File

@ -824,8 +824,9 @@ class SNC_decorator : public SNC_const_decorator<Map> {
return valid; return valid;
} }
template <typename Visitor> template <typename Visitor, typename Traits = Self::Decorator_traits>
void visit_shell_objects(SFace_handle f, Visitor& V) const; void visit_shell_objects(typename Traits::SFace_handle f, Visitor& V) const
{ Base::template visit_shell_objects<Visitor, Traits>(f, V); }
Vertex_iterator vertices_begin() { return sncp()->vertices_begin(); } Vertex_iterator vertices_begin() { return sncp()->vertices_begin(); }
Vertex_iterator vertices_end() { return sncp()->vertices_end(); } Vertex_iterator vertices_end() { return sncp()->vertices_end(); }
@ -866,131 +867,5 @@ class SNC_decorator : public SNC_const_decorator<Map> {
}; };
/* visiting shell objects:
Objects are marked as done, when placed in the output list. We have
to maintain a stack of sface candidates (the spherical rubber sectors
that provide connectivity at the local graphs of vertices) and facet
candiates (the plane pieces in three space also providing
connectivity). Note that we have to take care about the orientation of
sobjects and facets. We have to take care that (1) the search along
the shell extends along the whole shell structure (2) does not visit
any object twice, and (3) all 3-space objects have to be reported and
this also just once.
The facets and sfaces are marked |done| when they are put into their
corresponding queues thus each such object is visited exactly once
when taken out of the queue.
When an sface |sf| is taken out of the queue |SFaceCandiates| its
boundary structure is examined and all 2-skeleton objects (vertices
and edges of 3-space) that are incident to the volume represented by
|sf| are reported. Facets are reported when they are taken out of
|FacetCandiates|.
*/
template <typename EW>
template <typename Visitor>
void SNC_decorator<EW>::
visit_shell_objects(SFace_handle f, Visitor& V) const
{
typedef typename SM_decorator::SHalfedge_around_sface_circulator
SHalfedge_around_sface_circulator;
std::list<SFace_handle> SFaceCandidates;
std::list<Halffacet_handle> FacetCandidates;
CGAL::Generic_handle_map<bool> Done(false);
SFaceCandidates.push_back(f); Done[f] = true;
while ( true ) {
if ( SFaceCandidates.empty() && FacetCandidates.empty() ) break;
if ( !FacetCandidates.empty() ) {
Halffacet_handle f = *FacetCandidates.begin();
FacetCandidates.pop_front();
V.visit(f); // report facet
Halffacet_cycle_iterator fc;
CGAL_forall_facet_cycles_of(fc,f) {
if (fc.is_shalfedge() ) {
SHalfedge_handle e(fc);
SHalfedge_around_facet_circulator ec(e),ee(e);
CGAL_For_all(ec,ee) { e = ec->twin();
if ( Done[e->incident_sface()] ) continue;
SFaceCandidates.push_back(e->incident_sface());
Done[e->incident_sface()] = true;
}
} else if (fc.is_shalfloop()) {
SHalfloop_handle l(fc);
l = l->twin();
if ( Done[l->incident_sface()] ) continue;
SFaceCandidates.push_back(l->incident_sface());
Done[l->incident_sface()] = true;
} else CGAL_error_msg("Damn wrong handle.");
}
}
if ( !SFaceCandidates.empty() ) {
SFace_handle sf = *SFaceCandidates.begin();
SFaceCandidates.pop_front();
V.visit(sf); // report sface
if ( !Done[sf->center_vertex()] )
V.visit(sf->center_vertex()); // report vertex
Done[sf->center_vertex()] = true;
// SVertex_handle sv;
SM_decorator SD(&*sf->center_vertex());
/*
CGAL_forall_svertices(sv,SD){
if(SD.is_isolated(sv) && !Done[sv])
V.visit(sv);
}
*/
SFace_cycle_iterator fc;
CGAL_forall_sface_cycles_of(fc,sf) {
if ( fc.is_shalfedge() ) {
SHalfedge_handle e(fc);
SHalfedge_around_sface_circulator ec(e),ee(e);
CGAL_For_all(ec,ee) {
V.visit(SHalfedge_handle(ec));
SVertex_handle v = ec->twin()->source();
if ( !SD.is_isolated(v) && !Done[v] ) {
V.visit(v); // report edge
Done[v] = Done[v->twin()] = true;
}
Halffacet_handle f = ec->twin()->facet();
if ( Done[f] ) continue;
FacetCandidates.push_back(f); Done[f] = true;
}
} else if ( fc.is_svertex() ) {
SVertex_handle v(fc);
if ( Done[v] ) continue;
V.visit(v); // report edge
V.visit(v->twin());
Done[v] = Done[v->twin()] = true;
CGAL_assertion(SD.is_isolated(v));
SFaceCandidates.push_back(v->twin()->incident_sface());
Done[v->twin()->incident_sface()]=true;
// note that v is isolated, thus v->twin() is isolated too
// SM_decorator SD;
// SFace_handle fo;
// fo = v->twin()->incident_sface();
/*
if(SD.is_isolated(v))
fo = v->source()->sfaces_begin();
else
fo = v->twin()->incident_sface();
*/
// if ( Done[fo] ) continue;
// SFaceCandidates.push_back(fo); Done[fo] = true;
} else if (fc.is_shalfloop()) {
SHalfloop_handle l(fc);
V.visit(l);
Halffacet_handle f = l->twin()->facet();
if ( Done[f] ) continue;
FacetCandidates.push_back(f); Done[f] = true;
} else CGAL_error_msg("Damn wrong handle.");
}
}
}
}
} //namespace CGAL } //namespace CGAL
#endif //CGAL_SNC_DECORATOR_H #endif //CGAL_SNC_DECORATOR_H

4
Nef_S2/include/CGAL/Nef_S2/Generic_handle_map.h
View File

@ -37,11 +37,11 @@ public:
template <class H> template <class H>
const I& operator[](H h) const const I& operator[](H h) const
{ return Base::operator[](&*h); } { return Base::operator[]((void*)&*h); }
template <class H> template <class H>
I& operator[](H h) I& operator[](H h)
{ return Base::operator[](&*h); } { return Base::operator[]((void*)&*h); }
}; };