Skip to content

Change GameTreeInfosetRep::m_members from Array to std::vector. #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tturocy merged 1 commit into from
Mar 31, 2025
Merged

Change GameTreeInfosetRep::m_members from Array to std::vector. #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/games/gametree.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,9 @@ GameAction GameTreeInfosetRep::InsertAction(GameAction p_action /* =0 */)
}
RenumberActions();
for (int i = 1; i <= m_members.size(); i++) {
m_members[i]->m_children.insert(std::next(m_members[i]->m_children.cbegin(), where - 1),
new GameTreeNodeRep(m_efg, m_members[i]));
m_members[i - 1]->m_children.insert(
std::next(m_members[i - 1]->m_children.cbegin(), where - 1),
new GameTreeNodeRep(m_efg, m_members[i - 1]));
}

m_efg->ClearComputedValues();
Expand Down Expand Up @@ -290,7 +291,7 @@ void GameTreeInfosetRep::Reveal(GamePlayer p_player)
m_efg->Canonicalize();
}

GameNode GameTreeInfosetRep::GetMember(int p_index) const { return m_members[p_index]; }
GameNode GameTreeInfosetRep::GetMember(int p_index) const { return m_members[p_index - 1]; }

Array<GameNode> GameTreeInfosetRep::GetMembers() const
{
Expand Down Expand Up @@ -809,10 +810,10 @@ void GameTreeRep::Canonicalize()
GameTreeInfosetRep *infoset = player->m_infosets[iset - 1];
for (int i = 1; i < infoset->m_members.size(); i++) {
for (int j = 1; j < infoset->m_members.size() - i; j++) {
if (infoset->m_members[j + 1]->m_number < infoset->m_members[j]->m_number) {
GameTreeNodeRep *tmp = infoset->m_members[j];
infoset->m_members[j] = infoset->m_members[j + 1];
infoset->m_members[j + 1] = tmp;
if (infoset->m_members[j]->m_number < infoset->m_members[j - 1]->m_number) {
GameTreeNodeRep *tmp = infoset->m_members[j - 1];
infoset->m_members[j - 1] = infoset->m_members[j];
infoset->m_members[j] = tmp;
}
}
}
Expand All @@ -824,10 +825,10 @@ void GameTreeRep::Canonicalize()
for (int i = 1; i < player->m_infosets.size(); i++) {
for (int j = 1; j < player->m_infosets.size() - i; j++) {
int a = ((player->m_infosets[j]->m_members.size())
? player->m_infosets[j]->m_members[1]->m_number
? player->m_infosets[j]->m_members[0]->m_number
: 0);
int b = ((player->m_infosets[j - 1]->m_members.size())
? player->m_infosets[j - 1]->m_members[1]->m_number
? player->m_infosets[j - 1]->m_members[0]->m_number
: 0);

if (a < b || b == 0) {
Expand Down
2 changes: 1 addition & 1 deletion src/games/gametree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class GameTreeInfosetRep : public GameInfosetRep {
std::string m_label;
GamePlayerRep *m_player;
Array<GameTreeActionRep *> m_actions;
Array<GameTreeNodeRep *> m_members;
std::vector<GameTreeNodeRep *> m_members;
int flag, whichbranch{0};
Array<Number> m_probs;

Expand Down