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

finite edge cf star case fixed 

For A=(0,0), B=(100,0), C=(200,200), D=(200,250),
we had erroneously fecf(BC,A,AB,BD,-1) returning
false. The correct answer is true and it is fixed now.

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
This commit is contained in:
Panagiotis Cheilaris 2013-02-06 21:08:55 +01:00
parent 5254971901
commit 1a43cceb91
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Finite_edge_interior_conflict_C2.h
View File

@ -938,6 +938,7 @@ public:
bool result;
if (p.is_point()) {
CGAL_assertion(q.is_segment());
//p may be end point of t
if ( same_points(p,t.source_site())
or same_points(p,t.target_site()) ) {
@ -949,21 +950,36 @@ public:
<< sgn << " returns " << true << std::endl; );
return true;
} else {
result = intersects_segment_interior_inf_wedge_sp(q,p,t);
if (same_points(q.source_site(), t.source_site()) or
same_points(q.source_site(), t.target_site()) or
same_points(q.target_site(), t.source_site()) or
same_points(q.target_site(), t.target_site()) ) {
result = true;
} else {
result = intersects_segment_interior_inf_wedge_sp(q,p,t);
}
}
} else { // p is segment and q is point
CGAL_assertion(q.is_point());
//q may be endpoint of t
if ( same_points(q,t.source_site())
or same_points(q,t.target_site())) {
CGAL_SDG_DEBUG( std::cout
<< "debug finite-edge-int-cf tocheck (p,q,r,t,sgn)= ("
<< p << ") (" << q << ") (" << r << ") ("
<< t << ") "
<< sgn << " returns " << true << std::endl; );
return true;
if ( same_points(q,t.source_site())
or same_points(q,t.target_site())) {
CGAL_SDG_DEBUG( std::cout
<< "debug finite-edge-int-cf tocheck (p,q,r,t,sgn)= ("
<< p << ") (" << q << ") (" << r << ") ("
<< t << ") "
<< sgn << " returns " << true << std::endl; );
return true;
} else {
if (same_points(p.source_site(), t.source_site()) or
same_points(p.source_site(), t.target_site()) or
same_points(p.target_site(), t.source_site()) or
same_points(p.target_site(), t.target_site()) ) {
result = true;
} else {
result = intersects_segment_interior_inf_wedge_sp(p,q,t);
}
}
}
if (result == false) {