Skip to content

Commit 7dc3488

Browse files
committed
Formatting fixup.
1 parent 1d85c3e commit 7dc3488

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

src/games/game.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -670,8 +670,9 @@ Game ReadGame(std::istream &p_stream);
670670
template <class Generator>
671671
std::list<Rational> UniformOnSimplex(int p_denom, size_t p_dim, Generator &generator)
672672
{
673-
std::uniform_int_distribution dist(1,
674-
p_denom + int(p_dim) - 1); // NOLINT(misc-const-correctness)
673+
// NOLINTBEGIN(misc-const-correctness)
674+
std::uniform_int_distribution dist(1, p_denom + int(p_dim) - 1);
675+
// NOLINTEND(misc-const-correctness)
675676
std::set<int> cutoffs;
676677
while (cutoffs.size() < p_dim - 1) {
677678
cutoffs.insert(dist(generator));

src/solvers/enumpoly/ndarray.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ template <class T> class NDArray {
6969
m_offsets.front() = 1;
7070
std::partial_sum(m_index_dim.begin(), m_index_dim.end(), std::next(m_offsets.begin()),
7171
std::multiplies<>());
72-
m_offsets_sum = std::accumulate(m_offsets.begin(), m_offsets.end(),
73-
0); // NOLINT(cppcoreguidelines-prefer-member-initializer)
72+
// NOLINTBEGIN(cppcoreguidelines-prefer-member-initializer)
73+
m_offsets_sum = std::accumulate(m_offsets.begin(), m_offsets.end(), 0);
74+
// NOLINTEND(cppcoreguidelines-prefer-member-initializer)
7475
}
7576

7677
NDArray(const NDArray<T> &) = default;

src/solvers/linalg/lpsolve.imp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ template <class T> Array<int> MakeArtificials(const Vector<T> &b)
3737

3838
template <class T>
3939
LPSolve<T>::LPSolve(const Matrix<T> &A, const Vector<T> &b, const Vector<T> &c, int nequals)
40-
: nvars(c.size()), neqns(b.size()),
41-
nequals(nequals), total_cost(0), tmin(0), tab(A, MakeArtificials(b), b), UB(nvars + neqns),
42-
LB(nvars + neqns), ub(nvars + neqns), lb(nvars + neqns), xx(nvars + neqns),
43-
cost(nvars + neqns), y(b.size()), x(b.size()), d(b.size())
40+
: nvars(c.size()), neqns(b.size()), nequals(nequals), total_cost(0), tmin(0),
41+
tab(A, MakeArtificials(b), b), UB(nvars + neqns), LB(nvars + neqns), ub(nvars + neqns),
42+
lb(nvars + neqns), xx(nvars + neqns), cost(nvars + neqns), y(b.size()), x(b.size()),
43+
d(b.size())
4444
{
4545
// These are the values recommended by Murtagh (1981) for 15 digit
4646
// accuracy in LP problems

src/solvers/linalg/vertenum.imp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ VertexEnumerator<T>::VertexEnumerator(const Matrix<T> &A, const Vector<T> &b)
2929
: mult_opt(std::any_of(b.begin(), b.end(), [](const T &v) { return v == static_cast<T>(0); })),
3030
A(A), b(b), btemp(b)
3131
{
32-
btemp = static_cast<T>(-1); // NOLINT(cppcoreguidelines-prefer-member-initializer)
32+
btemp = static_cast<T>(-1); // NOLINT(cppcoreguidelines-prefer-member-initializer)
3333
LPTableau<T> tab(A, b);
3434
Vector<T> c(A.MinCol(), A.MaxCol());
3535
c = static_cast<T>(1);

src/solvers/logit/logbehav.imp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030

3131
template <class T>
3232
LogBehavProfile<T>::LogBehavProfile(const Game &p_game)
33-
: m_game(p_game), m_probs(m_game->BehavProfileLength()),
34-
m_logProbs(m_game->BehavProfileLength())
33+
: m_game(p_game), m_probs(m_game->BehavProfileLength()), m_logProbs(m_game->BehavProfileLength())
3534
{
3635
int index = 1;
3736
for (const auto &player : p_game->GetPlayers()) {

0 commit comments

Comments
 (0)