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

WIP: fixed DeepRegion implementation somewhat. Needs testing.

This commit is contained in:
Matthias Koefferlein 2019-02-05 00:25:32 +01:00
parent 981d668161
commit 7c043dbb99
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/db/db/dbDeepRegion.cc
View File

@ -291,21 +291,21 @@ public:
db::Shapes &merged (size_t cid, db::cell_index_type ci, bool initial = true) db::Shapes &merged (size_t cid, db::cell_index_type ci, bool initial = true)
{ {
std::map<size_t, db::Shapes>::iterator s = m_merged_cluster.find (cid); std::map<std::pair<size_t, db::cell_index_type>, db::Shapes>::iterator s = m_merged_cluster.find (std::make_pair (cid, ci));
// some sanity checks: initial clusters are single-use, are never generated twice and cannot be retrieved again // some sanity checks: initial clusters are single-use, are never generated twice and cannot be retrieved again
if (initial) { if (initial) {
tl_assert (s == m_merged_cluster.end ()); tl_assert (s == m_merged_cluster.end ());
m_done.insert (cid); m_done.insert (std::make_pair (cid, ci));
} else { } else {
tl_assert (m_done.find (cid) == m_done.end ()); tl_assert (m_done.find (std::make_pair (cid, ci)) == m_done.end ());
} }
if (s != m_merged_cluster.end ()) { if (s != m_merged_cluster.end ()) {
return s->second; return s->second;
} }
s = m_merged_cluster.insert (std::make_pair (cid, db::Shapes ())).first; s = m_merged_cluster.insert (std::make_pair (std::make_pair (cid, ci), db::Shapes (false))).first;
const db::connected_clusters<db::PolygonRef> &cc = mp_hc->clusters_per_cell (ci); const db::connected_clusters<db::PolygonRef> &cc = mp_hc->clusters_per_cell (ci);
const db::local_cluster<db::PolygonRef> &c = cc.cluster_by_id (cid); const db::local_cluster<db::PolygonRef> &c = cc.cluster_by_id (cid);
@ -348,8 +348,8 @@ public:
} }
private: private:
std::map<size_t, db::Shapes> m_merged_cluster; std::map<std::pair<size_t, db::cell_index_type>, db::Shapes> m_merged_cluster;
std::set<size_t> m_done; std::set<std::pair<size_t, db::cell_index_type> > m_done;
unsigned int m_layer; unsigned int m_layer;
const db::hier_clusters<db::PolygonRef> *mp_hc; const db::hier_clusters<db::PolygonRef> *mp_hc;
bool m_min_coherence; bool m_min_coherence;
@ -384,11 +384,12 @@ DeepRegion::ensure_merged_polygons_valid () const
cm.set_base_verbosity (base_verbosity ()); cm.set_base_verbosity (base_verbosity ());
} }
// @@@ iterate only over the called cells?
for (db::Layout::iterator c = layout.begin (); c != layout.end (); ++c) { for (db::Layout::iterator c = layout.begin (); c != layout.end (); ++c) {
const db::connected_clusters<db::PolygonRef> &cc = hc.clusters_per_cell (c->cell_index ()); const db::connected_clusters<db::PolygonRef> &cc = hc.clusters_per_cell (c->cell_index ());
for (db::connected_clusters<db::PolygonRef>::const_iterator cl = cc.begin (); cl != cc.end (); ++cl) { for (db::connected_clusters<db::PolygonRef>::all_iterator cl = cc.begin_all (); ! cl.at_end (); ++cl) {
if (cc.is_root (cl->id ())) { if (cc.is_root (*cl)) {
db::Shapes &s = cm.merged (cl->id (), c->cell_index ()); db::Shapes &s = cm.merged (*cl, c->cell_index ());
c->shapes (m_merged_polygons.layer ()).swap (s); c->shapes (m_merged_polygons.layer ()).swap (s);
} }
} }
@ -583,13 +584,13 @@ DeepRegion::add (const Region &other) const
static int is_box_from_iter (db::RecursiveShapeIterator i) static int is_box_from_iter (db::RecursiveShapeIterator i)
{ {
if (i.at_end ()) { if (i.at_end ()) {
return -1; return true;
} }
if (i->is_box ()) { if (i->is_box ()) {
++i; ++i;
if (i.at_end ()) { if (i.at_end ()) {
return 1; return true;
} }
} else if (i->is_path () || i->is_polygon ()) { } else if (i->is_path () || i->is_polygon ()) {
db::Polygon poly; db::Polygon poly;
@ -597,26 +598,18 @@ static int is_box_from_iter (db::RecursiveShapeIterator i)
if (poly.is_box ()) { if (poly.is_box ()) {
++i; ++i;
if (i.at_end ()) { if (i.at_end ()) {
return 1; return true;
} }
} }
} else {
return -1;
} }
return 0; // undecided return false;
} }
bool bool
DeepRegion::is_box () const DeepRegion::is_box () const
{ {
int f = is_box_from_iter (begin_iter ().first); return is_box_from_iter (begin_iter ().first);
if (f != 0) {
return f > 0;
}
// fallback: merge and then look again
return is_box_from_iter (begin_merged_iter ().first) > 0;
} }
size_t size_t