From 82a70bdde0c4b170bb769666a50870a0a065aa09 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 2 Jan 2021 20:33:16 +0100 Subject: [PATCH] WIP: negative output of DRC functions. --- src/db/db/dbRegionUtils.cc | 8 +++- src/db/unit_tests/dbRegionUtilsTests.cc | 50 ++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/src/db/db/dbRegionUtils.cc b/src/db/db/dbRegionUtils.cc index 8927422c1..bb92f1990 100644 --- a/src/db/db/dbRegionUtils.cc +++ b/src/db/db/dbRegionUtils.cc @@ -152,7 +152,7 @@ Edge2EdgeCheckBase::feed_pseudo_edges (db::box_scanner &scanne { if (m_pass == 1) { for (std::set >::const_iterator e = m_pseudo_edges.begin (); e != m_pseudo_edges.end (); ++e) { -// @@@printf("@@@ PSEUDO %s[%d]\n", e->first.to_string().c_str(), int(e->second)); fflush(stdout); +//printf("@@@ PSEUDO %s[%d]\n", e->first.to_string().c_str(), int(e->second)); fflush(stdout); scanner.insert (&e->first, e->second); } } @@ -189,7 +189,11 @@ Edge2EdgeCheckBase::add (const db::Edge *o1, size_t p1, const db::Edge *o2, size if (m_has_negative_edge_output) { m_pseudo_edges.insert (std::make_pair (db::Edge (ep.first ().p1 (), ep.second ().p2 ()), p1)); - m_pseudo_edges.insert (std::make_pair (db::Edge (ep.second ().p1 (), ep.first ().p2 ()), p2)); + m_pseudo_edges.insert (std::make_pair (db::Edge (ep.second ().p1 (), ep.first ().p2 ()), p1)); + if (p1 != p2) { + m_pseudo_edges.insert (std::make_pair (db::Edge (ep.first ().p1 (), ep.second ().p2 ()), p2)); + m_pseudo_edges.insert (std::make_pair (db::Edge (ep.second ().p1 (), ep.first ().p2 ()), p2)); + } } } diff --git a/src/db/unit_tests/dbRegionUtilsTests.cc b/src/db/unit_tests/dbRegionUtilsTests.cc index e23fa3116..865d2c2d3 100644 --- a/src/db/unit_tests/dbRegionUtilsTests.cc +++ b/src/db/unit_tests/dbRegionUtilsTests.cc @@ -231,7 +231,53 @@ TEST(5_LShapeNotch) poly_check.enter (poly, 0); } while (e2e.prepare_next_pass ()); - EXPECT_EQ (tl::to_string (ep), "(0,0;0,3000),(2000,0;0,0),(2000,500;2000,0),(0,3000;2000,3000),(2000,3000;2000,1500)"); - EXPECT_EQ (tl::to_string (ee1), ""); + EXPECT_EQ (tl::to_string (ep), "(1500,1500;1500,2500)/(500,2500;500,1500),(2000,1500;1500,1500)/(1500,500;2000,500)"); + EXPECT_EQ (tl::to_string (ee1), "(0,0;0,3000),(2000,0;0,0),(2000,500;2000,0),(0,3000;2000,3000),(2000,3000;2000,1500)"); EXPECT_EQ (tl::to_string (ee2), ""); } + +TEST(6_SeparationLvsBox) +{ + std::set ep; + std::set ee1, ee2; + + db::EdgeRelationFilter er (db::SpaceRelation, 1001, db::Projection); + + db::edge2edge_check_with_negative_output, std::set > e2e (er, ep, ee1, ee2, false, true /*different layers*/, false); + + db::Point pts1[] = { + db::Point (0, 0), + db::Point (0, 3000), + db::Point (3000, 3000), + db::Point (3000, 2000), + db::Point (1000, 2000), + db::Point (1000, 0) + }; + + db::Polygon poly1; + poly1.assign_hull (pts1, pts1 + sizeof (pts1) / sizeof (pts1[0])); + + db::Point pts2[] = { + db::Point (2000, 0), + db::Point (2000, 1000), + db::Point (3000, 1000), + db::Point (3000, 0) + }; + + db::Polygon poly2; + poly2.assign_hull (pts2, pts2 + sizeof (pts2) / sizeof (pts2[0])); + + db::box_scanner scanner; + scanner.insert (&poly1, 0); // layer 0 + scanner.insert (&poly2, 1); // layer 1 + + db::poly2poly_check_base poly_check (e2e); + + do { + scanner.process (poly_check, er.distance (), db::box_convert ()); + } while (e2e.prepare_next_pass ()); + + EXPECT_EQ (tl::to_string (ep), "(1000,1000;1000,0)/(2000,0;2000,1000),(3000,2000;2000,2000)/(2000,1000;3000,1000)"); + EXPECT_EQ (tl::to_string (ee1), "(0,0;0,3000),(1000,0;0,0),(0,3000;3000,3000),(3000,3000;3000,2000)"); + EXPECT_EQ (tl::to_string (ee2), "(3000,0;2000,0),(3000,1000;3000,0)"); +}