From f17b5d1eaf88e4d68d5cee796becfbf73a747eda Mon Sep 17 00:00:00 2001 From: Efi Fogel Date: Wed, 21 Nov 2007 10:24:10 +0000 Subject: [PATCH] API revisited --- .../demo/Boolean_set_operations_2/makefile | 3 ++- .../CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h | 4 ++-- .../include/CGAL/Boolean_set_operations_2/Gps_agg_op.h | 2 +- .../CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h | 4 ++-- .../CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h | 8 ++++---- .../CGAL/Boolean_set_operations_2/Gps_bfs_xor_visitor.h | 2 +- .../include/CGAL/General_polygon_set_2.h | 4 ++-- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Boolean_set_operations_2/demo/Boolean_set_operations_2/makefile b/Boolean_set_operations_2/demo/Boolean_set_operations_2/makefile index af3175c6c6b..b3f26471112 100644 --- a/Boolean_set_operations_2/demo/Boolean_set_operations_2/makefile +++ b/Boolean_set_operations_2/demo/Boolean_set_operations_2/makefile @@ -15,7 +15,8 @@ include $(CGAL_MAKEFILE) BSO_CXXFLAGS = CXXFLAGS = \ - -I ../../../../branches/experimental-packages/Arrangement_on_surface_2/include \ + -I ../../../Arrangement_on_surface_2/include \ + -I ../../../Installation/include \ -I ../../../Minkowski_sum_2/include \ -I../../include \ $(BSO_CXXFLAGS) \ diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h index 79fa2b45b13..592dd0bdf71 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h @@ -308,7 +308,7 @@ class Gps_agg_meta_traits : if(cv.data().halfedge() == Halfedge_handle()) return (Point_2 (m_base(cv.base()))); - CGAL_assertion((Halfedge_direction)cv.data().halfedge()->direction() == LEFT_TO_RIGHT); + CGAL_assertion((Arr_halfedge_direction)cv.data().halfedge()->direction() == ARR_LEFT_TO_RIGHT); return Point_2 (m_base(cv.base()), cv.data().halfedge()->source()); } }; @@ -341,7 +341,7 @@ class Gps_agg_meta_traits : if(cv.data().halfedge() == Halfedge_handle()) return (Point_2 (m_base(cv.base()))); - CGAL_assertion((Halfedge_direction)cv.data().halfedge()->direction() == LEFT_TO_RIGHT); + CGAL_assertion((Arr_halfedge_direction)cv.data().halfedge()->direction() == ARR_LEFT_TO_RIGHT); return Point_2 (m_base(cv.base()), cv.data().halfedge()->target()); } }; diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h index e3174913de2..fd7c2e29cd7 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h @@ -132,7 +132,7 @@ public: Halfedge_iterator he = itr; if(he->face()->contained() == he->twin()->face()->contained()) continue; - if ((Halfedge_direction)he->direction() == RIGHT_TO_LEFT) + if ((Arr_halfedge_direction)he->direction() == ARR_RIGHT_TO_LEFT) he = he->twin(); Curve_data cv_data(arr, he, 1, 0); diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h index f24db41f22f..6dd755d6673 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h @@ -227,7 +227,7 @@ public: CGAL_assertion (vert_map.is_defined (he->source())); CGAL_assertion (vert_map.is_defined (he->target())); - if ((Halfedge_direction)he->direction() == LEFT_TO_RIGHT) + if ((Arr_halfedge_direction)he->direction() == ARR_LEFT_TO_RIGHT) { e_left = vert_map[he->source()]; e_right = vert_map[he->target()]; @@ -275,7 +275,7 @@ private: // containment flags (otherwise we will simply not keep it). if (circ->face()->contained() != circ->twin()->face()->contained()) { - if ((Halfedge_direction)circ->direction() == LEFT_TO_RIGHT) + if ((Arr_halfedge_direction)circ->direction() == ARR_LEFT_TO_RIGHT) return (Base_event::RIGHT_END); else return (Base_event::LEFT_END); diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h index 0de7722fda2..063066d9a00 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h @@ -116,7 +116,7 @@ private: void insert_edge_to_hash(Halfedge_handle he, const X_monotone_curve_2& cv) { const Comparison_result he_dir = - ((Halfedge_direction)he->direction() == LEFT_TO_RIGHT) ? SMALLER : LARGER; + ((Arr_halfedge_direction)he->direction() == ARR_LEFT_TO_RIGHT) ? SMALLER : LARGER; const Comparison_result cv_dir = this->m_arr_access.arrangement().traits()-> @@ -219,7 +219,7 @@ public: Event *curr_event = reinterpret_cast(this->current_event()); Event *last_event = reinterpret_cast((sc)->last_event()); - CGAL_assertion ((Halfedge_direction)res_he->direction() == LEFT_TO_RIGHT); + CGAL_assertion ((Arr_halfedge_direction)res_he->direction() == ARR_LEFT_TO_RIGHT); _insert_vertex (curr_event, res_he->target()); _insert_vertex (last_event, res_he->source()); @@ -236,7 +236,7 @@ public: // We now have a halfedge whose target vertex is associated with the // last event (we have already dealt with its source vertex). Event *last_event = reinterpret_cast((sc)->last_event()); - CGAL_assertion ((Halfedge_direction)res_he->direction() == RIGHT_TO_LEFT); + CGAL_assertion ((Arr_halfedge_direction)res_he->direction() == ARR_RIGHT_TO_LEFT); _insert_vertex (last_event, res_he->target()); return (res_he); @@ -253,7 +253,7 @@ public: // current event (we have already dealt with its source vertex). Event *curr_event = reinterpret_cast(this->current_event()); - CGAL_assertion ((Halfedge_direction)res_he->direction() == LEFT_TO_RIGHT); + CGAL_assertion ((Arr_halfedge_direction)res_he->direction() == ARR_LEFT_TO_RIGHT); _insert_vertex (curr_event, res_he->target()); return (res_he); diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_xor_visitor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_xor_visitor.h index 8b1b694add2..0e013d9aadd 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_xor_visitor.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_xor_visitor.h @@ -79,7 +79,7 @@ public: Halfedge_iterator he = eit; const X_monotone_curve_2& cv = he->curve(); const bool is_cont = he->face()->contained(); - const Comparison_result he_res = ((Halfedge_direction)he->direction() == LEFT_TO_RIGHT) ? + const Comparison_result he_res = ((Arr_halfedge_direction)he->direction() == ARR_LEFT_TO_RIGHT) ? SMALLER : LARGER; const bool has_same_dir = (cmp_endpoints(cv) == he_res); diff --git a/Boolean_set_operations_2/include/CGAL/General_polygon_set_2.h b/Boolean_set_operations_2/include/CGAL/General_polygon_set_2.h index 126a74b42e9..397efbb835e 100644 --- a/Boolean_set_operations_2/include/CGAL/General_polygon_set_2.h +++ b/Boolean_set_operations_2/include/CGAL/General_polygon_set_2.h @@ -430,7 +430,7 @@ public: Halfedge_handle he = eit; const X_monotone_curve_2& cv = he->curve(); const bool is_cont = he->face()->contained(); - const Comparison_result he_res = ((Halfedge_direction)he->direction() == LEFT_TO_RIGHT) ? + const Comparison_result he_res = ((Arr_halfedge_direction)he->direction() == ARR_LEFT_TO_RIGHT) ? SMALLER : LARGER; const bool has_same_dir = (cmp_endpoints(cv) == he_res); @@ -569,7 +569,7 @@ public: const X_monotone_curve_2& cv = he->curve(); const bool is_cont = he->face()->contained(); - const Comparison_result he_res = ((Halfedge_direction)he->direction() == LEFT_TO_RIGHT) ? + const Comparison_result he_res = ((Arr_halfedge_direction)he->direction() == ARR_LEFT_TO_RIGHT) ? SMALLER : LARGER; const bool has_same_dir = (cmp_endpoints(cv) == he_res);