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

A small refactoring.

This commit is contained in:
Matthias Koefferlein 2021-07-18 23:09:51 +02:00
parent 2c8d065eb3
commit 70f4c7e2b5
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/db/db/dbNetlistCompare.cc
View File

@ -1233,6 +1233,11 @@ private:
// -------------------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------------------
static bool is_non_trivial_net (const db::Net *net)
{
return net->pin_count () == 0 && net->terminal_count () == 0 && net->subcircuit_pin_count () == 1;
}
NetGraphNode::NetGraphNode (const db::Net *net, DeviceCategorizer &device_categorizer, CircuitCategorizer &circuit_categorizer, const DeviceFilter &device_filter, const std::map<const db::Circuit *, CircuitMapper> *circuit_map, const CircuitPinMapper *pin_map, size_t *unique_pin_id) NetGraphNode::NetGraphNode (const db::Net *net, DeviceCategorizer &device_categorizer, CircuitCategorizer &circuit_categorizer, const DeviceFilter &device_filter, const std::map<const db::Circuit *, CircuitMapper> *circuit_map, const CircuitPinMapper *pin_map, size_t *unique_pin_id)
: mp_net (net), m_other_net_index (invalid_id) : mp_net (net), m_other_net_index (invalid_id)
{ {
@ -1270,9 +1275,7 @@ NetGraphNode::NetGraphNode (const db::Net *net, DeviceCategorizer &device_catego
if (! cm->has_other_pin_for_this_pin (pin_id)) { if (! cm->has_other_pin_for_this_pin (pin_id)) {
// isolated pins are ignored, others are considered for the matching // isolated pins are ignored, others are considered for the matching
if (net->pin_count () == 0 && net->terminal_count () == 0 && net->subcircuit_pin_count () == 1) { if (! unique_pin_id || is_non_trivial_net (net)) {
continue;
} else if (! unique_pin_id) {
continue; continue;
} else { } else {
pin_id = (*unique_pin_id)++; pin_id = (*unique_pin_id)++;
@ -1383,9 +1386,7 @@ NetGraphNode::NetGraphNode (const db::SubCircuit *sc, CircuitCategorizer &circui
if (! cm->has_other_pin_for_this_pin (pin_id)) { if (! cm->has_other_pin_for_this_pin (pin_id)) {
// isolated pins are ignored, others are considered for the matching // isolated pins are ignored, others are considered for the matching
if (net_at_pin->pin_count () == 0 && net_at_pin->terminal_count () == 0 && net_at_pin->subcircuit_pin_count () == 1) { if (! unique_pin_id || is_non_trivial_net (net_at_pin)) {
continue;
} else if (! unique_pin_id) {
continue; continue;
} else { } else {
pin_id = (*unique_pin_id)++; pin_id = (*unique_pin_id)++;