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

oriented side more careful tests in vring 

This fixes the bug for the input br10.cin:
s -100 110 0 100
s 200 80 -110 -190
p 0 0
s 0 100 200 80

However, it seems we must also check if things
are in the same quadrants.

The bug for input br20.cin is still there:
s -100 130 0 100
s 200 80 -110 -190
p 0 0
s 0 100 200 80

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
This commit is contained in:
Panagiotis Cheilaris 2013-02-08 14:45:01 +01:00
parent 633b695206
commit 61dc37337f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_ring_C2.h
View File

@ -2551,7 +2551,9 @@ public:
oriented_side_of_line(l, p_.source_site().point());
Oriented_side oslptrg =
oriented_side_of_line(l, p_.target_site().point());
if ((oslpsrc != oslvv) and (oslptrg != oslvv)) {
if (((oslpsrc != oslvv) and (oslptrg != oslvv)) and
((oslpsrc != ON_ORIENTED_BOUNDARY) or
(oslptrg != ON_ORIENTED_BOUNDARY) ) ) {
compare_p = SMALLER;
}
}
@ -2581,7 +2583,9 @@ public:
oriented_side_of_line(l, q_.source_site().point());
Oriented_side oslqtrg =
oriented_side_of_line(l, q_.target_site().point());
if ((oslqsrc != oslvv) and (oslqtrg != oslvv)) {
if (((oslqsrc != oslvv) and (oslqtrg != oslvv)) and
((oslqsrc != ON_ORIENTED_BOUNDARY) or
(oslqtrg != ON_ORIENTED_BOUNDARY) ) ) {
compare_q = SMALLER;
}
}
@ -2611,7 +2615,9 @@ public:
oriented_side_of_line(l, r_.source_site().point());
Oriented_side oslrtrg =
oriented_side_of_line(l, r_.target_site().point());
if ((oslrsrc != oslvv) and (oslrtrg != oslvv)) {
if (((oslrsrc != oslvv) and (oslrtrg != oslvv)) and
((oslrsrc != ON_ORIENTED_BOUNDARY) or
(oslrtrg != ON_ORIENTED_BOUNDARY) ) ) {
compare_r = SMALLER;
}
}