HP tests

.all-contributorsrc

@@ -73,6 +73,16 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "wyz2368",
+      "name": "wyz2368",
+      "avatar_url": "https://avatars.githubusercontent.com/u/25018133?v=4",
+      "profile": "https://github.com/wyz2368",
+      "contributions": [
+        "code",
+        "research"
+      ]
     }
   ]
 }

.github/workflows/lint.yml

@@ -45,7 +45,7 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     steps:
       - uses: actions/checkout@v7
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v7
         with:
           python-version: "3.14"
       - uses: py-actions/flake8@v2
@@ -56,7 +56,7 @@ jobs:
     steps:
       - uses: actions/checkout@v7
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: "3.14"
       - name: Install Python packages

.github/workflows/python.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v7
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
       - name: Set up dependencies
@@ -44,7 +44,7 @@ jobs:
     steps:
       - uses: actions/checkout@v7
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
       - name: Set up dependencies
@@ -67,7 +67,7 @@ jobs:
     steps:
       - uses: actions/checkout@v7
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
       - name: Set up dependencies
@@ -90,7 +90,7 @@ jobs:
     steps:
       - uses: actions/checkout@v7
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
       - name: Set up dependencies

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
   create-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Extract changelog for this version
         run: |

.github/workflows/wheels.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/checkout@v7
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: '3.x'
       - name: Set up dependencies

AUTHORS

@@ -57,10 +57,3 @@ wxWidgets, which are Copyright (C) 2004-5 by John Labenski, and distributed
 under the wxWidgets license.  The version included here is the version
 dated 20 July 2005; see http://wxcode.sourceforge.net for details on these
 classes.
-
-TinyXML parser:
----------------
-The graphical interface reads and writes files in XML format.  The parsing
-is done using the TinyXml package from http://www.grinninglizard.com/tinyxml,
-and is distributed under the zlib license.  These are the files named
-tiny* in the sources/gui directory of the distribution.

ChangeLog

