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

API revisited

This commit is contained in:
Efi Fogel 2007-11-21 10:24:59 +00:00
parent f17b5d1eaf
commit 27e6ca3fe4
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2_impl.h
View File

@ -131,9 +131,9 @@ _construct_singleton_diagram (const X_monotone_curve_2& cv,
CGAL_assertion (out_d.leftmost()->is_empty()); CGAL_assertion (out_d.leftmost()->is_empty());
// Check if the given curve is bounded from the left and from the right. // Check if the given curve is bounded from the left and from the right.
if (traits->boundary_in_x_2_object() (cv, MIN_END) != NO_BOUNDARY) if (traits->boundary_in_x_2_object() (cv, ARR_MIN_END) != NO_BOUNDARY)
{ {
if (traits->boundary_in_x_2_object() (cv, MAX_END) != NO_BOUNDARY) if (traits->boundary_in_x_2_object() (cv, ARR_MAX_END) != NO_BOUNDARY)
{ {
// The curve is defined over (-oo, oo), so its diagram contains // The curve is defined over (-oo, oo), so its diagram contains
// only a single edge. // only a single edge.
@ -145,7 +145,7 @@ _construct_singleton_diagram (const X_monotone_curve_2& cv,
// The curve is defined over (-oo, x], where x is finite. // The curve is defined over (-oo, x], where x is finite.
// Create a vertex and associate it with the right endpoint of cv. // Create a vertex and associate it with the right endpoint of cv.
CGAL_precondition CGAL_precondition
(traits->boundary_in_y_2_object() (cv, MAX_END) == NO_BOUNDARY); (traits->boundary_in_y_2_object() (cv, ARR_MAX_END) == NO_BOUNDARY);
Vertex_handle v = Vertex_handle v =
out_d.new_vertex (traits->construct_max_vertex_2_object() (cv)); out_d.new_vertex (traits->construct_max_vertex_2_object() (cv));
@ -165,12 +165,12 @@ _construct_singleton_diagram (const X_monotone_curve_2& cv,
return; return;
} }
if (traits->boundary_in_x_2_object() (cv, MAX_END) != NO_BOUNDARY) if (traits->boundary_in_x_2_object() (cv, ARR_MAX_END) != NO_BOUNDARY)
{ {
// The curve is defined over [x, +oo), where x is finite. // The curve is defined over [x, +oo), where x is finite.
// Create a vertex and associate it with the left endpoint of cv. // Create a vertex and associate it with the left endpoint of cv.
CGAL_precondition CGAL_precondition
(traits->boundary_in_y_2_object() (cv, MIN_END) == NO_BOUNDARY); (traits->boundary_in_y_2_object() (cv, ARR_MIN_END) == NO_BOUNDARY);
Vertex_handle v = Vertex_handle v =
out_d.new_vertex (traits->construct_min_vertex_2_object() (cv)); out_d.new_vertex (traits->construct_min_vertex_2_object() (cv));
@ -197,9 +197,9 @@ _construct_singleton_diagram (const X_monotone_curve_2& cv,
// -oo -------------(+)============(+)------------ +oo // -oo -------------(+)============(+)------------ +oo
// //
CGAL_precondition CGAL_precondition
(traits->boundary_in_y_2_object() (cv, MIN_END) == NO_BOUNDARY); (traits->boundary_in_y_2_object() (cv, ARR_MIN_END) == NO_BOUNDARY);
CGAL_precondition CGAL_precondition
(traits->boundary_in_y_2_object() (cv, MAX_END) == NO_BOUNDARY); (traits->boundary_in_y_2_object() (cv, ARR_MAX_END) == NO_BOUNDARY);
Vertex_handle v1 = Vertex_handle v1 =
out_d.new_vertex (traits->construct_min_vertex_2_object() (cv)); out_d.new_vertex (traits->construct_min_vertex_2_object() (cv));
@ -618,9 +618,9 @@ _merge_two_intervals (Edge_const_handle e1, bool is_leftmost1,
// Get the endpoints of the overlapping curves. // Get the endpoints of the overlapping curves.
const bool has_left = const bool has_left =
(traits->boundary_in_x_2_object() (icv, MIN_END) == NO_BOUNDARY); (traits->boundary_in_x_2_object() (icv, ARR_MIN_END) == NO_BOUNDARY);
const bool has_right = const bool has_right =
(traits->boundary_in_x_2_object() (icv, MAX_END) == NO_BOUNDARY); (traits->boundary_in_x_2_object() (icv, ARR_MAX_END) == NO_BOUNDARY);
Point_2 p1, p2; Point_2 p1, p2;
if (has_left) if (has_left)