odb: fix naming in tmg_conn*.h

Signed-off-by: Matt Liberty <[email protected]>

Author: maliberty

src/odb/src/db/tmg_conn.cpp

@@ -1330,7 +1330,7 @@ void tmg_conn::analyzeNet(dbNet* net)
     relocateShorts();
     treeReorder(noConvert);
   }
-  net->setDisconnected(!_connected);
+  net->setDisconnected(!connected_);
   net->setWireOrdered(true);
 }
 
@@ -1422,7 +1422,7 @@ bool tmg_conn::checkConnected()
 
 void tmg_conn::treeReorder(const bool no_convert)
 {
-  _connected = true;
+  connected_ = true;
   need_short_wire_id_ = false;
   if (ptV_.empty()) {
     return;
@@ -1442,7 +1442,7 @@ void tmg_conn::treeReorder(const bool no_convert)
   for (tmg_rcterm& x : termV_) {
     x.first_pt = nullptr;
     if (x.pt == nullptr) {
-      _connected = false;
+      connected_ = false;
     }
   }
 
@@ -1531,7 +1531,7 @@ void tmg_conn::treeReorder(const bool no_convert)
       last_term_index = j;
       if (j < termV_.size()) {
         // disconnected, start new path from another term
-        _connected = false;
+        connected_ = false;
         last_id_ = -1;
         tstackV_.push_back(x);
         pt = x->pt;

src/odb/src/db/tmg_conn.h

@@ -157,7 +157,7 @@ class tmg_conn
   void loadNet(dbNet* net);
   void loadWire(dbWire* wire);
   void loadSWire(dbNet* net);
-  bool isConnected() { return _connected; }
+  bool isConnected() { return connected_; }
   int ptDist(int fr, int to) const;
   const tmg_rcpt& pt(const int index) const { return ptV_[index]; }
   void checkConnOrdered();
@@ -225,7 +225,7 @@ class tmg_conn
   std::vector<tmg_rcshort> shortV_;
   dbNet* net_;
   bool hasSWire_;
-  bool _connected;
+  bool connected_;
   dbWireEncoder encoder_;
   dbWire* newWire_;
   dbTechNonDefaultRule* net_rule_;

src/odb/src/db/tmg_conn_g.cpp

@@ -20,7 +20,7 @@ tmg_conn_graph::tmg_conn_graph()
 {
   ptNmax_ = 1024;
   shortNmax_ = 1024;
-  _eNmax = 1024;
+  eNmax_ = 1024;
   ptV_ = (tcg_pt*) safe_malloc(ptNmax_ * sizeof(tcg_pt));
   path_vis_ = (int*) safe_malloc(ptNmax_ * sizeof(int));
   eV_ = (tcg_edge*) safe_malloc(2UL * ptNmax_ * sizeof(tcg_edge));
@@ -49,13 +49,13 @@ void tmg_conn_graph::init(const int ptN, const int shortN)
     free(stackV_);
     stackV_ = (tcg_edge**) safe_malloc(shortNmax_ * sizeof(tcg_edge*));
   }
-  if (4 * ptN + 2 * shortN > _eNmax) {
-    _eNmax *= 2;
-    if (4 * ptN + 2 * shortN > _eNmax) {
-      _eNmax = 4 * ptN + 2 * shortN;
+  if (4 * ptN + 2 * shortN > eNmax_) {
+    eNmax_ *= 2;
+    if (4 * ptN + 2 * shortN > eNmax_) {
+      eNmax_ = 4 * ptN + 2 * shortN;
     }
     free(eV_);
-    eV_ = (tcg_edge*) safe_malloc(_eNmax * sizeof(tcg_edge));
+    eV_ = (tcg_edge*) safe_malloc(eNmax_ * sizeof(tcg_edge));
   }
   eN_ = 0;
   for (int j = 0; j < ptN; j++) {
@@ -693,7 +693,7 @@ void tmg_conn::checkVisited()
   tcg_pt* pgV = graph_->ptV_;
   for (int j = 0; j < ptV_.size(); j++) {
     if (!pgV[j].visited) {
-      _connected = false;
+      connected_ = false;
       break;
     }
   }

src/odb/src/db/tmg_conn_g.h

@@ -59,7 +59,7 @@ class tmg_conn_graph
   tcg_edge* e_;
   int ptNmax_;
   int shortNmax_;
-  int _eNmax;
+  int eNmax_;
   tcg_edge* eV_;
   int eN_;
 };

src/odb/src/db/tmg_conn_w.cpp

@@ -17,15 +17,15 @@ void tmg_conn::checkConnOrdered()
 {
   std::unordered_set<dbITerm*> iterms;
   std::unordered_set<dbBTerm*> bterms;
-  _connected = true;
+  connected_ = true;
   dbWirePathItr pitr;
   pitr.begin(net_->getWire());
   dbWirePath path;
   bool first = true;
   while (pitr.getNextPath(path)) {
     if (!path.is_branch) {
       if (!path.iterm && !path.bterm) {
-        _connected = false;
+        connected_ = false;
       }
       if (first) {
         first = false;
@@ -38,13 +38,13 @@ void tmg_conn::checkConnOrdered()
       } else {
         if (path.iterm) {
           if (iterms.find(path.iterm) == iterms.end()) {
-            _connected = false;
+            connected_ = false;
             iterms.insert(path.iterm);
           }
         }
         if (path.bterm) {
           if (bterms.find(path.bterm) == bterms.end()) {
-            _connected = false;
+            connected_ = false;
             bterms.insert(path.bterm);
           }
         }
@@ -59,7 +59,7 @@ void tmg_conn::checkConnOrdered()
       }
     }
   }
-  if (!_connected) {
+  if (!connected_) {
     net_->setDisconnected(true);
     logger_->info(utl::ODB, 15, "disconnected net {}", net_->getName());
   }