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

used equal instead of compare_xy

This commit is contained in:
Efi Fogel 2003-05-01 12:58:14 +00:00
parent 5d4cbba79e
commit 3825ee9dd6
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Packages/Arrangement/include/CGAL/Arr_leda_segment_traits_2.h
View File

@ -83,9 +83,8 @@ public:
{
//split curve at split point (x coordinate) into c1 and c2
CGAL_precondition(curve_get_point_status(cv,split_pt) == EQUAL);
// does not suit pmwx
//CGAL_precondition(curve_source(cv) != split_pt);
//CGAL_precondition(curve_target(cv) != split_pt);
CGAL_precondition(curve_source(cv) != split_pt);
CGAL_precondition(curve_target(cv) != split_pt);
c1 = X_curve_2(cv.source(), split_pt);
c2 = X_curve_2(split_pt, cv.target());

7
Packages/Arrangement/include/CGAL/Arr_segment_cached_traits_2.h
View File

@ -126,6 +126,7 @@ protected:
typedef typename Kernel::Compare_x_2 Compare_x_2;
typedef typename Kernel::Compare_y_2 Compare_y_2;
typedef typename Kernel::Compare_xy_2 Compare_xy_2;
typedef typename Kernel::Equal_2 Equal_2;
typedef typename Kernel::Compare_slope_2 Compare_slope_2;
typedef typename Kernel::Has_on_2 Has_on_2;
@ -489,9 +490,9 @@ public:
{
// Check preconditions.
CGAL_precondition(curve_get_point_status(cv, p) == EQUAL);
CGAL_precondition_code(Compare_xy_2 compare_xy = compare_xy_2_object());
CGAL_precondition(compare_xy(cv.ps, p) != EQUAL);
CGAL_precondition(compare_xy(cv.pt, p) != EQUAL);
CGAL_precondition_code(Equal_2 is_equal = equal_2_object());
CGAL_precondition(!is_equal(cv.ps, p));
CGAL_precondition(!is_equal(cv.pt, p));
// Do the split.
c1.line = cv.line;

7
Packages/Arrangement/include/CGAL/Arr_segment_traits_2.h
View File

@ -63,6 +63,7 @@ protected:
typedef typename Kernel::Compare_xy_2 Compare_xy_2;
typedef typename Kernel::Compare_y_at_x_2 Compare_y_at_x_2;
typedef typename Kernel::Is_vertical_2 Is_vertical_2;
typedef typename Kernel::Equal_2 Equal_2;
typedef typename Kernel::Orientation_2 Orientation_2;
public:
@ -110,9 +111,9 @@ public:
{
//split curve at split point (x coordinate) into c1 and c2
CGAL_precondition(curve_get_point_status(cv, split_pt) == EQUAL);
CGAL_precondition_code(Compare_xy_2 compare_xy = compare_xy_2_object());
CGAL_precondition(compare_xy(curve_source(cv), split_pt) != EQUAL);
CGAL_precondition(compare_xy(curve_target(cv), split_pt) != EQUAL);
CGAL_precondition_code(Equal_2 is_equal = equal_2_object());
CGAL_precondition(!is_equal(curve_source(cv), split_pt));
CGAL_precondition(!is_equal(curve_target(cv), split_pt));
Construct_vertex_2 construct_vertex = construct_vertex_2_object();
const Point_2 & source = construct_vertex(cv, 0);