From 3825ee9dd6c055db151c4aeaa0dc2d92b085eb8b Mon Sep 17 00:00:00 2001 From: Efi Fogel Date: Thu, 1 May 2003 12:58:14 +0000 Subject: [PATCH] used equal instead of compare_xy --- .../Arrangement/include/CGAL/Arr_leda_segment_traits_2.h | 5 ++--- .../Arrangement/include/CGAL/Arr_segment_cached_traits_2.h | 7 ++++--- Packages/Arrangement/include/CGAL/Arr_segment_traits_2.h | 7 ++++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Packages/Arrangement/include/CGAL/Arr_leda_segment_traits_2.h b/Packages/Arrangement/include/CGAL/Arr_leda_segment_traits_2.h index 5f0cdb329e6..0615f05eda4 100644 --- a/Packages/Arrangement/include/CGAL/Arr_leda_segment_traits_2.h +++ b/Packages/Arrangement/include/CGAL/Arr_leda_segment_traits_2.h @@ -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()); diff --git a/Packages/Arrangement/include/CGAL/Arr_segment_cached_traits_2.h b/Packages/Arrangement/include/CGAL/Arr_segment_cached_traits_2.h index 5d1ec5631a7..c0b9121a274 100644 --- a/Packages/Arrangement/include/CGAL/Arr_segment_cached_traits_2.h +++ b/Packages/Arrangement/include/CGAL/Arr_segment_cached_traits_2.h @@ -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; diff --git a/Packages/Arrangement/include/CGAL/Arr_segment_traits_2.h b/Packages/Arrangement/include/CGAL/Arr_segment_traits_2.h index 989627fb907..6b0ea6337bb 100644 --- a/Packages/Arrangement/include/CGAL/Arr_segment_traits_2.h +++ b/Packages/Arrangement/include/CGAL/Arr_segment_traits_2.h @@ -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);