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

improving the doc

This commit is contained in:
Sébastien Loriot 2018-03-16 09:16:17 +01:00 committed by Maxime Gimeno
parent 5fa7181360
commit ad813dc4fe
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Triangulation_2/doc/Triangulation_2/CGAL/Constrained_triangulation_2.h
View File

@ -46,9 +46,12 @@ There are three versions of constrained triangulations
<LI>In the basic version, the constrained triangulation <LI>In the basic version, the constrained triangulation
does not handle intersecting constraints, and the set of input does not handle intersecting constraints, and the set of input
constraints is required to be a set of polylines that do not intersect constraints is required to be a set of polylines that do not intersect
except possibly at their endpoints. Any number of constrained edges except possibly at their endpoints.
may share the same endpoint. Constrained edges may be vertical or An exception of type `Intersection_of_constraints_exception`
have zero length. is thrown upon insertion of a constraint intersecting in
its interior an already inserted constraint.
Any number of constrained edges may share the same endpoint.
Constrained edges may be vertical or have zero length.
<LI>The two other versions support intersecting input constraints. <LI>The two other versions support intersecting input constraints.
In those versions, input constraints may consist of In those versions, input constraints may consist of
intersecting, overlapping or partially intersecting, overlapping or partially
@ -329,7 +332,9 @@ Note that `t` is first cleared.
*/ */
istream& operator>>(istream& is,Constrained_triangulation_2<Traits,Tds> Ct& t); istream& operator>>(istream& is,Constrained_triangulation_2<Traits,Tds> Ct& t);
//! Exception thrown for `intersect()` when called with the tag `No_intersection_tag`. /*! Exception used by constrained triangulations configured with
//! Then, if constraints intersect, an exception of this type will be thrown. the tag `No_intersection_tag`. It is thrown upon insertion of a constraint
that is intersecting an already inserted constraint in its interior.
*/
class Intersection_of_constraints_exception; class Intersection_of_constraints_exception;
} /* end namespace CGAL */ } /* end namespace CGAL */

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

@ -888,14 +888,14 @@ intersect(Face_handle f, int i,
// split constraint edge (f,i) // split constraint edge (f,i)
// and return the Vertex_handle of the new Vertex // and return the Vertex_handle of the new Vertex
{ {
#ifndef CGAL_NO_WARNING_WHEN_USING_CDT_PLUS_WHILE_INTERSECTING_CONSTRAINTS #ifndef CGAL_NO_CDT_2_WARNING
CGAL_warning_msg(false, CGAL_warning_msg(false,
"You are using an exact number type\n" "You are using an exact number type,\n"
"using a Constrained_triangulation_plus_2 class\n" "using a Constrained_triangulation_plus_2 class\n"
"would avoid cascading intersection computation\n" "would avoid cascading intersection computation\n"
" and be much more efficient\n" " and be much more efficient\n"
"This message is shown only when not using " "This message is shown only if CGAL_NO_CDT_2_WARNING"
"CGAL_NO_WARNING_WHEN_USING_CDT_PLUS_WHILE_INTERSECTING_CONSTRAINTS.\n"); "is not defined.\n");
#endif #endif
const Point& pa = vaa->point(); const Point& pa = vaa->point();
const Point& pb = vbb->point(); const Point& pb = vbb->point();