luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refined solution for #198

This commit is contained in:
Matthias Koefferlein 2018-11-24 18:04:14 +01:00
parent 304cd20bc7
commit 0352a450b7
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/db/db/dbEdgesToContours.cc
View File

@ -117,7 +117,7 @@ class point_matcher
{
public:
point_matcher () : m_vp_min (0.0), m_d_min (0.0), m_any (false), m_any_coincident (false)
point_matcher () : m_vp_min (0.0), m_d_min (0.0), m_any (false)
{
// .. nothing yet ..
}
@ -133,40 +133,40 @@ public:
typedef db::coord_traits<C> coord_traits;
double d = p.double_distance (swapped ? other.p2 () : other.p1 ());
bool coincident = d < coord_traits::prec ();
double vp = db::vprod (other.d (), e.d ()) * (1.0 / other.d ().double_length ());
if (coincident) {
if (! m_any) {
m_vp_min = vp;
m_d_min = d;
m_any = true;
return true;
} else if (fabs (d - m_d_min) < coord_traits::prec ()) {
double vp = db::vprod (other.d (), e.d ()) * (1.0 / other.d ().double_length ());
if (! m_any_coincident || vp < m_vp_min) {
m_any_coincident = true;
if (vp < m_vp_min) {
m_vp_min = vp;
m_d_min = 0.0;
return true;
} else {
return false;
}
} else if (! m_any_coincident) {
} else if (d < m_d_min) {
if (! m_any || d < m_d_min) {
m_any = true;
m_d_min = d;
return true;
} else {
return false;
}
m_vp_min = vp;
m_d_min = d;
return true;
} else {
return false;
}
}
private:
double m_vp_min;
double m_d_min;
bool m_any, m_any_coincident;
bool m_any;
};
}