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

Recursive instance iterator, debugging.

This commit is contained in:
Matthias Koefferlein 2021-02-20 00:48:07 +01:00
parent 412056afed
commit 6527d29f8f
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/db/db/dbRecursiveInstanceIterator.cc
View File

@ -432,14 +432,14 @@ RecursiveInstanceIterator::next_instance (RecursiveInstanceReceiver *receiver) c
break;
}
if (! m_inst.at_end () && int (m_inst_iterators.size () + 1) >= m_min_depth && ! is_inactive ()) {
if (! m_inst.at_end () && int (m_inst_iterators.size ()) >= m_min_depth && ! is_inactive ()) {
break;
}
}
if (! m_inst.at_end ()) {
if (int (m_inst_iterators.size () + 1) < m_min_depth || is_inactive ()) {
if (int (m_inst_iterators.size ()) < m_min_depth || is_inactive ()) {
++m_inst;
new_inst (receiver);
} else {

22
src/db/unit_tests/dbRecursiveInstanceIteratorTests.cc
View File

@ -104,31 +104,31 @@ TEST(1)
EXPECT_EQ (x, "[$1]$2 r0 0,0/[$1]$3 r0 100,-100");
db::RecursiveInstanceIterator i1_1inf (g, c0, db::Box (0, 0, 100, 100));
i1_1inf.min_depth(1);
i1_1inf.min_depth(0);
x = collect(i1_1inf, g);
EXPECT_EQ (x, "[$1]$2 r0 0,0/[$1]$3 r0 100,-100");
x = collect_with_copy(i1_1inf, g);
EXPECT_EQ (x, "[$1]$2 r0 0,0/[$1]$3 r0 100,-100");
db::RecursiveInstanceIterator i1_11 (g, c0, db::Box (0, 0, 100, 100));
i1_11.min_depth(1);
i1_11.max_depth(1);
db::RecursiveInstanceIterator i1_11 (g, c0, db::Box (0, 0, 2000, 100));
i1_11.min_depth(0);
i1_11.max_depth(0);
x = collect(i1_11, g);
EXPECT_EQ (x, "[$1]$2 r0 0,0/[$1]$3 r0 100,-100");
x = collect_with_copy(i1_11, g);
EXPECT_EQ (x, "[$1]$2 r0 0,0/[$1]$3 r0 100,-100");
db::RecursiveInstanceIterator i1_12 (g, c0, db::Box (0, 0, 100, 100));
i1_12.min_depth(1);
i1_12.max_depth(2);
db::RecursiveInstanceIterator i1_12 (g, c0, db::Box (0, 0, 2000, 100));
i1_12.min_depth(0);
i1_12.max_depth(1);
x = collect(i1_12, g);
EXPECT_EQ (x, "[$1]$2 r0 0,0/[$1]$3 r0 100,-100");
EXPECT_EQ (x, "[$1]$2 r0 0,0/[$3]$4 r0 1100,0/[$1]$3 r0 100,-100");
x = collect_with_copy(i1_12, g);
EXPECT_EQ (x, "[$1]$2 r0 0,0/[$1]$3 r0 100,-100");
EXPECT_EQ (x, "[$1]$2 r0 0,0/[$3]$4 r0 1100,0/[$1]$3 r0 100,-100");
db::RecursiveInstanceIterator i1_22 (g, c0, db::Box (0, 0, 100, 100));
i1_22.min_depth(2);
i1_22.max_depth(2);
i1_22.min_depth(1);
i1_22.max_depth(1);
x = collect(i1_22, g);
EXPECT_EQ (x, "");
x = collect_with_copy(i1_22, g);