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

Better handling of invertions

This commit is contained in:
Simon Giraudot 2020-10-19 11:47:14 +02:00
parent 47eba2afb5
commit fcbbea5e0d
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Arrangement_on_surface_2/include/CGAL/Arr_polycurve_traits_2.h
View File

@ -719,15 +719,15 @@ public:
Comparison_result dir1 = cmp_seg_endpts(cv1[0]);
Comparison_result dir2 = cmp_seg_endpts(cv2[0]);
std::vector<X_monotone_subcurve_2> ocv; // Used to represent overlaps.
const bool invert_ocv = (dir1 == LARGER && dir2 == LARGER);
const std::size_t n1 = cv1.number_of_subcurves();
const std::size_t n2 = cv2.number_of_subcurves();
std::size_t i1 = (dir1 == SMALLER) ? 0 : n1-1;
std::size_t i2 = (dir2 == SMALLER) ? 0 : n2-1;
std::vector<X_monotone_subcurve_2> ocv; // Used to represent overlaps.
bool invert_ocv = false;
auto compare_xy = m_poly_traits.compare_xy_2_object();
Comparison_result left_res =
compare_xy(cv1[i1], ARR_MIN_END, cv2[i2], ARR_MIN_END);
@ -851,12 +851,6 @@ public:
boost::get<X_monotone_subcurve_2>(&item);
if (x_seg != nullptr) {
X_monotone_subcurve_2 seg = *x_seg;
// If for some reason the subcurve intersection
// results in left oriented curve.
if (cmp_seg_endpts(seg) == LARGER)
invert_ocv = true;
ocv.push_back(seg);
}
@ -985,7 +979,7 @@ public:
template <typename OutputIterator>
inline OutputIterator output_ocv
(std::vector<X_monotone_subcurve_2>& ocv, bool& invert_ocv, OutputIterator oi) const
(std::vector<X_monotone_subcurve_2>& ocv, bool invert_ocv, OutputIterator oi) const
{
typedef std::pair<Point_2, Multiplicity> Intersection_point;
typedef boost::variant<Intersection_point, X_monotone_curve_2>
@ -998,7 +992,6 @@ public:
*(oi ++) = Intersection_result(curve);
ocv.clear();
invert_ocv = false;
return oi;
}