added Jean Daniel stuff to Constrained_triangulation_2.h :

insertion and removal of a constraint
This commit is contained in:
Mariette Yvinec 1999-09-30 09:41:36 +00:00
parent 52f08435bf
commit a4e6bef758
2 changed files with 549 additions and 102 deletions

View File

@ -1,55 +1,41 @@
// ============================================================================
//
// Copyright (c) 1997 The CGAL Consortium
//
// This software and related documentation is part of an INTERNAL release
// of the Computational Geometry Algorithms Library (CGAL). It is not
// intended for general use.
//
// ----------------------------------------------------------------------------
//
// release :
// release_date :
//
// file : include/CGAL/Constrained_triangulation_2.h
// source : $RCSfile$
// revision : $Revision$
// revision_date : $Date$
// author(s) : Mariette Yvinec
//
// coordinator : Mariette Yvinec < Mariette Yvinec@sophia.inria.fr>
//
// ============================================================================
#ifndef CGAL_CONSTRAINED_TRIANGULATION_2_H
#define CGAL_CONSTRAINED_TRIANGULATION_2_H
#include <utility>
#include <list>
#include <vector>
//#include <vector>
#include <map>
#include <set>
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/Triangulation_2.h>
#include <CGAL/Triangulation_2.h>
#include <CGAL/Constrained_triangulation_face_base_2.h>
#include <CGAL/Constrained_triangulation_sweep_2.h>
CGAL_BEGIN_NAMESPACE
template < class Gt, class Tds>
class Constrained_triangulation_2 : public Triangulation_2<Gt,Tds>
class Constrained_triangulation_2 : public Triangulation_2<Gt,Tds>
{
public:
typedef Triangulation_2<Gt,Tds> Triangulation;
typedef Constrained_triangulation_2<Gt,Tds> Constrained_triangulation;
typedef Constrained_triangulation_2<Gt,Tds> Constrained_triangulation;
typedef Constrained_triangulation_sweep_2<Gt,Tds> Sweep;
typedef typename Triangulation::Edge Edge;
typedef typename Triangulation::Vertex_handle Vertex_handle;
typedef typename Triangulation::Face_handle Face_handle;
typedef Gt Geom_traits;
typedef typename Geom_traits::Point Point;
typedef std::pair<Point,Point> Constraint;
typedef Constrained_triangulation_sweep_2<Gt,Tds> Sweep;
typedef std::list<Edge> List_edges;
typedef std::list<Face_handle> List_faces;
//nouveau
class Less_edge;
typedef set<Edge,Less_edge> Edge_set;
//nouveau
Constrained_triangulation_2(const Gt& gt=Gt()) : Triangulation() { }
@ -59,74 +45,13 @@ public:
Constrained_triangulation_2(std::list<Constraint>& lc, const Gt& gt=Gt())
: Triangulation_2<Gt,Tds>(gt)
{
Sweep sweep(this, lc);
Sweep sweep(this,lc);
}
#ifdef CGAL_CFG_NO_MEMBER_TEMPLATES
#if defined(LIST_H) || defined(__SGI_STL_LIST_H)
Constrained_triangulation_2(std::list<Constraint>::const_iterator first,
std::list<Constraint>::const_iterator last,
const Gt& gt=Gt() )
: Triangulation_2<Gt,Tds>(gt)
{
std::list<Constraint> lc;
while(first != last){
lc.push_back(*first); ++first;
}
Sweep sweep(this, lc);
CGAL_triangulation_postcondition( is_valid() );
}
#endif // LIST_H
#if defined(VECTOR_H) || defined(__SGI_STL_VECTOR_H)
Constrained_triangulation_2(std::vector<Constraint>::const_iterator first,
std::vector<Constraint>::const_iterator last,
const Gt& gt=Gt() )
: Triangulation_2<Gt,Tds>(gt)
{
std::list<Constraint> lc;
while(first != last){
lc.push_back(*first); ++first;
}
Sweep sweep(this,lc);
}
#endif // VECTOR_H
#ifdef ITERATOR_H
Constrained_triangulation_2(
std::istream_iterator<Constraint,std::ptrdiff_t> first,
std::istream_iterator<Constraint,std::ptrdiff_t> last,
const Gt& gt=Gt() )
: Triangulation_2<Gt,Tds>(gt)
{
std::list<Constraint> lc;
while(first != last){
lc.push_back(*first); ++first;
}
Sweep sweep(this,lc);
CGAL_triangulation_postcondition( is_valid() );
}
#endif // ITERATOR_H
Constrained_triangulation_2(Constraint* first,
Constraint* last,
const Gt& gt=Gt() )
: Triangulation_2<Gt,Tds>(gt)
{
std::list<Constraint> lc;
while(first != last){
lc.push_back(*first); ++first;
}
Sweep sweep(this,lc);
CGAL_triangulation_postcondition( is_valid() );
}
#else
template<class InputIterator>
Constrained_triangulation_2(InputIterator first,
InputIterator last,
const Gt& gt=Gt() )
InputIterator last,
const Gt& gt=Gt() )
: Triangulation_2<Gt,Tds>(gt)
{
std::list<Constraint> lc;
@ -136,12 +61,534 @@ public:
Sweep sweep(this,lc);
CGAL_triangulation_postcondition( is_valid() );
}
#endif // CGAL_CFG_NO_MEMBER_TEMPLATES
// INSERTION
Vertex_handle insert_in_constrained_edge(const Point& a, Face_handle f, int i);
Vertex_handle insert(Point a);
void insert(Point a, Point b);
void insert(const Vertex_handle & va, const Vertex_handle & vb);
void insert(const Vertex_handle & va, const Vertex_handle & vb,
Face_handle & fr, int & i);
void insert(const Vertex_handle & va, const Vertex_handle & vb,
Face_handle & fr, int & i, List_edges & new_edges);
void remove(const Vertex_handle & v);
void remove_constraint(Face_handle f, int i);
void find_conflicts(Vertex_handle va, Vertex_handle & vb, List_edges & list_ab,
List_edges & list_ba);
void triangulate(List_edges & list_edges, List_faces & faces_to_be_removed);
void triangulate(List_edges & list_edges, List_faces &
faces_to_be_removed, List_edges & new_edges);
class Less_edge : binary_function<Edge, Edge, bool>
{
public:
Less_edge() {}
bool operator() (const Edge& e1, const Edge& e2) const
{
int ind1=e1.second, ind2=e2.second;
return( (&(*e1.first) < &(*e2.first))
|| ( (&(*e1.first) == &(*e2.first)) && (ind1 < ind2)));
}
};
};
template < class Gt, class Tds >
Constrained_triangulation_2<Gt,Tds>::Vertex_handle
Constrained_triangulation_2<Gt,Tds>::
insert_in_constrained_edge(const Point& a, Face_handle f, int i)
// inserts in a constrianed edge (f,i)=c1c2
// c1c2 is cut into two new constrained edges c1a and ac2
// the status (constrained or not) of the 4 edges incident to a
// is set
{
Vertex_handle c1,c2;
Face_handle ff, n;
int cwi, ccwi, indf, indn;
c1=f->vertex(ccw(i)); //endpoint of the constraint
c2=f->vertex(cw(i)); // endpoint of the constraint
Vertex_handle va = static_cast<Vertex*>(_tds.insert_in_edge(&(*f), i));
va->set_point(a);
// updates the constraints
if (dimension()==1) {
Edge_circulator ec=va->incident_edges(), done(ec);
do {
((*ec).first)->set_constraint(2,true);
}while (++ec != done);
return va;
}
//dimension() ==2
Face_circulator fc=va->incident_faces(), done(fc);
CGAL_triangulation_assertion(fc != 0);
do {
ff= fc->handle();
indf = ff->index(va);
cwi=cw(indf);
ccwi=ccw(indf);
n = ff->neighbor(indf);
indn=ff->mirror_index(indf);
if (n->is_constrained(indn)) {
ff->set_constraint(indf,true);
}
else {
ff->set_constraint(indf,false);
}
if ((ff->vertex(cwi) == c1)||(ff->vertex(cwi) == c2)) {
ff->set_constraint(ccwi,true);
ff->set_constraint(cwi,false);
}
else {
ff->set_constraint(ccwi,false);
ff->set_constraint(cwi,true);
}
++fc;
} while (fc != done);
return va;
}
template < class Gt, class Tds >
Constrained_triangulation_2<Gt,Tds>::Vertex_handle
Constrained_triangulation_2<Gt,Tds>::
insert(Point a)
// inserts point a
// in addition to what is done for non constrained triangulations
// constrained edges are updated
{
Vertex_handle va;
Face_handle f,n,start;
int indf,indn,li;
Locate_type lt;
start = locate(a, lt, li);
// a is a vertex
if (lt == VERTEX) {
return start->vertex(li);
}
// a belongs to the relative interior of a constrained edge
if ((lt == EDGE) && (start->is_constrained(li))) {
va = insert_in_constrained_edge(a, start,li);
return va;
}
// a does NOT belong to a constrained edge
va = Triangulation::insert(a,start);
// updates the status (constrained or not) of the edges
// of the new triangles (incident to a)
if (dimension()<2) {
return va;
}
f = va->face();
start = f;
do {
indf = f->index(va);
f->set_constraint(cw(indf),false); // edge incident to a
f->set_constraint(ccw(indf),false); // other edge incident to a
// edge opposite to a
n = f->neighbor(indf);
indn=f->mirror_index(indf);
if (n->is_constrained(indn)) {
f->set_constraint(indf,true);
}
else {
f->set_constraint(indf,false);
}
f= f->neighbor(ccw(indf)); // turns ccw around va
} while (f != start);
return va;
}
template < class Gt, class Tds >
inline void
Constrained_triangulation_2<Gt,Tds>::
insert(Point a, Point b)
// the algorithm first inserts a and b, then walks in t along ab, removes
// the triangles crossed by ab and creates new ones
// if a vertex c of t lies on segment ab, constraint ab is replaced by the
// two constraints ac and cb
// apart from the insertion of a and b, the algorithm runs in time
// proportionnal to the number of removed triangles
{
Vertex_handle va= insert(a);
Vertex_handle vb= insert(b);
insert(va, vb);
}
template < class Gt, class Tds >
inline void
Constrained_triangulation_2<Gt,Tds>::
insert(const Vertex_handle & va, const Vertex_handle & vb)
// Precondition va != vb
{
List_edges new_edges;
Face_handle fr;
int i;
insert(va, vb, fr, i, new_edges);
}
template < class Gt, class Tds >
inline void
Constrained_triangulation_2<Gt,Tds>::
insert(const Vertex_handle & va, const Vertex_handle & vb,
Face_handle & fr, int & i)
{
List_edges new_edges;
insert(va, vb, fr, i, new_edges);
}
template < class Gt, class Tds >
void
Constrained_triangulation_2<Gt,Tds>::
insert(const Vertex_handle & va, const Vertex_handle & vb,
Face_handle & fr, int & i, List_edges & new_edges)
// inserts line segment ab as a constraint (i.e. an edge) in triangulation t
// Precondition : the relative interior of ab must not intersect the
// relative interior of another constrained edge
// interior of another constrained edge of t
// precondition : the algorithm assumes that a and b are vertices of t
// walks in t along ab, removes the triangles intersected by ab and
// creates new ones
// fr is the face incident to edge ab and to the right of ab
// edge ab=(fr,i)
// the edges that are created are put in list new_edges
// the algorithm runs in time proportionnal to the number of removed triangles
{
Vertex_handle vaa=va, vbb;
Face_handle fl;
List_faces faces_to_be_removed;
do { // loop over the vertices lying on ab
vbb=vb;
// case where ab contains an edge of t incident to a
if(includes_edge(vaa,vbb,fr,i)) {
if (dimension()==1) fr->set_constraint(2, true);
else{
fr->set_constraint(ccw(fr->index(vaa)), true);
fl=fr->neighbor(i);
fl->set_constraint(cw(fl->index(vaa)), true);
}
}
else {
// ab does not contain an edge of t incident to a
// finds all triangles intersected by ab (in conflict)
List_edges conflict_boundary_ab, conflict_boundary_ba;
find_conflicts(vaa,vbb,conflict_boundary_ab,conflict_boundary_ba);
// removes the triangles in conflict and creates the new ones
triangulate(conflict_boundary_ab, faces_to_be_removed, new_edges);
triangulate(conflict_boundary_ba, faces_to_be_removed, new_edges);
// the two faces that share edge ab are neighbors
// their common edge ab is a constraint
fl=(*conflict_boundary_ab.begin()).first;
fr=(*conflict_boundary_ba.begin()).first;
fl->set_neighbor(2, fr);
fr->set_neighbor(2, fl);
fl->set_constraint(2, true);
fr->set_constraint(2, true);
i=2;
}
vaa=vbb;
} while (vbb != vb);
}
template < class Gt, class Tds >
void
Constrained_triangulation_2<Gt,Tds>::
remove(const Vertex_handle & v)
// remove a vertex and updates the constrained edges of the new faces
// all constraints incident to the removed vertex are removed
{
// finds the edges of the hole.
// not optimal since this is done again in Triangulation::remove()
Face_circulator fc = v->incident_faces(), done(fc);
List_edges shell_of_v;
Face_handle nc;
int indv, indn;
indv = fc->index(v);
do {
nc = fc->neighbor(indv);
indn = fc->mirror_index(indv);
if (nc->is_constrained(indn)) {
shell_of_v.push_back(Edge(nc,indn));
}
++fc;
} while (fc != done);
Triangulation :: remove(v);
// marked constrained edges of the new triangles
List_edges::iterator it_shell=shell_of_v.begin();
do {
nc=(*(it_shell)).first;
indn = (*(it_shell)).second;
(nc->neighbor(indn))->set_constraint(nc->mirror_index(indn), true);
++it_shell;
} while (it_shell != shell_of_v.end());
}
template < class Gt, class Tds >
void
Constrained_triangulation_2<Gt,Tds>::
remove_constraint(Face_handle f, int i)
{
f->set_constraint(i, false);
(f->neighbor(i))->set_constraint(f->mirror_index(i), false);
}
template < class Gt, class Tds >
void
Constrained_triangulation_2<Gt,Tds>::
find_conflicts(Vertex_handle va, Vertex_handle & vb,
List_edges & list_ab, List_edges & list_ba)
// finds all triangles intersected by ab
// if segment ab contains a vertex c, c becomes the new vertex vb and only triangles
// intersected by ac are reported
// returns the boundary B of the union of those triangles oriented cw
// B is represented by two lists of edges list_ab and list_ba
// list_ab consists of the edges from a to b (i.e. on the left of a->b)
// list_ba " " from b to a (i.e. on the right of a->b)
// an element of the lists (an edge e) is represented as the edge of
// the triangle incident to e that is not intersected by ab
{
Point a=va->point(), b=vb->point();
Line_face_circulator current_face=line_walk(a,b, va->face());
int ind=current_face->index(va);
Face_handle lf= current_face->neighbor(ccw(ind)),
rf= current_face->neighbor(cw(ind));
Orientation orient;
Face_handle previous_face;
Vertex_handle current_vertex;
list_ab.push_back(Edge(lf, lf->index(current_face)));
list_ba.push_front(Edge(rf, rf->index(current_face)));
// init
previous_face=current_face;
++current_face;
ind=current_face->index(previous_face); // NOT OPTIMAL
current_vertex=current_face->vertex(ind);
// loop over triangles intersected by ab
while (current_vertex != vb) {
orient = geom_traits().orientation(a,b,current_vertex->point());
switch (orient) {
case LEFTTURN :
lf= current_face->neighbor(cw(ind));
list_ab.push_back(Edge(lf, lf->index(current_face)));
previous_face=current_face;
++current_face;
ind=current_face->index(previous_face); // NOT OPTIMAL
current_vertex=current_face->vertex(ind);
break;
case RIGHTTURN :
rf= current_face->neighbor(ccw(ind));
list_ba.push_front(Edge(rf, rf->index(current_face)));
previous_face=current_face;
++current_face;
ind=current_face->index(previous_face); // NOT OPTIMAL
current_vertex=current_face->vertex(ind);
break;
case COLLINEAR :
vb=current_vertex; // new endpoint of the constraint
}
}
// last triangle (having (the possibly new) vb as a vertex)
lf= current_face->neighbor(cw(ind));
list_ab.push_back(Edge(lf, lf->index(current_face)));
rf= current_face->neighbor(ccw(ind));
list_ba.push_front(Edge(rf, rf->index(current_face)));
}
template < class Gt, class Tds >
void
Constrained_triangulation_2<Gt,Tds>::
triangulate(List_edges & list_edges, List_faces & faces_to_be_removed)
// triangulates the polygon whose boundary consists of list_edges
// plus the edge ab joining the two endpoints of list_edges
// the orientation of the polygon (as provided by list_edges) must
// be cw
// the edges of list_edges are assumed to be edges of a
// triangulation that will be updated by the procedure
// the faces intersecting ab are put in the list faces_to_be_removed
// takes linear time
{
List_edges new_edges;
triangulate(list_edges, faces_to_be_removed, new_edges);
}
template < class Gt, class Tds >
void
Constrained_triangulation_2<Gt,Tds>::
triangulate(List_edges & list_edges, List_faces &
faces_to_be_removed, List_edges & new_edges)
// triangulates the polygon whose boundary consists of list_edges
// plus the edge ab joining the two endpoints of list_edges
// the orientation of the polygon (as provided by list_edges) must
// be cw
// the edges of list_edges are assumed to be edges of a
// triangulation that will be updated by the procedure
// the faces intersecting ab are put in the list faces_to_be_removed
// the edges that are created are put in list new_edges
// takes linear time
{
Vertex_handle va,vb; // first and last vertices of list_edges
Face_handle newlf;
Face_handle n1,n2,n;
int ind1, ind2,ind;
Orientation orient;
List_edges :: iterator current, next, tempo;
current=list_edges.begin();
tempo=list_edges.end(); --tempo;
va=((*current).first)->vertex(ccw((*current).second));
vb=((*tempo).first)->vertex(cw((*tempo).second));
next=current;
++next;
do
{
n1=(*current).first;
ind1=(*current).second;
// in case n1 is no longer a triangle of the new triangulation
if (!((n1->neighbor(ind1)).is_null())) {
n=n1->neighbor(ind1);
faces_to_be_removed.push_back(n);
ind=n1->mirror_index(ind1);
n1=n->neighbor(ind);
ind1= n->mirror_index(ind);
}
n2=(*next).first;
ind2=(*next).second;
// in case n2 is no longer a triangle of the new triangulation
if (!((n2->neighbor(ind2)).is_null())) {
n=n2->neighbor(ind2);
faces_to_be_removed.push_back(n);
ind=n2->mirror_index(ind2);
n2=n->neighbor(ind);
ind2= n->mirror_index(ind);
}
Vertex_handle v0=n1->vertex(ccw(ind1));
Vertex_handle v1=n1->vertex(cw(ind1));
Vertex_handle v2=n2->vertex(cw(ind2));
orient= geom_traits().orientation(v0->point(),v1->point(),v2->point());
switch (orient) {
case RIGHTTURN :
// creates the new triangle v0v1v2
// updates the neighbors, the constraints and the list of
// new edges
newlf = new Face(v0,v2,v1);
new_edges.push_back(Edge(newlf,1));
newlf->set_neighbor(1, n1);
newlf->set_neighbor(0, n2);
n1->set_neighbor(ind1, newlf);
n2->set_neighbor(ind2, newlf);
if (n1->is_constrained(ind1)) {
newlf->set_constraint(1,true);
}
if (n2->is_constrained(ind2)) {
newlf->set_constraint(0,true);
}
// v0, v1 or v2.face() may have been removed
v0->set_face(newlf);
v1->set_face(newlf);
v2->set_face(newlf);
// update list_edges
tempo=current;
current=list_edges.insert(current, Edge(newlf,2));
list_edges.erase(tempo);
list_edges.erase(next);
next=current;
if (v0 != va) {--current;}
else {++next;}
break;
case LEFTTURN :
++current; ++next;
break;
case COLLINEAR :
++current; ++next;
break;
}
} while (list_edges.size()>1);
}
template < class Gt, class Tds >
ostream &
operator<<(ostream& os, const Constrained_triangulation_2<Gt,Tds> &Ct)
{
os << (Triangulation_2<Gt, Tds>) Ct;
typename Constrained_triangulation_2<Gt, Tds>::Face_iterator
it = Ct.faces_begin();
while(it != Ct.faces_end()){
for(int j = 0; j < 3; j++){
if (it->is_constrained(j)) {os << "C " ;}
else { os << "N ";}
if(is_ascii(os)){
if(j==2) {
os << "\n";
} else {
os << ' ';
}
}
}
++it;
}
typename Constrained_triangulation_2<Gt, Tds>::Face_circulator
fc = Ct.infinite_vertex()->incident_faces(),
done(fc);
do{
for(int j = 0; j < 3; j++){
if (fc->is_constrained(j)) { os << "C ";}
else { os << "N ";}
if(is_ascii(os)){
if(j==2) {
os << "\n";
} else {
os << ' ';
}
}
}
}while(++fc != done);
return os ;
}
CGAL_END_NAMESPACE
#endif //CGAL_CONSTRAINED_TRIANGULATION_2_H
#endif CGAL_CONSTRAINED_TRIANGULATION_2_H

View File

@ -571,9 +571,9 @@ includes_edge(Vertex_handle va, Vertex_handle & vb,
vb->point(),
v->point());
if((orient==COLLINEAR) &&
(are_ordered_along_line (va->point(),
v->point(),
vb->point()))) {
(collinear_between (va->point(),
v->point(),
vb->point()))) {
vb=v;
fr=(*ec).first;
i= (*ec).second;