From c56a0a004d27466d1f19bc96c9031741036a5991 Mon Sep 17 00:00:00 2001 From: Panagiotis Cheilaris Date: Sun, 18 Aug 2013 17:39:26 +0300 Subject: [PATCH] in PSSP case check fast: t endpoint of hv segment This is to fix validity checks of inputs like (rx8m8var.cin): s -11 82 -11 4 p 58 60 p 89 1 p -11 16 s -11 16 89 1 This fixes the validity check of point t = p -11 82. Signed-off-by: Panagiotis Cheilaris --- .../Voronoi_vertex_ring_C2.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_ring_C2.h b/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_ring_C2.h index 44e7ee6493d..b8d9ed27790 100644 --- a/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_ring_C2.h +++ b/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_ring_C2.h @@ -853,16 +853,15 @@ private: return ZERO; } - // philaris: following might have to be changed - // philaris: I remove the following line to be on the safe side - /* - if ( ( p_.is_segment() && is_endpoint_of(t, p_) ) || - ( q_.is_segment() && is_endpoint_of(t, q_) ) || - ( r_.is_segment() && is_endpoint_of(t, r_) ) ) { + // philaris: I do the test only for axis-parallel segments + if ( + ( p_.is_segment() && is_site_h_or_v(p_) && is_endpoint_of(t, p_) ) || + ( q_.is_segment() && is_site_h_or_v(q_) && is_endpoint_of(t, q_) ) || + ( r_.is_segment() && is_site_h_or_v(r_) && is_endpoint_of(t, r_) ) ) + { use_result = true; return POSITIVE; } - */ return ZERO; }