From 7209d29b57bc73cd8cca3415bb2fd9c6ca09828e Mon Sep 17 00:00:00 2001 From: Michal Kleinbort Date: Thu, 21 Jun 2012 14:42:19 +0000 Subject: [PATCH] add trapez ric pl to vertical ray shoot test --- .../test_vert_ray_shoot_vert_segments.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_vert_ray_shoot_vert_segments.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_vert_ray_shoot_vert_segments.cpp index 14cb6ed62d8..64120e97803 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_vert_ray_shoot_vert_segments.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_vert_ray_shoot_vert_segments.cpp @@ -3,6 +3,7 @@ #include #include #include +#include template void vertical_ray_shooting_query @@ -62,6 +63,7 @@ typedef Traits_2::X_monotone_curve_2 Segment_2; typedef CGAL::Arrangement_2 Arrangement_2; typedef CGAL::Arr_simple_point_location Simple_pl; typedef CGAL::Arr_walk_along_line_point_location Walk_pl; +typedef CGAL::Arr_trapezoid_ric_point_location RIC_pl; int main () { @@ -69,6 +71,7 @@ int main () Arrangement_2 arr; Simple_pl simple_pl (arr); Walk_pl walk_pl (arr); + RIC_pl ric_pl (arr); insert (arr, Segment_2 (Point_2 (0, 0), Point_2 (0, 1))); insert (arr, Segment_2 (Point_2 (0, 3), Point_2 (0, 4))); @@ -82,25 +85,31 @@ int main () vertical_ray_shooting_query (simple_pl, true, q1); vertical_ray_shooting_query (walk_pl, true, q1); + vertical_ray_shooting_query (ric_pl, true, q1); vertical_ray_shooting_query (simple_pl, false, q1); vertical_ray_shooting_query (walk_pl, false, q1); + vertical_ray_shooting_query (ric_pl, false, q1); Point_2 q2 (0, 1); vertical_ray_shooting_query (simple_pl, true, q2); vertical_ray_shooting_query (walk_pl, true, q2); + vertical_ray_shooting_query (ric_pl, true, q2); vertical_ray_shooting_query (simple_pl, false, q2); vertical_ray_shooting_query (walk_pl, false, q2); - + vertical_ray_shooting_query (ric_pl, false, q2); + Point_2 q3 (0, 3); vertical_ray_shooting_query (simple_pl, true, q3); vertical_ray_shooting_query (walk_pl, true, q3); + vertical_ray_shooting_query (ric_pl, true, q3); vertical_ray_shooting_query (simple_pl, false, q3); vertical_ray_shooting_query (walk_pl, false, q3); + vertical_ray_shooting_query (ric_pl, false, q3); // Insert additional curves and perform the ray-shooting queries again. insert (arr, Segment_2 (Point_2 (-1, 0), Point_2 (1, 0))); @@ -110,21 +119,27 @@ int main () vertical_ray_shooting_query (simple_pl, true, q1); vertical_ray_shooting_query (walk_pl, true, q1); + vertical_ray_shooting_query (ric_pl, true, q1); vertical_ray_shooting_query (simple_pl, false, q1); vertical_ray_shooting_query (walk_pl, false, q1); + vertical_ray_shooting_query (ric_pl, false, q1); vertical_ray_shooting_query (simple_pl, true, q2); vertical_ray_shooting_query (walk_pl, true, q2); + vertical_ray_shooting_query (ric_pl, true, q2); vertical_ray_shooting_query (simple_pl, false, q2); vertical_ray_shooting_query (walk_pl, false, q2); - + vertical_ray_shooting_query (ric_pl, false, q2); + vertical_ray_shooting_query (simple_pl, true, q3); vertical_ray_shooting_query (walk_pl, true, q3); + vertical_ray_shooting_query (ric_pl, true, q3); vertical_ray_shooting_query (simple_pl, false, q3); vertical_ray_shooting_query (walk_pl, false, q3); + vertical_ray_shooting_query (ric_pl, false, q3); return (0); }