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

Merge pull request #5565 from GilesBathgate/Nef_3-performance_segment_overlay_traits-GilesBathgate 

Nef 3 performance segment overlay traits
This commit is contained in:
Sebastien Loriot 2021-04-17 10:58:48 +02:00 committed by GitHub
parent b7323389c7 1906dca54d
commit 079e171f7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
Nef_2/include/CGAL/Nef_2/Segment_overlay_traits.h
View File

@ -460,59 +460,6 @@ public:
OUTPUT& GO; OUTPUT& GO;
const GEOMETRY& K; const GEOMETRY& K;
class lt_segs_at_sweepline
{
const Point_2& p;
ISegment s_bottom, s_top; // sentinel segments
const GEOMETRY& K;
public:
lt_segs_at_sweepline(const Point_2& pi,
ISegment s1, ISegment s2,
const GEOMETRY& k)
: p(pi), s_bottom(s1), s_top(s2), K(k)
{}
lt_segs_at_sweepline(const lt_segs_at_sweepline& lt)
: p(lt.p), s_bottom(lt.s_bottom), s_top(lt.s_top), K(lt.K)
{}
template <typename ss_pair>
bool
operator()(const ISegment& is1, const ss_pair& ss2) const
{
return operator()(is1, ss2.first);
}
bool
operator()(const ISegment& is1, const ISegment& is2) const
{
if ( is2 == s_top || is1 == s_bottom ) return true;
if ( is1 == s_top || is2 == s_bottom ) return false;
if ( is1 == is2 ) return false;
// Precondition: p is contained in s1 or s2.
const Segment_2& s1 = is1->first;
const Segment_2& s2 = is2->first;
CGAL_assertion_msg(( K.orientation(s1,p) == 0 ) || ( K.orientation(s2,p) == 0 ) ,"compare error in sweep.");
int s = 0;
if( p == K.source(s1) )
s = K.orientation(s2,p);
else
s = - K.orientation(s1,p);
if ( s || K.is_degenerate(s1) || K.is_degenerate(s2) )
return ( s < 0 );
s = K.orientation(s2,K.target(s1));
if (s==0) return ( is1 - is2 ) < 0;
// overlapping segments are not equal
return ( s < 0 );
}
};
class compare_segs_at_sweepline class compare_segs_at_sweepline
{ {
const Point_2& p; const Point_2& p;
@ -553,43 +500,16 @@ public:
const Segment_2& s1 = is1->first; const Segment_2& s1 = is1->first;
const Segment_2& s2 = is2->first; const Segment_2& s2 = is2->first;
CGAL_assertion_msg(( K.orientation(s1,p) == 0 ) || ( K.orientation(s2,p) == 0 ) ,"compare error in sweep."); int s = -K.orientation(s1,p);
if ( s == 0 )
int s = 0;
if(K.is_degenerate(s1))
return o2c(K.orientation(s2,p));
if(K.is_degenerate(s2))
return o2c(-K.orientation(s1,p));
s = - K.orientation(s1,p);
if(s!=0)
return o2c(s);
s = K.orientation(s2,p);
if(s!=0)
return o2c(s);
return o2c(K.orientation(s2,K.target(s1)));
/*
if( p == K.source(s1) )
s = K.orientation(s2,p); s = K.orientation(s2,p);
else else
s = - K.orientation(s1,p); CGAL_assertion_msg( K.orientation(s2,p) == 0, "compare error in sweep.");
if ( s || K.is_degenerate(s1) || K.is_degenerate(s2) )
if(s < 0) return CGAL::SMALLER;
else if(s > 0) return CGAL::LARGER;
else return CGAL::EQUAL;
s = K.orientation(s2,K.target(s1)); if( s || K.is_degenerate(s2) || K.is_degenerate(s1))
// if (s==0) { return o2c(s);
// if(is1 < is2) return CGAL::SMALLER;
// if (is1 > is2) return CGAL::LARGER;
// return CGAL::EQUAL;
// }
// overlapping segments are not equal return o2c(K.orientation(s2,K.target(s1)));
if(s < 0) return CGAL::SMALLER;
if(s > 0) return CGAL::LARGER;
return CGAL::EQUAL;
*/
} }
}; };