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

return SMALLER in linf_refine, only for h/v lines 

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
This commit is contained in:
Panagiotis Cheilaris 2013-09-12 16:53:04 +02:00
parent b65c265d51
commit 9208ebfbd7
1 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1061,6 +1061,10 @@ private:
{ {
bool is_l_h_or_v = is_line_h_or_v(l); bool is_l_h_or_v = is_line_h_or_v(l);
if (not is_l_h_or_v) {
return EQUAL;
}
FT difxvl = vv.x() - lref.x(); FT difxvl = vv.x() - lref.x();
FT difyvl = vv.y() - lref.y(); FT difyvl = vv.y() - lref.y();
FT absdifxvl = CGAL::abs(difxvl); FT absdifxvl = CGAL::abs(difxvl);
@ -1093,17 +1097,21 @@ private:
FT absdifxvp = CGAL::abs(difxvp); FT absdifxvp = CGAL::abs(difxvp);
FT absdifyvp = CGAL::abs(difyvp); FT absdifyvp = CGAL::abs(difyvp);
Comparison_result cmppabsxy = CGAL::compare(absdifxvp, absdifyvp); Comparison_result cmppabsxy = CGAL::compare(absdifxvp, absdifyvp);
if (not ( (cmplabsxy == SMALLER) and (cmppabsxy == SMALLER) )) CGAL_SDG_DEBUG(std::cout << "debug linf_refine cmplabsxy = "
{ << cmplabsxy << " cmppabsxy=" << cmppabsxy << std::endl;);
if (CGAL::compare(difxvl, difxvp) == EQUAL) { if (cmplabsxy != EQUAL) {
compare_p = CGAL::compare(absdifyvl, absdifyvp); if (not ( (cmplabsxy == SMALLER) and (cmppabsxy == SMALLER) ))
{
if (CGAL::compare(difxvl, difxvp) == EQUAL) {
compare_p = CGAL::compare(absdifyvl, absdifyvp);
}
} }
} if (not ( (cmplabsxy == LARGER ) and (cmppabsxy == LARGER ) ))
if (not ( (cmplabsxy == LARGER ) and (cmppabsxy == LARGER ) )) {
{ if (CGAL::compare(difyvl, difyvp) == EQUAL) {
if (CGAL::compare(difyvl, difyvp) == EQUAL) { CGAL_assertion(compare_p == EQUAL);
CGAL_assertion(compare_p == EQUAL); compare_p = CGAL::compare(absdifxvl, absdifxvp);
compare_p = CGAL::compare(absdifxvl, absdifxvp); }
} }
} }
} else { } else {
@ -1127,17 +1135,21 @@ private:
FT absdifxvq = CGAL::abs(difxvq); FT absdifxvq = CGAL::abs(difxvq);
FT absdifyvq = CGAL::abs(difyvq); FT absdifyvq = CGAL::abs(difyvq);
Comparison_result cmpqabsxy = CGAL::compare(absdifxvq, absdifyvq); Comparison_result cmpqabsxy = CGAL::compare(absdifxvq, absdifyvq);
if (not ( (cmplabsxy == SMALLER) and (cmpqabsxy == SMALLER) )) CGAL_SDG_DEBUG(std::cout << "debug linf_refine cmplabsxy = "
{ << cmplabsxy << " cmpqabsxy=" << cmpqabsxy << std::endl;);
if (CGAL::compare(difxvl, difxvq) == EQUAL) { if (cmplabsxy != EQUAL) {
compare_q = CGAL::compare(absdifyvl, absdifyvq); if (not ( (cmplabsxy == SMALLER) and (cmpqabsxy == SMALLER) ))
{
if (CGAL::compare(difxvl, difxvq) == EQUAL) {
compare_q = CGAL::compare(absdifyvl, absdifyvq);
}
} }
} if (not ( (cmplabsxy == LARGER ) and (cmpqabsxy == LARGER ) ))
if (not ( (cmplabsxy == LARGER ) and (cmpqabsxy == LARGER ) )) {
{ if (CGAL::compare(difyvl, difyvq) == EQUAL) {
if (CGAL::compare(difyvl, difyvq) == EQUAL) { CGAL_assertion(compare_q == EQUAL);
CGAL_assertion(compare_q == EQUAL); compare_q = CGAL::compare(absdifxvl, absdifxvq);
compare_q = CGAL::compare(absdifxvl, absdifxvq); }
} }
} }
} else { } else {
@ -1161,17 +1173,21 @@ private:
FT absdifxvr = CGAL::abs(difxvr); FT absdifxvr = CGAL::abs(difxvr);
FT absdifyvr = CGAL::abs(difyvr); FT absdifyvr = CGAL::abs(difyvr);
Comparison_result cmprabsxy = CGAL::compare(absdifxvr, absdifyvr); Comparison_result cmprabsxy = CGAL::compare(absdifxvr, absdifyvr);
if (not ( (cmplabsxy == SMALLER) and (cmprabsxy == SMALLER) )) CGAL_SDG_DEBUG(std::cout << "debug linf_refine cmplabsxy = "
{ << cmplabsxy << " cmprabsxy=" << cmprabsxy << std::endl;);
if (CGAL::compare(difxvl, difxvr) == EQUAL) { if (cmplabsxy != EQUAL) {
compare_r = CGAL::compare(absdifyvl, absdifyvr); if (not ( (cmplabsxy == SMALLER) and (cmprabsxy == SMALLER) ))
{
if (CGAL::compare(difxvl, difxvr) == EQUAL) {
compare_r = CGAL::compare(absdifyvl, absdifyvr);
}
} }
} if (not ( (cmplabsxy == LARGER ) and (cmprabsxy == LARGER ) ))
if (not ( (cmplabsxy == LARGER ) and (cmprabsxy == LARGER ) )) {
{ if (CGAL::compare(difyvl, difyvr) == EQUAL) {
if (CGAL::compare(difyvl, difyvr) == EQUAL) { CGAL_assertion(compare_r == EQUAL);
CGAL_assertion(compare_r == EQUAL); compare_r = CGAL::compare(absdifxvl, absdifxvr);
compare_r = CGAL::compare(absdifxvl, absdifxvr); }
} }
} }
} else { } else {