@@ -144,7 +144,7 @@ void Graphics::drawInitial(gui::Painter& painter)
144144void Graphics::drawForce (gui::Painter& painter)
145145{
146146 for (const auto & nb : nbVec_) {
147- const auto & bins = nb->bins ();
147+ const auto & bins = nb->getNins ();
148148 if (bins.empty ()) {
149149 continue ;
150150 }
@@ -270,8 +270,8 @@ void Graphics::drawNesterov(gui::Painter& painter)
270270 painter.setPen (gui::Painter::kTransparent );
271271
272272 for (const auto & nb : nbVec_) {
273- for (auto & bin : nb->bins ()) {
274- int density = bin.density () * 50 + 20 ;
273+ for (auto & bin : nb->getNins ()) {
274+ int density = bin.getDensity () * 50 + 20 ;
275275 gui::Painter::Color color;
276276 if (density > 255 ) {
277277 color = {255 , 165 , 0 , 180 }; // orange = out of the range
@@ -304,12 +304,12 @@ void Graphics::drawNesterov(gui::Painter& painter)
304304 if (selected_ != kInvalidIndex && nbc_->getGCellByIndex (selected_)) {
305305 painter.setPen (gui::Painter::kYellow , true );
306306 for (GPin* pin : nbc_->getGCellByIndex (selected_)->gPins ()) {
307- GNet* net = pin->gNet ();
307+ GNet* net = pin->getGNet ();
308308 if (!net) {
309309 continue ;
310310 }
311- for (GPin* other_pin : net->gPins ()) {
312- GCell* neighbor = other_pin->gCell ();
311+ for (GPin* other_pin : net->getGPins ()) {
312+ GCell* neighbor = other_pin->getGCell ();
313313 if (neighbor == nbc_->getGCellByIndex (selected_)) {
314314 continue ;
315315 }
@@ -368,12 +368,12 @@ void Graphics::reportSelected()
368368 for (auto & gPin : nbc_->getGCellByIndex (selected_)->gPins ()) {
369369 FloatPoint wlGrad
370370 = nbc_->getWireLengthGradientPinWA (gPin , wlCoeffX, wlCoeffY);
371- const float weight = gPin ->gNet ()->totalWeight ();
371+ const float weight = gPin ->getGNet ()->getTotalWeight ();
372372 logger_->report (" ({:+.2e}, {:+.2e}) (weight = {}) pin {}" ,
373373 wlGrad.x ,
374374 wlGrad.y ,
375375 weight,
376- gPin ->pin ()->getName ());
376+ gPin ->getPin ()->getName ());
377377 }
378378
379379 FloatPoint wlGrad = nbc_->getWireLengthGradientWA (
@@ -510,37 +510,37 @@ bool Graphics::populateMap()
510510 double max_value = std::numeric_limits<double >::lowest ();
511511
512512 if (heatmap_type_ == OverflowMinMax) {
513- for (const Bin& bin : grid.bins ()) {
514- int64_t binArea = bin.binArea ();
513+ for (const Bin& bin : grid.getNins ()) {
514+ int64_t binArea = bin.getBinArea ();
515515 const float scaledBinArea
516- = static_cast <float >(binArea * bin.targetDensity ());
516+ = static_cast <float >(binArea * bin.getTargetDensity ());
517517
518518 double value = std::max (
519519 0 .0f ,
520- static_cast <float >(bin.instPlacedAreaUnscaled ())
521- + static_cast <float >(bin.nonPlaceAreaUnscaled ()) - scaledBinArea);
520+ static_cast <float >(bin.getInstPlacedAreaUnscaled ())
521+ + static_cast <float >(bin.getNonPlaceAreaUnscaled ()) - scaledBinArea);
522522 value = block->dbuAreaToMicrons (value);
523523
524524 min_value = std::min (min_value, value);
525525 max_value = std::max (max_value, value);
526526 }
527527 }
528528
529- for (const Bin& bin : grid.bins ()) {
529+ for (const Bin& bin : grid.getNins ()) {
530530 odb::Rect box (bin.lx (), bin.ly (), bin.ux (), bin.uy ());
531531 double value = 0.0 ;
532532
533533 if (heatmap_type_ == Density) {
534- value = bin.density () * 100.0 ;
534+ value = bin.getDensity () * 100.0 ;
535535 } else if (heatmap_type_ == Overflow || heatmap_type_ == OverflowMinMax) {
536- int64_t binArea = bin.binArea ();
536+ int64_t binArea = bin.getBinArea ();
537537 const float scaledBinArea
538- = static_cast <float >(binArea * bin.targetDensity ());
538+ = static_cast <float >(binArea * bin.getTargetDensity ());
539539
540540 double raw_value = std::max (
541541 0 .0f ,
542- static_cast <float >(bin.instPlacedAreaUnscaled ())
543- + static_cast <float >(bin.nonPlaceAreaUnscaled ()) - scaledBinArea);
542+ static_cast <float >(bin.getInstPlacedAreaUnscaled ())
543+ + static_cast <float >(bin.getNonPlaceAreaUnscaled ()) - scaledBinArea);
544544 raw_value = block->dbuAreaToMicrons (raw_value);
545545
546546 if (heatmap_type_ == OverflowMinMax && max_value > min_value) {
@@ -559,7 +559,7 @@ bool Graphics::populateMap()
559559void Graphics::populateXYGrid ()
560560{
561561 BinGrid& grid = nbVec_[0 ]->getBinGrid ();
562- std::vector<Bin>& bin = grid.bins ();
562+ std::vector<Bin>& bin = grid.getNins ();
563563 int x_grid = grid.binCntX ();
564564 int y_grid = grid.binCntY ();
565565
0 commit comments