diff --git a/Packages/Triangulation_2/changes.txt b/Packages/Triangulation_2/changes.txt index 48c1b1ae341..844c967c152 100644 --- a/Packages/Triangulation_2/changes.txt +++ b/Packages/Triangulation_2/changes.txt @@ -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 diff --git a/Packages/Triangulation_2/doc_tex/Triangulation_2_ref/main.tex b/Packages/Triangulation_2/doc_tex/Triangulation_2_ref/main.tex index ce29a1380be..f5dc60aa969 100644 --- a/Packages/Triangulation_2/doc_tex/Triangulation_2_ref/main.tex +++ b/Packages/Triangulation_2/doc_tex/Triangulation_2_ref/main.tex @@ -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} diff --git a/Packages/Triangulation_2/doc_tex/basic/Triangulation_2_ref/main.tex b/Packages/Triangulation_2/doc_tex/basic/Triangulation_2_ref/main.tex index ce29a1380be..f5dc60aa969 100644 --- a/Packages/Triangulation_2/doc_tex/basic/Triangulation_2_ref/main.tex +++ b/Packages/Triangulation_2/doc_tex/basic/Triangulation_2_ref/main.tex @@ -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} diff --git a/Packages/Triangulation_2/examples/Triangulation_2/Makefile b/Packages/Triangulation_2/examples/Triangulation_2/Makefile index d5bcb7b08d8..23caeb85516 100644 --- a/Packages/Triangulation_2/examples/Triangulation_2/Makefile +++ b/Packages/Triangulation_2/examples/Triangulation_2/Makefile @@ -5,8 +5,8 @@ #---------------------------------------------------------------------# # Choose the right include file from the /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) #---------------------------------------------------------------------# diff --git a/Packages/Triangulation_2/include/CGAL/Constrained_triangulation_2.h b/Packages/Triangulation_2/include/CGAL/Constrained_triangulation_2.h index 685785409ec..0db914dc6a6 100644 --- a/Packages/Triangulation_2/include/CGAL/Constrained_triangulation_2.h +++ b/Packages/Triangulation_2/include/CGAL/Constrained_triangulation_2.h @@ -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 + Vertex_handle star_hole( Point p, + EdgeIt edge_begin, + EdgeIt edge_end){ + std::list empty_list; + return star_hole(p, + edge_begin, + edge_end, + empty_list.begin(), + empty_list.end()); + } + + template + 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 { diff --git a/Packages/Triangulation_2/test/Triangulation_2_Delaunay/Makefile b/Packages/Triangulation_2/test/Triangulation_2_Delaunay/Makefile index afc852b28fa..10d4bdd37a0 100644 --- a/Packages/Triangulation_2/test/Triangulation_2_Delaunay/Makefile +++ b/Packages/Triangulation_2/test/Triangulation_2_Delaunay/Makefile @@ -5,7 +5,7 @@ # Choose the right include file from the /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)