Skip to content

Commit f038c28

Browse files
committed
Merge branch 'maint16_3'
# Conflicts: # ChangeLog
2 parents 02cd061 + ef6e67b commit f038c28

File tree

3 files changed

+54
-2
lines changed

3 files changed

+54
-2
lines changed

.github/workflows/python.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,52 @@ jobs:
3232
- name: Run tests
3333
run: pytest
3434

35+
macos-13:
36+
runs-on: macos-13
37+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
38+
strategy:
39+
matrix:
40+
python-version: ['3.12']
41+
42+
steps:
43+
- uses: actions/checkout@v4
44+
- name: Set up Python ${{ matrix.python-version }}
45+
uses: actions/setup-python@v5
46+
with:
47+
python-version: ${{ matrix.python-version }}
48+
- name: Set up dependencies
49+
run: |
50+
python -m pip install --upgrade pip
51+
pip install cython pytest wheel lxml numpy scipy
52+
- name: Build extension
53+
run: |
54+
python -m pip install -v .
55+
- name: Run tests
56+
run: pytest
57+
58+
macos-14:
59+
runs-on: macos-14
60+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
61+
strategy:
62+
matrix:
63+
python-version: ['3.12']
64+
65+
steps:
66+
- uses: actions/checkout@v4
67+
- name: Set up Python ${{ matrix.python-version }}
68+
uses: actions/setup-python@v5
69+
with:
70+
python-version: ${{ matrix.python-version }}
71+
- name: Set up dependencies
72+
run: |
73+
python -m pip install --upgrade pip
74+
pip install cython pytest wheel lxml numpy scipy
75+
- name: Build extension
76+
run: |
77+
python -m pip install -v .
78+
- name: Run tests
79+
run: pytest
80+
3581
windows:
3682
runs-on: windows-latest
3783
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name

ChangeLog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@
88
been removed as planned. (#357)
99

1010

11+
## [16.3.1] - unreleased
12+
13+
### Fixed
14+
- Corrected a regression in which information sets were prematurely invalidated (and therefore
15+
`delete this` called on them) when removing the last node from an information set.
16+
17+
1118
## [16.3.0] - 2025-01-13
1219

1320
### General

src/games/gametree.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ void GameTreeActionRep::DeleteAction()
139139
member->m_children[where]->Invalidate();
140140
erase_atindex(member->m_children, where);
141141
}
142-
143142
if (m_infoset->IsChanceInfoset()) {
144143
m_infoset->m_efg->NormalizeChanceProbs(m_infoset);
145144
}
@@ -263,11 +262,11 @@ void GameTreeInfosetRep::RemoveMember(GameTreeNodeRep *p_node)
263262
if (m_members.empty()) {
264263
m_player->m_infosets.erase(
265264
std::find(m_player->m_infosets.begin(), m_player->m_infosets.end(), this));
266-
Invalidate();
267265
int iset = 1;
268266
for (auto &infoset : m_player->m_infosets) {
269267
infoset->m_number = iset++;
270268
}
269+
Invalidate();
271270
}
272271
}
273272

0 commit comments

Comments
 (0)