From dda7ee8b608c7bd344927ba39e50dff3a95293d6 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 10 May 2019 00:18:58 +0200 Subject: [PATCH] WIP: a small refactoring. --- src/db/db/dbLayoutToNetlistReader.cc | 6 +++--- src/db/db/dbLayoutToNetlistReader.h | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/db/db/dbLayoutToNetlistReader.cc b/src/db/db/dbLayoutToNetlistReader.cc index 21d895583..3cbf4d91c 100644 --- a/src/db/db/dbLayoutToNetlistReader.cc +++ b/src/db/db/dbLayoutToNetlistReader.cc @@ -678,7 +678,7 @@ LayoutToNetlistStandardReader::read_device (db::LayoutToNetlist *l2n, db::Circui std::map, size_t>::const_iterator a = abstracts.find (std::make_pair (i->device_abstract, offset)); if (a != abstracts.end () && a->second < insts.size ()) { - Connections ref (net->cluster_id (), i->device_abstract->cluster_id_for_terminal (i->other_terminal_id), dbu_inv * i->offset); + Connections ref (net->cluster_id (), i->device_abstract->cluster_id_for_terminal (i->other_terminal_id)); connections [insts [a->second]].push_back (ref); } @@ -690,7 +690,7 @@ LayoutToNetlistStandardReader::read_device (db::LayoutToNetlist *l2n, db::Circui std::map, size_t>::const_iterator a = abstracts.find (std::make_pair (dm, db::Vector ())); if (a != abstracts.end () && a->second < insts.size ()) { - Connections ref (net->cluster_id (), dm->cluster_id_for_terminal (tid), db::Vector ()); + Connections ref (net->cluster_id (), dm->cluster_id_for_terminal (tid)); connections [insts [a->second]].push_back (ref); } @@ -790,7 +790,7 @@ LayoutToNetlistStandardReader::read_subcircuit (db::LayoutToNetlist *l2n, db::Ci subcircuit->connect_pin (sc_pin->id (), net); db::Net *sc_net = circuit_ref->net_for_pin (sc_pin->id ()); if (sc_net) { - refs.push_back (Connections (net->cluster_id (), sc_net->cluster_id (), db::Vector ())); + refs.push_back (Connections (net->cluster_id (), sc_net->cluster_id ())); } } else { diff --git a/src/db/db/dbLayoutToNetlistReader.h b/src/db/db/dbLayoutToNetlistReader.h index 4f88c6417..ad1d43b21 100644 --- a/src/db/db/dbLayoutToNetlistReader.h +++ b/src/db/db/dbLayoutToNetlistReader.h @@ -74,12 +74,11 @@ private: struct Connections { - Connections (size_t _from_cluster, size_t _to_cluster, const db::Vector &_offset) - : from_cluster (_from_cluster), to_cluster (_to_cluster), offset (_offset) + Connections (size_t _from_cluster, size_t _to_cluster) + : from_cluster (_from_cluster), to_cluster (_to_cluster) { } size_t from_cluster, to_cluster; - db::Vector offset; }; tl::TextInputStream m_stream;