Skip to content

Commit 3d23aea

Browse files
Did clang format
1 parent 261b977 commit 3d23aea

4 files changed

Lines changed: 37 additions & 30 deletions

File tree

src/games/behavspt.cc

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -272,38 +272,45 @@ std::shared_ptr<GameSequenceForm> BehaviorSupportProfile::GetSequenceForm() cons
272272
return m_sequenceForm;
273273
}
274274

275-
SequencesWrapper BehaviorSupportProfile::GetSequences() const {
275+
SequencesWrapper BehaviorSupportProfile::GetSequences() const
276+
{
276277
auto sequences = GetSequenceForm()->GetSequences();
277278
return SequencesWrapper(sequences);
278279
}
279280

280-
PlayerSequencesWrapper BehaviorSupportProfile::GetSequences(GamePlayer &p_player) const {
281+
PlayerSequencesWrapper BehaviorSupportProfile::GetSequences(GamePlayer &p_player) const
282+
{
281283
auto sequences = GetSequenceForm()->GetSequences(p_player);
282284
return PlayerSequencesWrapper(sequences);
283285
}
284286

285287
int BehaviorSupportProfile::GetConstraintEntry(const GameInfoset &p_infoset,
286-
const GameAction &p_action) const {
288+
const GameAction &p_action) const
289+
{
287290
return GetSequenceForm()->GetConstraintEntry(p_infoset, p_action);
288291
}
289292

290-
const Rational &BehaviorSupportProfile::GetPayoff(const std::map<GamePlayer,
291-
std::shared_ptr<GameSequenceRep>> &p_profile,
292-
const GamePlayer &p_player) const {
293+
const Rational &BehaviorSupportProfile::GetPayoff(
294+
const std::map<GamePlayer, std::shared_ptr<GameSequenceRep>> &p_profile,
295+
const GamePlayer &p_player) const
296+
{
293297
return GetSequenceForm()->GetPayoff(p_profile, p_player);
294298
}
295299

296300
MixedBehaviorProfile<double> BehaviorSupportProfile::ToMixedBehaviorProfile(
297-
const std::map<std::shared_ptr<GameSequenceRep>, double> &p_profile) const {
301+
const std::map<std::shared_ptr<GameSequenceRep>, double> &p_profile) const
302+
{
298303
return GetSequenceForm()->ToMixedBehaviorProfile(p_profile);
299304
}
300305

301-
InfosetsWrapper BehaviorSupportProfile::GetInfosets() const {
306+
InfosetsWrapper BehaviorSupportProfile::GetInfosets() const
307+
{
302308
auto infosets = GetSequenceForm()->GetInfosets();
303309
return InfosetsWrapper(infosets);
304310
}
305311

306-
ContingenciesWrapper BehaviorSupportProfile::GetContingencies() const {
312+
ContingenciesWrapper BehaviorSupportProfile::GetContingencies() const
313+
{
307314
auto contingencies = GetSequenceForm()->GetContingencies();
308315
return ContingenciesWrapper(contingencies);
309316
}

src/games/behavspt.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,14 @@ class BehaviorSupportProfile {
152152
SequencesWrapper GetSequences() const;
153153
PlayerSequencesWrapper GetSequences(GamePlayer &p_player) const;
154154
int GetConstraintEntry(const GameInfoset &p_infoset, const GameAction &p_action) const;
155-
const Rational &GetPayoff(const std::map<GamePlayer, std::shared_ptr<GameSequenceRep>> &p_profile,
156-
const GamePlayer &p_player) const;
157-
GameRep::Players GetPlayers() const {return GetGame()->GetPlayers();}
158-
MixedBehaviorProfile<double> ToMixedBehaviorProfile(const std::map<std::shared_ptr<GameSequenceRep>, double> &) const;
155+
const Rational &
156+
GetPayoff(const std::map<GamePlayer, std::shared_ptr<GameSequenceRep>> &p_profile,
157+
const GamePlayer &p_player) const;
158+
GameRep::Players GetPlayers() const { return GetGame()->GetPlayers(); }
159+
MixedBehaviorProfile<double>
160+
ToMixedBehaviorProfile(const std::map<std::shared_ptr<GameSequenceRep>, double> &) const;
159161
InfosetsWrapper GetInfosets() const;
160162
ContingenciesWrapper GetContingencies() const;
161-
162163
};
163164

164165
} // end namespace Gambit

src/games/gameseq.h

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -293,11 +293,11 @@ class GameSequenceForm {
293293
ToMixedBehaviorProfile(const std::map<GameSequence, double> &) const;
294294
};
295295

296-
297296
class SequencesWrapper {
298297
public:
299-
explicit SequencesWrapper(const GameSequenceForm::Sequences& sequences)
300-
: m_sequences(sequences) {}
298+
explicit SequencesWrapper(const GameSequenceForm::Sequences &sequences) : m_sequences(sequences)
299+
{
300+
}
301301

302302
auto begin() const { return m_sequences.begin(); }
303303
auto end() const { return m_sequences.end(); }
@@ -308,11 +308,12 @@ class SequencesWrapper {
308308
GameSequenceForm::Sequences m_sequences;
309309
};
310310

311-
312311
class PlayerSequencesWrapper {
313312
public:
314-
explicit PlayerSequencesWrapper(const GameSequenceForm::PlayerSequences& sequences)
315-
: m_sequences(sequences) {}
313+
explicit PlayerSequencesWrapper(const GameSequenceForm::PlayerSequences &sequences)
314+
: m_sequences(sequences)
315+
{
316+
}
316317

317318
auto begin() const { return m_sequences.begin(); }
318319
auto end() const { return m_sequences.end(); }
@@ -323,23 +324,22 @@ class PlayerSequencesWrapper {
323324
GameSequenceForm::PlayerSequences m_sequences;
324325
};
325326

326-
327327
class InfosetsWrapper {
328328
public:
329-
explicit InfosetsWrapper(const GameSequenceForm::Infosets& infosets)
330-
: m_infosets(infosets) {}
329+
explicit InfosetsWrapper(const GameSequenceForm::Infosets &infosets) : m_infosets(infosets) {}
331330

332331
std::size_t size() const { return m_infosets.size(); }
333332

334333
private:
335334
GameSequenceForm::Infosets m_infosets;
336335
};
337336

338-
339337
class ContingenciesWrapper {
340338
public:
341-
explicit ContingenciesWrapper(const GameSequenceForm::Contingencies& contingencies)
342-
: m_contingencies(contingencies) {}
339+
explicit ContingenciesWrapper(const GameSequenceForm::Contingencies &contingencies)
340+
: m_contingencies(contingencies)
341+
{
342+
}
343343

344344
auto begin() { return m_contingencies.begin(); }
345345
auto end() { return m_contingencies.end(); }
@@ -348,7 +348,6 @@ class ContingenciesWrapper {
348348
GameSequenceForm::Contingencies m_contingencies;
349349
};
350350

351-
352351
} // end namespace Gambit
353352

354353
#endif // GAMESEQ_H

src/solvers/enumpoly/efgpoly.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ Polynomial<double> BuildSequenceVariable(ProblemData &p_data, const GameSequence
8080
}
8181

8282
ProblemData::ProblemData(const BehaviorSupportProfile &p_support)
83-
: m_support(p_support),
84-
space(std::make_shared<VariableSpace>(m_support.GetSequences().size() - m_support.GetInfosets().size() -
85-
m_support.GetPlayers().size()))
83+
: m_support(p_support), space(std::make_shared<VariableSpace>(m_support.GetSequences().size() -
84+
m_support.GetInfosets().size() -
85+
m_support.GetPlayers().size()))
8686
{
8787
for (auto sequence : m_support.GetSequences()) {
8888
if (sequence->action &&

0 commit comments

Comments
 (0)