Merge branch 'master' into update_old_lp_lcp

Author: tturocy

.github/workflows/tools.yml

@@ -33,25 +33,6 @@ jobs:
           sudo make install
 
   macos:
-    runs-on: macos-14
-    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@v6
-      - name: Install dependencies
-        run: brew install automake autoconf wxwidgets
-      - run: aclocal
-      - run: automake --add-missing
-      - run: autoconf
-      - run: ./configure
-      - run: make
-      - run: sudo make install
-      - run: make osx-dmg
-      - uses: actions/upload-artifact@v6
-        with:
-          name: artifact-osx-14
-          path: "*.dmg"
-
-  macos-14:
     runs-on: macos-15
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     steps:
@@ -63,12 +44,6 @@ jobs:
       - run: autoconf
       - run: ./configure
       - run: make
-      - run: sudo make install
-      - run: make osx-dmg
-      - uses: actions/upload-artifact@v6
-        with:
-          name: artifact-osx-15
-          path: "*.dmg"
 
   windows:
     runs-on: windows-latest

ChangeLog

@@ -17,12 +17,25 @@
   unreachable parts of the game tree in games with absent-mindedness. (#629)
 
 ### Changed
+- Labels for players, outcomes, strategies, and actions are expected to be non-empty and unique within
+  the relevant scope (games for players and outcomes, players for strategies, and information sets for
+  actions).  `pygambit` now issues a `FutureWarning` if a label is changed that does not conform to these
+  expectations.  There is now an optional flag `normalize_labels` to `read_*` which will automatically
+  fill in non-confirming sets of labels.  In version 16.6 these will be enforced; invalid label sets will
+  generate an error and files will be normalized automatically on read. (#614)
+- Terminology for agent-form calculations on extensive games has been clarified.  Mixed behavior profiles
+  distinguish "agent" regret and liap values from their strategy-based analogs.  Methods which compute
+  using the agent-form - specifically `enumpure_solve` and `liap_solve`, now clarify this by being named
+  differently in `pygambit`. (#617)
 - In the graphical interface, removed option to configure information set link drawing; information sets
   are always drawn and indicators are always drawn if an information set spans multiple levels.
 - In `pygambit`, indexing the children of a node by a string inteprets the string as an action label,
   not a label of a child node.  In addition, indexing by an action object is now supported. (#587)
 - In `pygambit`, `min_payoff` and `max_payoff` (for both games and players) now refers to payoffs in
   any play of the game; previously this referred only to the set of outcomes. (#498)
+- In `pygambit`, calls to `sort_infosets` are no longer required to normalise the game representation.
+  Iteration ordering of information sets and their members is ensured internally.  `sort_infosets`
+  is therefore now a no-op and is deprecated; it will be removed in a future version.
 
 ### Removed
 - Eliminating dominated actions has been removed from the GUI as it was implementing a non-standard

build_support/GAMBIT_VERSION

@@ -1 +1 @@
-16.4.0
+16.5.0

contrib/games/myerson_fig_4_2.efg

@@ -0,0 +1,15 @@
+EFG 2 R "Myerson (1991) Fig 4.2" { "Player 1" "Player 2" }
+"An example from Myerson (1991) Fig 4.2 which has an agent Nash equilibrium that is
+not a Nash equilibrium"
+
+p "" 1 1 "" { "A1" "B1" } 0
+p "" 2 1 "" { "W2" "X2" } 0
+p "" 1 2 "" { "Y1" "Z1" } 0
+t "" 1 "" { 3, 0 }
+t "" 2 "" { 0, 0 }
+p "" 1 2 "" { "Y1" "Z1" } 0
+t "" 3 "" { 2, 3 }
+t "" 4 "" { 4, 1 }
+p "" 2 1 "" { "W2" "X2" } 0
+t "" 5 "" { 2, 3 }
+t "" 6 "" { 3, 2 }

doc/formats.efg.rst

@@ -6,18 +6,13 @@ The extensive game (.efg) file format
 The extensive game (.efg) file format has been used by Gambit, with
 minor variations, to represent extensive games since circa 1994. It
 replaced an earlier format, which had no particular name but which had
-the conventional extension .dt1. It is intended that some new formats
-will be introduced in the future; however, this format will be
-supported by Gambit, possibly through the use of converter programs to
-those putative future formats, for the foreseeable future.
+the conventional extension .dt1.
 
 
 A sample file
 -------------
 
-This is a sample file illustrating the general format of the file.
-This file is similar to the one distributed in the Gambit distribution
-under the name bayes1a.efg::
+This is a sample file illustrating the general format of the file::
 
     EFG 2 R "General Bayes game, one stage" { "Player 1" "Player 2" }
     c "ROOT" 1 "(0,1)" { "1G" 0.500000 "1B" 0.500000 } 0
@@ -53,8 +48,6 @@ under the name bayes1a.efg::
     t "" 16 "Outcome 16" { 10.000000 0.000000 }
 
 
-
-
 Structure of the prologue
 -------------------------
 
@@ -97,11 +90,9 @@ of one line per node.
 Each node entry begins with an unquoted character indicating the type
 of the node. There are three node types:
 
-
-
-+ c for a chance node
-+ p for a personal player node
-+ t for a terminal node
++ `c` for a chance node
++ `p` for a personal player node
++ `t` for a terminal node
 
 Each node type will be discussed individually below. There are three
 numbering conventions which are used to identify the information
@@ -116,19 +107,21 @@ integer may be used to specify information sets for different players;
 this is not ambiguous since the player number appears as well.
 Finally, outcomes are also arbitrarily numbered in the file format in
 the same way in which information sets are, except for the special
-number 0 which indicates the null outcome.
+number 0 which is reserved to indicate the null outcome.
+Outcome 0 must not have a name or payoffs specified.
 
 Information sets and outcomes may (and frequently will) appear
 multiple times within a game. By convention, the second and subsequent
 times an information set or outcome appears, the file may omit the
 descriptive information for that information set or outcome.
 Alternatively, the file may specify the descriptive information again;
 however, it must precisely match the original declaration of the
-information set or outcome. If any part of the description is omitted,
-the whole description must be omitted.
+information set or outcome. Any mismatch in repeated declarations
+is an error, and the file is not valid.
+If any part of the description is omitted, the whole description must be omitted.
 
 Outcomes may appear at nonterminal nodes. In these cases, payoffs are
-interepreted as incremental payoffs; the payoff to a player for a
+interpreted as incremental payoffs; the payoff to a player for a
 given path through the tree is interpreted as the sum of the payoffs
 at the outcomes encountered on that path (including at the terminal
 node). This is ideal for the representation of games with well-
@@ -146,41 +139,28 @@ with the character c . Following this, in order, are
 
 + a text string, giving the name of the node
 + a positive integer specifying the information set number
-+ (optional) the name of the information set
-+ (optional) a list of actions at the information set with their
++ (optional) the name of the information set and a list of actions at the information set with their
   corresponding probabilities
 + a nonnegative integer specifying the outcome
-+ (optional)the payoffs to each player for the outcome
-
-
++ (optional) the name of the outcome and the payoffs to each player for the outcome
 
 **Format of personal (player) nodes.** Entries for personal player
 decision nodes begin with the character p . Following this, in order,
 are:
 
-
-
 + a text string, giving the name of the node
 + a positive integer specifying the player who owns the node
 + a positive integer specifying the information set
-+ (optional) the name of the information set
-+ (optional) a list of action names for the information set
++ (optional) the name of the information set and a list of action names for the information set
 + a nonnegative integer specifying the outcome
-+ (optional) the name of the outcome
-+ the payoffs to each player for the outcome
-
++ (optional) the name of the outcome and the payoffs to each player for the outcome
 
 
 **Format of terminal nodes.** Entries for terminal nodes begin with
 the character t . Following this, in order, are:
 
-
-
 + a text string, giving the name of the node
 + a nonnegative integer specifying the outcome
-+ (optional) the name of the outcome
-+ the payoffs to each player for the outcome
-
-
++ (optional) the name of the outcome and the payoffs to each player for the outcome
 
 There is no explicit end-of-file delimiter for the file.

doc/pygambit.api.rst

@@ -258,6 +258,8 @@ Probability distributions over behavior
    MixedBehaviorProfile.infoset_prob
    MixedBehaviorProfile.belief
    MixedBehaviorProfile.is_defined_at
+   MixedBehaviorProfile.agent_max_regret
+   MixedBehaviorProfile.agent_liap_value
    MixedBehaviorProfile.max_regret
    MixedBehaviorProfile.liap_value
    MixedBehaviorProfile.as_strategy
@@ -297,11 +299,13 @@ Computation of Nash equilibria
 
    NashComputationResult
    enumpure_solve
+   enumpure_agent_solve
    enummixed_solve
    enumpoly_solve
    lp_solve
    lcp_solve
    liap_solve
+   liap_agent_solve
    logit_solve
    simpdiv_solve
    ipa_solve

doc/tools.enumpure.rst

@@ -38,10 +38,10 @@ pure-strategy Nash equilibria.
 
    .. versionadded:: 14.0.2
 
-   Report agent form equilibria, that is, equilibria which consider
-   only deviations at one information set.  Only has an effect for
-   extensive games, as strategic games have only one information set
-   per player.
+   Report agent Nash equilibria, that is, equilibria which consider
+   only deviations at a single information set at a time.  Only has
+   an effect for extensive games, as strategic games have only
+   one information set per player.
 
 .. cmdoption:: -h
 

doc/tools.liap.rst

@@ -26,8 +26,24 @@ not guaranteed to find all, or even any, Nash equilibria.
    in terms of the maximum regret.  This regret is interpreted as a fraction
    of the difference between the maximum and minimum payoffs in the game.
 
+.. versionchanged:: 16.5.0
+
+   The `-A` switch has been introduced to be explicit in choosing to compute
+   agent Nash equilibria.  The default is now to compute using the strategic
+   form even for extensive games.
+
+
 .. program:: gambit-liap
 
+.. cmdoption:: -A
+
+   .. versionadded:: 16.5.0
+
+   Report agent Nash equilibria, that is, equilibria which consider
+   only deviations at a single information set at a time.  Only has
+   an effect for extensive games, as strategic games have only
+   one information set per player.
+
 .. cmdoption:: -d
 
    Express all output using decimal representations with the