@@ -1,4 +1,18 @@
-## [16.7.0] - unreleased
+## [17.0.0] - unreleased
+
+### Changed
+- `lcp_solve` no longer silently absorbs internal exceptions if they occur, but instead these propagate out
+  to match the behaviour of all other Nash equilibrium solvers.  (#996)
+- `gnm_solve` executes callback when equilibrium is found rather than emitting all equilibria at the end of
+  the run.  (#998)
+- Implemented bespoke XML parser that handles the subset in the de-facto legacy XML workbook .gbt format;
+  removes dependency on tinyxml.  (#897)
+
+### Fixed
+- Converting a behavior profile to a strategy profile, and computing pure-strategy payoffs
+  no longer inserts spurious entries into a strategy's internal action map.
+
+## [16.7.0] - 2026-07-11
 
 ### Added
 - Added `Player.sequences` as the collection of sequences available to a player.
@@ -25,6 +39,9 @@
 - Corrected calculation of total number of actions for a player in `pygambit` (#938)
 - Corrected a regression in action graph games that left the internal data structure not fully initialised,
   leading to segmentation faults.
+- Corrected handling of malformed AGG/BAGG files: files with an invalid or degenerate header
+  (for example a wrong file type, or a header declaring zero players) are now rejected with a
+  `ValueError` instead of causing a segmentation fault while constructing the game.
 
 ### Changed
 - Added a new welcome/landing window on launching the GUI without a game.  This has the effect of
@@ -39,6 +56,9 @@
 - In `pygambit`, indexing game object collections by integer position has been removed.  (#942)
 - Validity of game object labels is enforced (printable ASCII and spaces only, no leading/trailing or
   double spaces); invalid labels raise `ValueError` in `pygambit`. (#944)
+- Nonempty labels are now required for all players, outcomes, actions, and strategies.
+  Labels must be unique within the game for players and outcomes, within the player for
+  strategies, and within the information set for actions.
 - Refined and clarified the graphical interface's handling (and persisting) of "workspaces", and
   improved warning messages on closing windows for games or workspaces with unsaved changes.
 - In `pygambit`, the `.outcome`, `.player`, and `.infoset` attributes are now treated as predicates

Makefile.am

@@ -223,11 +223,7 @@ core_SOURCES = \
 	src/core/rational.h \
 	src/core/matrix.cc \
 	src/core/function.cc \
-	src/core/function.h \
-	src/core/tinyxml.cc \
-	src/core/tinyxmlerror.cc \
-	src/core/tinyxmlparser.cc \
-	src/core/tinyxml.h
+	src/core/function.h
 
 agg_SOURCES = \
 	src/games/gameagg.cc \
@@ -270,6 +266,8 @@ game_SOURCES = \
 	src/games/stratpure.h \
 	src/games/stratmixed.h \
 	src/games/file.cc \
+	src/games/workspace.cc \
+	src/games/workspace.h \
 	src/games/writer.cc \
 	src/games/writer.h \
 	src/games/layout.cc \
@@ -477,8 +475,12 @@ gambit_SOURCES = \
 	src/gui/analysis.h \
 	src/gui/app.cc \
 	src/gui/app.h \
+	src/gui/editlabel.cc \
+	src/gui/editlabel.h \
 	src/gui/edittext.cc \
 	src/gui/edittext.h \
+	src/gui/labelcell.cc \
+	src/gui/labelcell.h \
 	src/gui/dlabout.cc \
 	src/gui/dlabout.h \
 	src/gui/dleditmove.cc \
@@ -500,7 +502,7 @@ gambit_SOURCES = \
 	src/gui/dlnash.cc \
 	src/gui/dlnash.h \
 	src/gui/dlnashmon.cc \
-	src/gui/dlnashmon.h \
+	src/gui/nashspec.h \
 	src/gui/dlnewtable.cc \
 	src/gui/dlnewtable.h \
 	src/gui/dlnfglogit.cc \

README.md

@@ -48,6 +48,7 @@ installable via PyPI.
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/StephenPasteris"><img src="https://avatars.githubusercontent.com/u/140617768?v=4?s=100" width="100px;" alt="StephenPasteris"/><br /><sub><b>StephenPasteris</b></sub></a><br /><a href="#research-StephenPasteris" title="Research">🔬</a> <a href="#code-StephenPasteris" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/d-kad"><img src="https://avatars.githubusercontent.com/u/165307096?v=4?s=100" width="100px;" alt="Daniel Kadnikov"/><br /><sub><b>Daniel Kadnikov</b></sub></a><br /><a href="#research-d-kad" title="Research">🔬</a> <a href="#code-d-kad" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/AndresFerCervell"><img src="https://avatars.githubusercontent.com/u/153729439?v=4?s=100" width="100px;" alt="Andrés Fernández Cervell"/><br /><sub><b>Andrés Fernández Cervell</b></sub></a><br /><a href="#code-AndresFerCervell" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/wyz2368"><img src="https://avatars.githubusercontent.com/u/25018133?v=4?s=100" width="100px;" alt="wyz2368"/><br /><sub><b>wyz2368</b></sub></a><br /><a href="#code-wyz2368" title="Code">💻</a> <a href="#research-wyz2368" title="Research">🔬</a></td>
     </tr>
   </tbody>
 </table>

build_support/GAMBIT_VERSION

@@ -1 +1 @@
-16.6.0
+16.7.0

build_support/catalog/catalog.am

@@ -1,6 +1,24 @@
 CATALOG_FILES = \
 	catalog/books/myerson1991/fig2_1.efg \
 	catalog/books/myerson1991/fig4_2.efg \
+	catalog/books/shohamleytonbrown2008/fig5_1.efg \
+	catalog/books/shohamleytonbrown2008/fig5_10.efg \
+	catalog/books/shohamleytonbrown2008/fig5_10__original_layout.ef \
+	catalog/books/shohamleytonbrown2008/fig5_11.efg \
+	catalog/books/shohamleytonbrown2008/fig5_11__original_layout.ef \
+	catalog/books/shohamleytonbrown2008/fig5_12.efg \
+	catalog/books/shohamleytonbrown2008/fig5_12__original_layout.ef \
+	catalog/books/shohamleytonbrown2008/fig5_15.efg \
+	catalog/books/shohamleytonbrown2008/fig5_15__original_layout.ef \
+	catalog/books/shohamleytonbrown2008/fig5_1__original_layout.ef \
+	catalog/books/shohamleytonbrown2008/fig5_2.efg \
+	catalog/books/shohamleytonbrown2008/fig5_2__original_layout.ef \
+	catalog/books/shohamleytonbrown2008/fig5_9.efg \
+	catalog/books/shohamleytonbrown2008/fig5_9__original_layout.ef \
+	catalog/books/shohamleytonbrown2008/fig6_2.efg \
+	catalog/books/shohamleytonbrown2008/fig6_2__original_layout.ef \
+	catalog/books/shohamleytonbrown2008/fig6_8.efg \
+	catalog/books/shohamleytonbrown2008/fig6_8__original_layout.ef \
 	catalog/books/vonstengel2022/fig10.1.efg \
 	catalog/books/vonstengel2022/fig10.12.efg \
 	catalog/books/vonstengel2022/fig10.5.efg \
@@ -23,6 +41,7 @@ CATALOG_FILES = \
 	catalog/journals/ijgt/selten1975/fig2.efg \
 	catalog/journals/ijgt/selten1975/fig3.efg \
 	catalog/journals/mor/vonstengelforges2008/fig1.efg \
+	catalog/journals/mor/vonstengelforges2008/fig1__Original_Layout.ef \
 	catalog/journals/mor/vonstengelforges2008/fig6.efg \
 	catalog/journals/mor/vonstengelforges2008/fig6__Original_Layout.ef \
 	catalog/journals/mor/vonstengelforges2008/fig9.efg \

build_support/catalog/catalog_hierarchy.yaml

@@ -14,6 +14,7 @@ labels:
   books/myerson1991: "Myerson (1991) — Game Theory: Analysis of Conflict"
   books/vonstengel2022: "von Stengel (2022) — Game Theory Basics"
   books/watson2013: "Watson (2013) — Strategy: An Introduction to Game Theory"
+  books/shohamleytonbrown2008: "Shoham and Leyton-Brown (2008) — Multiagent Systems, Algorithmic, Game-Theoretic, and Logical Foundations"
   journals/geb/gilboa1997: "Gilboa (1997)"
   journals/geb/wichardt2008: "Wichardt (2008)"
   journals/ijgt/nau2004: "Nau et al. (2004)"

build_support/catalog/gtdraw_settings.yaml

@@ -44,3 +44,31 @@ overrides:
       2: '#DD79E0'
       3: '#1616BC'
       4: '#985003'
+
+  books/shohamleytonbrown2008/fig6_8:
+    scale_factor: 1.0
+    level_scaling: 1.0
+    sublevel_scaling: 1.0
+    width_scaling: 1.0
+    horizontal: false
+    mirror: false
+    shared_terminal_depth: false
+    color_scheme: colorblind
+    edge_thickness: 1.0
+    action_label_position: 0.5
+    action_label_position_by: player
+    action_label_dist: 1.0
+    vary_action_label_positions: false
+    vary_action_label_positions_by: all
+    font_family: rmfamily
+    font_bold: false
+    font_italic: false
+    font_size: normalsize
+    node_size: 1.5
+    label_bg: false
+    label_bg_color: white
+    label_bg_opacity: 0.8
+    iset_fill: true
+    iset_fill_opacity: 0.2
+    iset_boundary: none
+    legend_position: top-left

build_support/catalog/test_update.py

@@ -147,6 +147,57 @@ def _make_image_files(catalog_dir, slug, fmt="efg"):
         (img_dir / f"{slug}.ef").touch()
 
 
+# ---------------------------------------------------------------------------
+# Tests for catalog resource selection
+# ---------------------------------------------------------------------------
+
+
+@pytest.mark.catalog_update
+class TestCatalogResourceSelection:
+    def test_catalog_games_uses_requested_catalog_dir_and_restores_resource(
+        self, tmp_path, monkeypatch
+    ):
+        stale_dir = tmp_path / "installed_catalog_data"
+        checkout_dir = tmp_path / "checkout_catalog"
+        stale_dir.mkdir()
+        checkout_dir.mkdir()
+        calls = []
+
+        def fake_games(**kwargs):
+            calls.append((update.gbt.catalog._CATALOG_RESOURCE, kwargs))
+            return _make_df(_efg_row("checkout/game1"))
+
+        monkeypatch.setattr(update.gbt.catalog, "_CATALOG_RESOURCE", stale_dir)
+        monkeypatch.setattr(update.gbt.catalog, "games", fake_games)
+
+        df = update._catalog_games(checkout_dir)
+
+        assert calls == [(checkout_dir, {"include_descriptions": True})]
+        assert stale_dir == update.gbt.catalog._CATALOG_RESOURCE
+        assert list(df["Game"]) == ["checkout/game1"]
+
+    def test_generate_rst_table_uses_requested_catalog_dir_while_rendering(
+        self, tmp_path, monkeypatch
+    ):
+        stale_dir = tmp_path / "installed_catalog_data"
+        checkout_dir = tmp_path / "checkout_catalog"
+        stale_dir.mkdir()
+        checkout_dir.mkdir()
+        observed = []
+
+        def fake_write_tree_level(*args, **kwargs):
+            observed.append(update.gbt.catalog._CATALOG_RESOURCE)
+
+        monkeypatch.setattr(update.gbt.catalog, "_CATALOG_RESOURCE", stale_dir)
+        monkeypatch.setattr(update, "load_hierarchy_labels", lambda: {})
+        monkeypatch.setattr(update, "_write_tree_level", fake_write_tree_level)
+
+        update.generate_rst_table(_make_df(), tmp_path / "out.rst", catalog_dir=checkout_dir)
+
+        assert observed == [checkout_dir]
+        assert stale_dir == update.gbt.catalog._CATALOG_RESOURCE
+
+
 # ---------------------------------------------------------------------------
 # Tests for catalog_gtdraw_settings
 # ---------------------------------------------------------------------------

build_support/catalog/update.py

@@ -1,6 +1,7 @@
 import argparse
 import shutil
 import sys
+from contextlib import contextmanager
 from pathlib import Path
 
 import pandas as pd
@@ -17,6 +18,24 @@
 SUPPORTED_GAME_FORMATS = {"efg", "nfg"}
 
 
+@contextmanager
+def _using_catalog_dir(catalog_dir: Path):
+    """Temporarily make pygambit.catalog read data from the checked-out catalog."""
+    old_resource = gbt.catalog._CATALOG_RESOURCE
+    gbt.catalog._CATALOG_RESOURCE = catalog_dir
+    try:
+        yield
+    finally:
+        gbt.catalog._CATALOG_RESOURCE = old_resource
+
+
+def _catalog_games(catalog_dir: Path | None = None) -> pd.DataFrame:
+    """Return catalog games using files from *catalog_dir*, not installed package data."""
+    catalog_dir = catalog_dir or CATALOG_DIR
+    with _using_catalog_dir(catalog_dir):
+        return gbt.catalog.games(include_descriptions=True)
+
+
 def catalog_gtdraw_settings(slug: str) -> dict:
     """Return the gtdraw settings for a given catalog slug."""
     with open(GTDRAW_SETTINGS_CONFIG, encoding="utf-8") as f:
@@ -325,7 +344,7 @@ def generate_rst_table(
     catalog_dir = catalog_dir or CATALOG_DIR
     labels = load_hierarchy_labels()
     tree = _build_slug_tree(df)
-    with open(rst_path, "w", encoding="utf-8") as f:
+    with _using_catalog_dir(catalog_dir), open(rst_path, "w", encoding="utf-8") as f:
         _write_tree_level(
             f, tree, "", labels, catalog_dir, indent="", regenerate_images=regenerate_images
         )
@@ -409,7 +428,7 @@ def update_makefile(
     args = parser.parse_args()
 
     # Create RST list-table used by doc/catalog.rst
-    df = gbt.catalog.games(include_descriptions=True)
+    df = _catalog_games()
     _warn_missing_descriptions(df)
     generate_rst_table(df, CATALOG_RST_TABLE, regenerate_images=args.regenerate_images)
     print(f"Generated {CATALOG_RST_TABLE} for use in local docs build. DO NOT COMMIT.")

catalog/books/shohamleytonbrown2008/fig5_1.efg

@@ -0,0 +1,21 @@
+EFG 2 R "Fig 5.1 from Shoham and Leyton-Brown (2008)" { "1" "2" }
+
+"
+Figure 5.1 from :cite:p:`ShoLeyB08`.
+This is a sharing game. Imagine a brother and sister sharing two indivisible and identical presents
+from their parents. First the brother suggests a split, which can be one of three: he
+keeps both, she keeps both, or they each keep one. Then the sister chooses whether
+to accept or reject the split. If she accepts they each get their allocated present(s),
+and otherwise neither gets any gift.
+"
+
+p "" 1 1 "" { "2-0" "1-1" "0-2" } 0
+p "" 2 2 "" { "no" "yes" } 0
+t "" 1 "" { 0 0 }
+t "" 2 "" { 2 0 }
+p "" 2 3 "" { "no" "yes" } 0
+t "" 3 "" { 0 0 }
+t "" 4 "" { 1 1 }
+p "" 2 4 "" { "no" "yes" } 0
+t "" 5 "" { 0 0 }
+t "" 6 "" { 0 2 }