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

overload of star_hole in Constrained_triangulation_2.h 

to restore constraint status
This commit is contained in:
Mariette Yvinec 2002-01-14 17:17:51 +00:00
parent a2e9d1fc6c
commit 2fbb50d2d9
6 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Packages/Triangulation_2/changes.txt
View File

@ -3,6 +3,7 @@ constrained and regular triangulations with tests and examples.
Ver 5.24 ()
- fixes demo Delaunay
- fixes a bug in star_hole()
Ver 5.23 (8/1/01)
- changes prefixes to CGAL_CLIB_STD in front of ptrdiff_t and size_t

1
Packages/Triangulation_2/doc_tex/Triangulation_2_ref/main.tex
View File

@ -9,6 +9,7 @@
\input{Triangulation_2_ref/Constrained_Delaunay_triangulation_2.tex}
\input{Triangulation_2_ref/Constrained_triangulation_2.tex}
\input{Triangulation_2_ref/Constrained_triangulation_plus_2.tex}
%\input{Triangulation_2_ref/Constrained_triangulation_demo_2.tex}
\input{Triangulation_2_ref/Delaunay_triangulation_2.tex}
\input{Triangulation_2_ref/Delaunay_triangulation_traits_2.tex}

1
Packages/Triangulation_2/doc_tex/basic/Triangulation_2_ref/main.tex
View File

@ -9,6 +9,7 @@
\input{Triangulation_2_ref/Constrained_Delaunay_triangulation_2.tex}
\input{Triangulation_2_ref/Constrained_triangulation_2.tex}
\input{Triangulation_2_ref/Constrained_triangulation_plus_2.tex}
%\input{Triangulation_2_ref/Constrained_triangulation_demo_2.tex}
\input{Triangulation_2_ref/Delaunay_triangulation_2.tex}
\input{Triangulation_2_ref/Delaunay_triangulation_traits_2.tex}

4
Packages/Triangulation_2/examples/Triangulation_2/Makefile
View File

@ -5,8 +5,8 @@
#---------------------------------------------------------------------#
# Choose the right include file from the <cgalroot>/make directory.
CGAL_MAKEFILE = $(UTIL)/CGAL/CGAL-I/make/makefile_i686_Linux-2.2.18_g++-2.95.3
include $(CGAL_MAKEFILE)
CGAL_MAKEFILE = $(UTIL)/CGAL/CGAL-I/make/makefile_i686_Linux-2.2.18_g++-2.95
include $(CGAL_MAKEFILE)
#---------------------------------------------------------------------#

44
Packages/Triangulation_2/include/CGAL/Constrained_triangulation_2.h
View File

@ -133,6 +133,50 @@ public:
// bool are_there_incident_constraints(Vertex_handle v,
// OutputIterator out) const;
// the following fonctions are overloaded
// to take care od constraint marks
template<class EdgeIt>
Vertex_handle star_hole( Point p,
EdgeIt edge_begin,
EdgeIt edge_end){
std::list<Face_handle> empty_list;
return star_hole(p,
edge_begin,
edge_end,
empty_list.begin(),
empty_list.end());
}
template<class EdgeIt, class FaceIt>
Vertex_handle star_hole( Point p,
EdgeIt edge_begin,
EdgeIt edge_end,
FaceIt face_begin,
FaceIt face_end)
{
Vertex_handle v = Triangulation::star_hole(p,
edge_begin,
edge_end,
face_begin,
face_end);
EdgeIt eit;
Face_handle fh;
int ih;
for(eit=edge_begin; eit != edge_end; eit++) {
fh = (*eit).first;
ih = (*eit).second;
if(fh->is_constrained(ih))
fh->neighbor(ih)->set_constraint(fh->neighbor(ih)->index(fh),
true);
}
return v;
}
class Less_edge
: public std::binary_function<Edge, Edge, bool>
{

2
Packages/Triangulation_2/test/Triangulation_2_Delaunay/Makefile
View File

@ -5,7 +5,7 @@
# Choose the right include file from the <cgalroot>/make directory.
CGAL_MAKEFILE = /0/prisme_util/CGAL/CGAL-I/make/makefile_i686_Linux-2.2.18_g++-2.95.3_LEDA
CGAL_MAKEFILE = /0/prisme_util/CGAL/CGAL-I/make/makefile_i686_Linux-2.2.18_g++-2.95_LEDA
include $(CGAL_MAKEFILE)