Changing default "is_merged" status for Edges and Region to false.

This was a problem with universal DRC which does not specifically
set the merged status. Furthermore, the default for DeepRegion and
DeepEdges was "false" already and now is aligned.
This commit is contained in:
Matthias Koefferlein 2022-07-04 00:52:55 +02:00
parent c700d2ed97
commit 75d686a63f
10 changed files with 35 additions and 7 deletions

View File

@ -82,7 +82,7 @@ void FlatEdges::invalidate_cache ()
void FlatEdges::init ()
{
m_is_merged = true;
m_is_merged = false;
m_merged_edges_valid = false;
}
@ -321,9 +321,7 @@ const db::RecursiveShapeIterator *FlatEdges::iter () const
void
FlatEdges::do_insert (const db::Edge &edge)
{
if (! empty ()) {
m_is_merged = false;
}
m_is_merged = empty ();
mp_edges->insert (edge);
invalidate_cache ();

View File

@ -82,7 +82,7 @@ void FlatRegion::invalidate_cache ()
void FlatRegion::init ()
{
m_is_merged = true;
m_is_merged = false;
m_merged_polygons_valid = false;
}

View File

@ -270,7 +270,7 @@ OriginalLayerEdges::less (const Edges &other) const
void
OriginalLayerEdges::init ()
{
m_is_merged = true;
m_is_merged = false;
m_merged_edges_valid = false;
}

View File

@ -382,7 +382,7 @@ OriginalLayerRegion::less (const Region &other) const
void
OriginalLayerRegion::init ()
{
m_is_merged = true;
m_is_merged = false;
m_merged_polygons_valid = false;
}

View File

@ -1318,3 +1318,13 @@ TEST(54_issue1011)
run_test (_this, "54", false);
}
TEST(55_drccount)
{
run_test (_this, "55", false);
}
TEST(55d_drccount)
{
run_test (_this, "55", true);
}

20
testdata/drc/drcSimpleTests_55.drc vendored Normal file
View File

@ -0,0 +1,20 @@
source $drc_test_source
target $drc_test_target
if $drc_test_deep
deep
end
licon = input(66, 44)
licon.output(66, 44)
licon_cluster = licon.sized(0.2).sized(-0.2)
single = licon_cluster.drc(secondary(licon).count == 1)
single.sized(0.1).output(100, 0)
single = licon_cluster.drc(if_any(secondary(licon).count == 1))
single.sized(0.1).output(101, 0)

BIN
testdata/drc/drcSimpleTests_55.gds vendored Normal file

Binary file not shown.

BIN
testdata/drc/drcSimpleTests_55d.gds vendored Normal file

Binary file not shown.

BIN
testdata/drc/drcSimpleTests_au55.gds vendored Normal file

Binary file not shown.

BIN
testdata/drc/drcSimpleTests_au55d.gds vendored Normal file

Binary file not shown.