Skip to content

Commit f2bd448

Browse files
committed
stt: adjust naming to Google-style (excluding method names)
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
1 parent 1c67315 commit f2bd448

5 files changed

Lines changed: 33 additions & 33 deletions

File tree

src/stt/include/stt/SteinerTreeBuilder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class SteinerTreeBuilder
8989
private:
9090
int computeHPWL(odb::dbNet* net);
9191

92-
static constexpr int flute_accuracy = 3;
92+
static constexpr int kFluteAccuracy = 3;
9393
float alpha_;
9494
std::map<const odb::dbNet*, float> net_alpha_map_;
9595
std::pair<int, float> min_fanout_alpha_;

src/stt/src/LinesRenderer.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace stt {
1010

11-
LinesRenderer* LinesRenderer::lines_renderer = nullptr;
11+
LinesRenderer* LinesRenderer::lines_renderer_ = nullptr;
1212

1313
void LinesRenderer::highlight(const LineSegments& lines,
1414
const gui::Painter::Color& color)
@@ -30,9 +30,9 @@ void LinesRenderer::drawObjects(gui::Painter& painter)
3030
void highlightSteinerTree(const Tree& tree, gui::Gui* gui)
3131
{
3232
if (gui::Gui::enabled()) {
33-
if (LinesRenderer::lines_renderer == nullptr) {
34-
LinesRenderer::lines_renderer = new LinesRenderer();
35-
gui->registerRenderer(LinesRenderer::lines_renderer);
33+
if (LinesRenderer::lines_renderer_ == nullptr) {
34+
LinesRenderer::lines_renderer_ = new LinesRenderer();
35+
gui->registerRenderer(LinesRenderer::lines_renderer_);
3636
}
3737
LinesRenderer::LineSegments lines;
3838
for (int i = 0; i < tree.branchCount(); i++) {
@@ -44,7 +44,7 @@ void highlightSteinerTree(const Tree& tree, gui::Gui* gui)
4444
const int y2 = neighbor.y;
4545
lines.emplace_back(odb::Point(x1, y1), odb::Point(x2, y2));
4646
}
47-
LinesRenderer::lines_renderer->highlight(lines, gui::Painter::kRed);
47+
LinesRenderer::lines_renderer_->highlight(lines, gui::Painter::kRed);
4848
}
4949
}
5050

src/stt/src/LinesRenderer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class LinesRenderer : public gui::Renderer
2323
void highlight(const LineSegments& lines, const gui::Painter::Color& color);
2424
void drawObjects(gui::Painter& /* painter */) override;
2525
// singleton for debug functions
26-
static LinesRenderer* lines_renderer;
26+
static LinesRenderer* lines_renderer_;
2727

2828
private:
2929
LineSegments lines_;

src/stt/src/SteinerTreeBuilder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Tree SteinerTreeBuilder::makeSteinerTree(const std::vector<int>& x,
7979
}
8080
// Fall back to flute if PD fails.
8181
}
82-
return flute_->flute(x, y, flute_accuracy);
82+
return flute_->flute(x, y, kFluteAccuracy);
8383
}
8484

