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

Derecursify insert_constraint(Vhandle,Vhandle); Increment depth of propagating_flip()

This commit is contained in:
Andreas Fabri 2017-11-23 15:50:26 +00:00
parent 09b3ed55fc
commit 029888f85c
2 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
View File

@ -742,9 +742,9 @@ propagating_flip(Face_handle f,int i, int depth)
Face_handle ni = f->neighbor(i);
flip(f, i); // flip for constrained triangulations
propagating_flip(f,i);
propagating_flip(f,i, depth+1);
i = ni->index(f->vertex(i));
propagating_flip(ni,i);
propagating_flip(ni,i, depth+1);
#endif
}
#else

72
Triangulation_2/include/CGAL/Constrained_triangulation_2.h
View File

@ -649,45 +649,53 @@ insert_constraint(Vertex_handle vaa, Vertex_handle vbb)
// if a vertex vc of t lies on segment ab
// or if ab intersect some constrained edges
{
CGAL_triangulation_precondition( vaa != vbb);
Vertex_handle vi;
std::stack<std::pair<Vertex_handle, Vertex_handle> > stack;
stack.push(std::make_pair(vaa,vbb));
Face_handle fr;
int i;
if(includes_edge(vaa,vbb,vi,fr,i)) {
mark_constraint(fr,i);
if (vi != vbb) {
insert_constraint(vi,vbb);
while(! stack.empty()){
boost::tie(vaa,vbb) = stack.top();
stack.pop();
CGAL_triangulation_precondition( vaa != vbb);
Vertex_handle vi;
Face_handle fr;
int i;
if(includes_edge(vaa,vbb,vi,fr,i)) {
mark_constraint(fr,i);
if (vi != vbb) {
stack.push(std::make_pair(vi,vbb));
}
continue;
}
return;
}
List_faces intersected_faces;
List_edges conflict_boundary_ab, conflict_boundary_ba;
List_faces intersected_faces;
List_edges conflict_boundary_ab, conflict_boundary_ba;
bool intersection = find_intersected_faces( vaa, vbb,
intersected_faces,
conflict_boundary_ab,
conflict_boundary_ba,
vi);
if ( intersection) {
if (vi != vaa && vi != vbb) {
insert_constraint(vaa,vi);
insert_constraint(vi,vbb);
}
else insert_constraint(vaa,vbb);
return;
}
bool intersection = find_intersected_faces( vaa, vbb,
intersected_faces,
conflict_boundary_ab,
conflict_boundary_ba,
vi);
if ( intersection) {
if (vi != vaa && vi != vbb) {
stack.push(std::make_pair(vaa,vi));
stack.push(std::make_pair(vi,vbb));
}
else{
stack.push(std::make_pair(vaa,vbb));
}
continue;
}
//no intersection
triangulate_hole(intersected_faces,
conflict_boundary_ab,
conflict_boundary_ba);
//no intersection
triangulate_hole(intersected_faces,
conflict_boundary_ab,
conflict_boundary_ba);
if (vi != vbb) {
insert_constraint(vi,vbb);
if (vi != vbb) {
stack.push(std::make_pair(vi,vbb));
}
}
return;
}