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

fixes to make pssphor2.cin work in ring case 

This returns ZERO (instead of POSITIVE) in some pssp incircle tests
like in the case of input pssphor2.cin:
s -100 -50 50 100
s 100 0 100 -100
p 0 0

Similar changes have to be made to the sqrt new code.

This will probably break some inputs like brsp1less.cin:
s 50 100 250 300
s -100 110 200 80
p 0 150
p 0 100
and pps predicates should be changed too.

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
This commit is contained in:
Panagiotis Cheilaris 2014-05-20 12:32:40 +02:00
parent 1c4985c326
commit 75b45ba931
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1439,32 +1439,33 @@ private:
const Point_2 pref = pt_site.point();
const RT scalediffdvpx = ux_ - pref.x() * uz_;
const RT scalediffdvpy = uy_ - pref.y() * uz_;
Comparison_result retval = EQUAL;
if (CGAL::compare(scalediffdvpx, scalediffdvtx) == EQUAL) {
if (CGAL::compare(CGAL::abs(scalediffdvpx), Rs1) == EQUAL) {
retval = CGAL::compare(d_fine, CGAL::abs(scalediffdvpy));
}
Comparison_result sidecmp = EQUAL;
const bool p_t_samex =
CGAL::compare(scalediffdvpx, scalediffdvtx) == EQUAL;
const bool p_t_on_same_ver_side =
(p_t_samex) and
(CGAL::compare(CGAL::abs(scalediffdvpx), Rs1) == EQUAL) ;
if (p_t_on_same_ver_side) {
sidecmp = CGAL::compare(d_fine, CGAL::abs(scalediffdvpy));
}
if (CGAL::compare(scalediffdvpy, scalediffdvty) == EQUAL) {
if (CGAL::compare(CGAL::abs(scalediffdvpy), Rs1) == EQUAL) {
retval = CGAL::compare(d_fine, CGAL::abs(scalediffdvpx));
}
const bool p_t_samey =
CGAL::compare(scalediffdvpy, scalediffdvty) == EQUAL;
const bool p_t_on_same_hor_side =
(p_t_samey) and
(CGAL::compare(CGAL::abs(scalediffdvpy), Rs1) == EQUAL) ;
if (p_t_on_same_hor_side) {
sidecmp = CGAL::compare(d_fine, CGAL::abs(scalediffdvpx));
}
CGAL_SDG_DEBUG(std::cout << "debug: PSS temporary retval = "
<< retval << std::endl;);
if (retval == SMALLER) {
CGAL_SDG_DEBUG(std::cout << "debug: PSS temporary sidecmp = "
<< sidecmp << std::endl;);
if (sidecmp == SMALLER) {
return NEGATIVE;
} else if (retval == LARGER) {
} else if (sidecmp == LARGER) {
return POSITIVE;
} else {
if ( (CGAL::compare(pref.x(), t.x()) == EQUAL)
or(CGAL::compare(pref.y(), t.y()) == EQUAL) ) {
CGAL_assertion(
(CGAL::compare(scalediffdvpx, scalediffdvtx) == EQUAL)
or (CGAL::compare(scalediffdvpy, scalediffdvty) == EQUAL)
);
return POSITIVE;
}
}
if (p_t_samex or p_t_samey) {
return ZERO;
}
if (not is_site_h_or_v(s1)) {
@ -3297,8 +3298,6 @@ private:
oriented_side_of_line(ltest, v) == ON_ORIENTED_BOUNDARY);
const Oriented_side ost = oriented_side_of_line(ltest, t.point());
const Oriented_side osx = oriented_side_of_line(ltest, corner);
CGAL_assertion(scmpx(t, pt_site) != EQUAL);
CGAL_assertion(scmpy(t, pt_site) != EQUAL);
CGAL_SDG_DEBUG(std::cout << "debug points_inside_touching_sides"
<< " ltest: " << ltest.a() << ' ' << ltest.b() << ' ' << ltest.c()
<< " v=" << v << " ost=" << ost