8585
Tree SteinerTreeBuilder::makeSteinerTree(const std::vector<int>& x,

src/stt/src/flt/flute.cpp

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ static const char* readDecimalInt(const char* s, int& value)
134134
if (negative || *s == '+') {
135135
++s;
136136
}
137-
constexpr int zero_code = int('0');
137+
constexpr int kZeroCode = int('0');
138138
while (*s >= '0' && *s <= '9') {
139-
value = 10 * value + (int(*s) - zero_code);
139+
value = 10 * value + (int(*s) - kZeroCode);
140140
++s;
141141
}
142142
if (negative) {
@@ -445,15 +445,15 @@ int Flute::flutes_wl_medium_degree(int d,
445445
const int ub = d - 1 - lb;
446446

447447
// Compute scores
448-
constexpr double AAWL = 0.6;
449-
constexpr double BBWL = 0.3;
450-
const float CCWL = 7.4 / ((d + 10.) * (d - 3.));
451-
const float DDWL = 4.8 / (d - 1);
448+
constexpr double kAawl = 0.6;
449+
constexpr double kBbwl = 0.3;
450+
const float ccwl = 7.4 / ((d + 10.) * (d - 3.));
451+
const float ddwl = 4.8 / (d - 1);
452452

453453
// Compute penalty[]
454454
std::vector<float> penalty(degree);
455-
const float dx = CCWL * (xs[d - 2] - xs[1]);
456-
const float dy = CCWL * (ys[d - 2] - ys[1]);
455+
const float dx = ccwl * (xs[d - 2] - xs[1]);
456+
const float dy = ccwl * (ys[d - 2] - ys[1]);
457457
float pnlty = 0;
458458
for (int r = d / 2; r >= 0; r--, pnlty += dx) {
459459
penalty[r] = pnlty;
@@ -529,19 +529,19 @@ int Flute::flutes_wl_medium_degree(int d,
529529
for (int r = lb; r <= ub; r++) {
530530
if (si[r] == 0 || si[r] == d - 1) {
531531
score[nbp] = (xs[r + 1] - xs[r - 1]) - penalty[r]
532-
- AAWL * (ys[d - 2] - ys[1]) - DDWL * disty[r];
532+
- kAawl * (ys[d - 2] - ys[1]) - ddwl * disty[r];
533533
} else {
534534
score[nbp] = (xs[r + 1] - xs[r - 1]) - penalty[r]
535-
- BBWL * (ys[si[r] + 1] - ys[si[r] - 1]) - DDWL * disty[r];
535+
- kBbwl * (ys[si[r] + 1] - ys[si[r] - 1]) - ddwl * disty[r];
536536
}
537537
nbp++;
538538

539539
if (s[r] == 0 || s[r] == d - 1) {
540540
score[nbp] = (ys[r + 1] - ys[r - 1]) - penalty[s[r]]
541-
- AAWL * (xs[d - 2] - xs[1]) - DDWL * distx[r];
541+
- kAawl * (xs[d - 2] - xs[1]) - ddwl * distx[r];
542542
} else {
543543
score[nbp] = (ys[r + 1] - ys[r - 1]) - penalty[s[r]]
544-
- BBWL * (xs[s[r] + 1] - xs[s[r] - 1]) - DDWL * distx[r];
544+
- kBbwl * (xs[s[r] + 1] - xs[s[r] - 1]) - ddwl * distx[r];
545545
}
546546
nbp++;
547547
}
@@ -991,15 +991,15 @@ Tree Flute::flutes_medium_degree(const int d,
991991
const int ub = d - 1 - lb;
992992

993993
// Compute scores
994-
constexpr double AA = 0.6; // 2.0*BB
995-
constexpr double BB = 0.3;
994+
constexpr double kAa = 0.6; // 2.0*BB
995+
constexpr double kBb = 0.3;
996996

997-
const float CC = 7.4 / ((d + 10.) * (d - 3.));
998-
const float DD = 4.8 / (d - 1);
997+
const float cc = 7.4 / ((d + 10.) * (d - 3.));
998+
const float dd = 4.8 / (d - 1);
999999

10001000
// Compute penalty[]
1001-
const float dx = CC * (xs[d - 2] - xs[1]);
1002-
const float dy = CC * (ys[d - 2] - ys[1]);
1001+
const float dx = cc * (xs[d - 2] - xs[1]);
1002+
const float dy = cc * (ys[d - 2] - ys[1]);
10031003
float pnlty = 0;
10041004
for (int r = d / 2; r >= 2; r--, pnlty += dx) {
10051005
penalty[r] = pnlty, penalty[d - 1 - r] = pnlty;
@@ -1057,26 +1057,26 @@ Tree Flute::flutes_medium_degree(const int d,
10571057
int nbp = 0;
10581058
for (int r = lb; r <= ub; r++) {
10591059
if (si[r] <= 1) {
1060-
score[nbp] = (xs[r + 1] - xs[r - 1]) - penalty[r] - AA * (ys[2] - ys[1])
1061-
- DD * disty[r];
1060+
score[nbp] = (xs[r + 1] - xs[r - 1]) - penalty[r] - kAa * (ys[2] - ys[1])
1061+
- dd * disty[r];
10621062
} else if (si[r] >= d - 2) {
10631063
score[nbp] = (xs[r + 1] - xs[r - 1]) - penalty[r]
1064-
- AA * (ys[d - 2] - ys[d - 3]) - DD * disty[r];
1064+
- kAa * (ys[d - 2] - ys[d - 3]) - dd * disty[r];
10651065
} else {
10661066
score[nbp] = (xs[r + 1] - xs[r - 1]) - penalty[r]
1067-
- BB * (ys[si[r] + 1] - ys[si[r] - 1]) - DD * disty[r];
1067+
- kBb * (ys[si[r] + 1] - ys[si[r] - 1]) - dd * disty[r];
10681068
}
10691069
nbp++;
10701070

10711071
if (s[r] <= 1) {
10721072
score[nbp] = (ys[r + 1] - ys[r - 1]) - penalty[s[r]]
1073-
- AA * (xs[2] - xs[1]) - DD * distx[r];
1073+
- kAa * (xs[2] - xs[1]) - dd * distx[r];
10741074
} else if (s[r] >= d - 2) {
10751075
score[nbp] = (ys[r + 1] - ys[r - 1]) - penalty[s[r]]
1076-
- AA * (xs[d - 2] - xs[d - 3]) - DD * distx[r];
1076+
- kAa * (xs[d - 2] - xs[d - 3]) - dd * distx[r];
10771077
} else {
10781078
score[nbp] = (ys[r + 1] - ys[r - 1]) - penalty[s[r]]
1079-
- BB * (xs[s[r] + 1] - xs[s[r] - 1]) - DD * distx[r];
1079+
- kBb * (xs[s[r] + 1] - xs[s[r] - 1]) - dd * distx[r];
10801080
}
10811081
nbp++;
10821082
}

0 commit comments

Comments
 (0)