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

fix for touching parabolas PSS case 

Fix for the following input start2db.cin:

s -250 50 -50 -150
s -100 -50 -60 -50
p -150 50

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
This commit is contained in:
Panagiotis Cheilaris 2013-02-26 13:56:05 +01:00
parent 943a8edf76
commit 01614f2fd3
1 changed files with 50 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_sqrt_field_new_C2.h
View File

@ -1964,14 +1964,56 @@ private:
qref = q.point();
} else {
// tocheck and tofix
// here q and r are segments
if (is_q_hv and not is_r_hv) {
CGAL_SDG_DEBUG(std::cout << "debug q:ap r:non-ap"
<< std::endl;);
}
if (is_r_hv and not is_q_hv) {
CGAL_SDG_DEBUG(std::cout << "debug q:non-ap r:ap"
<< std::endl;);
// here q and r are segments and p is point
CGAL_assertion(p.is_point());
if ((is_q_hv and not is_r_hv) or
(is_r_hv and not is_q_hv) ) {
Line_2 lnap;
Homogeneous_point_2 sref;
bool samex;
if (is_q_hv and not is_r_hv) {
CGAL_SDG_DEBUG(std::cout << "debug q:ap r:non-ap"
<< std::endl;);
if (is_p_endp_of_q) {
samex = is_q_ver ? true : false;
lnap = compute_supporting_line(r.supporting_site());
} else {
return ZERO;
}
} else
{ // here, we have: (is_r_hv and not is_q_hv)
CGAL_SDG_DEBUG(std::cout << "debug q:non-ap r:ap"
<< std::endl;);
if (is_p_endp_of_r) {
samex = is_r_ver ? true : false;
lnap = compute_supporting_line(q.supporting_site());
} else {
return ZERO;
}
}
sref = compute_linf_projection_hom(lnap, vv);
CGAL_SDG_DEBUG(std::cout << "debug sref ="
<< sref.x() << ' ' << sref.y() << std::endl;);
if (samex) {
CGAL_SDG_DEBUG(std::cout << "debug samex case" << std::endl;);
FT diffdvsy = vv.y() - sref.y();
if (CGAL::sign(diffdvsy) == CGAL::sign(diffdvty)) {
if (CGAL::compare(CGAL::abs(diffdvtx),
CGAL::abs(diffdvty)) == SMALLER) {
return NEGATIVE;
}
}
} // end of samex case
else { // samey case
CGAL_SDG_DEBUG(std::cout << "debug samey case" << std::endl;);
FT diffdvsx = vv.x() - sref.x();
if (CGAL::sign(diffdvsx) == CGAL::sign(diffdvtx)) {
if (CGAL::compare(CGAL::abs(diffdvty),
CGAL::abs(diffdvtx)) == SMALLER) {
return NEGATIVE;
}
}
} // end of samey case
}
return ZERO;
}