Merge branch 'fix/659' into add-drawtree-to-tutorials

Author: edwardchalstrey1

.github/workflows/python.yml

@@ -10,7 +10,7 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     strategy:
       matrix:
-        python-version: ['3.10', '3.13']
+        python-version: ['3.10', '3.14']
 
     steps:
       - uses: actions/checkout@v5
@@ -39,7 +39,7 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     strategy:
       matrix:
-        python-version: ['3.13']
+        python-version: ['3.14']
 
     steps:
       - uses: actions/checkout@v4
@@ -52,7 +52,6 @@ jobs:
           python -m pip install --upgrade pip
           pip install setuptools build cython wheel
           pip install -r tests/requirements.txt
-          pip install -r doc/requirements.txt
       - name: Build extension
         run: |
           python -m pip install -v .
@@ -64,7 +63,7 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     strategy:
       matrix:
-        python-version: ['3.13']
+        python-version: ['3.14']
 
     steps:
       - uses: actions/checkout@v4
@@ -89,7 +88,7 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     strategy:
       matrix:
-        python-version: ['3.13']
+        python-version: ['3.14']
 
     steps:
       - uses: actions/checkout@v5

ChangeLog

@@ -12,6 +12,9 @@
 
 ### Added
 - Tests for EFG Nash solvers -- `enumpoly_solve`, `lp_solve`, `lcp_solve` -- in behavior stratgegies
+- In `pygambit`, `Node` objects now have a read-only property `own_prior_action` and `Infoset` objects
+  have a read-only property `own_prior_actions` to retrieve the last action or the set of last actions
+  taken by the player before reaching the node or information set, respectively. (#582)
 - In `pygambit`, `Node` objects now have a read-only property `is_strategy_reachable` to determine
   if the node is reachable by at least one pure strategy profile. This proves useful for identifying
   unreachable parts of the game tree in games with absent-mindedness. (#629)

doc/developer.contributing.rst

@@ -99,6 +99,11 @@ You can also run the tests locally before submitting your pull request, using `p
 
     pytest
 
+3. [Optional] If you wish to run the tutorial notebook tests, you will need to add the ``--run-tutorials`` flag, which require the `doc` dependencies: ::
+
+    pip install -r doc/requirements.txt
+    pytest --run-tutorials
+
 Adding to the test suite
 ^^^^^^^^^^^^^^^^^^^^^^^^
 

doc/pygambit.api.rst

@@ -149,6 +149,7 @@ Information about the game
    Node.player
    Node.is_successor_of
    Node.plays
+   Node.own_prior_action
 
 .. autosummary::
 
@@ -162,6 +163,7 @@ Information about the game
    Infoset.members
    Infoset.precedes
    Infoset.plays
+   Infoset.own_prior_actions
 
 .. autosummary::
 

pyproject.toml

@@ -7,7 +7,7 @@ name = "pygambit"
 version = "16.4.0"
 description = "The package for computation in game theory"
 readme = "src/README.rst"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 license = "GPL-2.0-or-later"
 authors = [
     {name = "Theodore Turocy", email = "ted.turocy@gmail.com"},
@@ -17,11 +17,11 @@ keywords = ["game theory", "Nash equilibrium"]
 classifiers=[
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Science/Research",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Scientific/Engineering :: Mathematics"
 ]

src/games/behavpure.cc

@@ -98,30 +98,16 @@ MixedBehaviorProfile<Rational> PureBehaviorProfile::ToMixedBehaviorProfile() con
 //                    class BehaviorContingencies
 //========================================================================
 
-BehaviorContingencies::BehaviorContingencies(const BehaviorSupportProfile &p_support,
-                                             const std::set<GameInfoset> &p_reachable,
-                                             const std::vector<GameAction> &p_frozen)
-  : m_support(p_support), m_frozen(p_frozen)
+BehaviorContingencies::BehaviorContingencies(const BehaviorSupportProfile &p_support)
+  : m_support(p_support)
 {
-  if (!p_reachable.empty()) {
-    for (const auto &infoset : p_reachable) {
-      m_activeInfosets.push_back(infoset);
-    }
-  }
-  else {
-    for (const auto &player : m_support.GetGame()->GetPlayers()) {
-      for (const auto &infoset : player->GetInfosets()) {
-        if (p_support.IsReachable(infoset)) {
-          m_activeInfosets.push_back(infoset);
-        }
+  for (const auto &player : m_support.GetGame()->GetPlayers()) {
+    for (const auto &infoset : player->GetInfosets()) {
+      if (p_support.IsReachable(infoset)) {
+        m_reachableInfosets.push_back(infoset);
       }
     }
   }
-  for (const auto &action : m_frozen) {
-    m_activeInfosets.erase(std::find_if(
-        m_activeInfosets.begin(), m_activeInfosets.end(),
-        [action](const GameInfoset &infoset) { return infoset == action->GetInfoset(); }));
-  }
 }
 
 BehaviorContingencies::iterator::iterator(BehaviorContingencies *p_cont, bool p_end)
@@ -136,15 +122,12 @@ BehaviorContingencies::iterator::iterator(BehaviorContingencies *p_cont, bool p_
       m_profile.SetAction(*m_currentBehav[infoset]);
     }
   }
-  for (const auto &action : m_cont->m_frozen) {
-    m_profile.SetAction(action);
-  }
 }
 
 BehaviorContingencies::iterator &BehaviorContingencies::iterator::operator++()
 {
-  for (auto infoset = m_cont->m_activeInfosets.crbegin();
-       infoset != m_cont->m_activeInfosets.crend(); ++infoset) {
+  for (auto infoset = m_cont->m_reachableInfosets.crbegin();
+       infoset != m_cont->m_reachableInfosets.crend(); ++infoset) {
     ++m_currentBehav[*infoset];
     if (m_currentBehav.at(*infoset) != m_cont->m_support.GetActions(*infoset).end()) {
       m_profile.SetAction(*m_currentBehav[*infoset]);

src/games/behavpure.h

@@ -32,7 +32,6 @@ namespace Gambit {
 /// It specifies exactly one strategy for each information set in the
 /// game.
 class PureBehaviorProfile {
-private:
   Game m_efg;
   std::map<GameInfoset, GameAction> m_profile;
 
@@ -86,14 +85,11 @@ template <> inline std::string PureBehaviorProfile::GetPayoff(const GamePlayer &
 }
 
 class BehaviorContingencies {
-private:
   BehaviorSupportProfile m_support;
-  std::vector<GameAction> m_frozen;
-  std::list<GameInfoset> m_activeInfosets;
+  std::list<GameInfoset> m_reachableInfosets;
 
 public:
   class iterator {
-  private:
     BehaviorContingencies *m_cont;
     bool m_atEnd;
     std::map<GameInfoset, BehaviorSupportProfile::Support::const_iterator> m_currentBehav;
@@ -127,10 +123,8 @@ class BehaviorContingencies {
   };
   /// @name Lifecycle
   //@{
-  /// Construct a new iterator on the support, holding the listed actions fixed
-  explicit BehaviorContingencies(const BehaviorSupportProfile &,
-                                 const std::set<GameInfoset> &p_active = {},
-                                 const std::vector<GameAction> &p_frozen = {});
+  /// Construct a new iterator on the support
+  explicit BehaviorContingencies(const BehaviorSupportProfile &);
   //@}
   iterator begin() { return {this, false}; }
   iterator end() { return {this, true}; }

src/games/behavspt.cc

@@ -106,106 +106,6 @@ std::list<GameInfoset> BehaviorSupportProfile::GetInfosets(const GamePlayer &p_p
   return answer;
 }
 
-namespace {
-
-void ReachableInfosets(const BehaviorSupportProfile &p_support, const GameNode &p_node,
-                       std::set<GameInfoset> &p_reached)
-{
-  if (p_node->IsTerminal()) {
-    return;
-  }
-
-  const GameInfoset infoset = p_node->GetInfoset();
-  if (!infoset->GetPlayer()->IsChance()) {
-    p_reached.insert(infoset);
-    for (const auto &action : p_support.GetActions(infoset)) {
-      ReachableInfosets(p_support, p_node->GetChild(action), p_reached);
-    }
-  }
-  else {
-    for (const auto &child : p_node->GetChildren()) {
-      ReachableInfosets(p_support, child, p_reached);
-    }
-  }
-}
-
-} // end anonymous namespace
-
-bool BehaviorSupportProfile::Dominates(const GameAction &a, const GameAction &b,
-                                       bool p_strict) const
-{
-  const GameInfoset infoset = a->GetInfoset();
-  if (infoset != b->GetInfoset()) {
-    throw UndefinedException();
-  }
-
-  GamePlayer player = infoset->GetPlayer();
-  int thesign = 0;
-
-  auto nodelist = GetMembers(infoset);
-  for (const auto &node : GetMembers(infoset)) {
-    std::set<GameInfoset> reachable;
-    ReachableInfosets(*this, node->GetChild(a), reachable);
-    ReachableInfosets(*this, node->GetChild(b), reachable);
-
-    auto contingencies = BehaviorContingencies(*this, reachable);
-    if (p_strict) {
-      if (!std::all_of(contingencies.begin(), contingencies.end(),
-                       [&](const PureBehaviorProfile &profile) {
-                         return profile.GetPayoff<Rational>(node->GetChild(a), player) >
-                                profile.GetPayoff<Rational>(node->GetChild(b), player);
-                       })) {
-        return false;
-      }
-    }
-    else {
-      for (const auto &iter : contingencies) {
-        auto newsign = sign(iter.GetPayoff<Rational>(node->GetChild(a), player) -
-                            iter.GetPayoff<Rational>(node->GetChild(b), player));
-        if (newsign < 0) {
-          return false;
-        }
-        thesign = std::max(thesign, newsign);
-      }
-    }
-  }
-  return p_strict || thesign > 0;
-}
-
-bool BehaviorSupportProfile::IsDominated(const GameAction &p_action, const bool p_strict) const
-{
-  const auto &actions = GetActions(p_action->GetInfoset());
-  return std::any_of(actions.begin(), actions.end(), [&](const GameAction &a) {
-    return a != p_action && Dominates(a, p_action, p_strict);
-  });
-}
-
-BehaviorSupportProfile BehaviorSupportProfile::Undominated(const bool p_strict) const
-{
-  BehaviorSupportProfile result(*this);
-  for (const auto &player : m_efg->GetPlayers()) {
-    for (const auto &infoset : player->GetInfosets()) {
-      const auto &actions = GetActions(infoset);
-      std::set<GameAction> dominated;
-      for (const auto &action1 : actions) {
-        if (contains(dominated, action1)) {
-          continue;
-        }
-        for (const auto &action2 : actions) {
-          if (action1 == action2 || contains(dominated, action2)) {
-            continue;
-          }
-          if (Dominates(action1, action2, p_strict)) {
-            dominated.insert(action2);
-            result.RemoveAction(action2);
-          }
-        }
-      }
-    }
-  }
-  return result;
-}
-
 bool BehaviorSupportProfile::HasReachableMembers(const GameInfoset &p_infoset) const
 {
   const auto &members = p_infoset->GetMembers();

src/games/game.h

@@ -247,6 +247,8 @@ class GameInfosetRep : public std::enable_shared_from_this<GameInfosetRep> {
 
   bool Precedes(GameNode) const;
 
+  std::set<GameAction> GetOwnPriorActions() const;
+
   const Number &GetActionProb(const GameAction &p_action) const
   {
     if (p_action->GetInfoset().get() != this) {
@@ -492,6 +494,7 @@ class GameNodeRep : public std::enable_shared_from_this<GameNodeRep> {
   bool IsTerminal() const { return m_children.empty(); }
   GamePlayer GetPlayer() const { return (m_infoset) ? m_infoset->GetPlayer() : nullptr; }
   GameAction GetPriorAction() const; // returns null if root node
+  GameAction GetOwnPriorAction() const;
   GameNode GetParent() const { return (m_parent) ? m_parent->shared_from_this() : nullptr; }
   GameNode GetNextSibling() const;
   GameNode GetPriorSibling() const;
@@ -899,6 +902,11 @@ class GameRep : public std::enable_shared_from_this<GameRep> {
   virtual std::vector<GameInfoset> GetInfosets() const { throw UndefinedException(); }
   /// Sort the information sets for each player in a canonical order
   virtual void SortInfosets() {}
+  /// Returns the set of actions taken by the infoset's owner before reaching this infoset
+  virtual std::set<GameAction> GetOwnPriorActions(const GameInfoset &p_infoset) const
+  {
+    throw UndefinedException();
+  }
   //@}
 
   /// @name Outcomes
@@ -926,6 +934,11 @@ class GameRep : public std::enable_shared_from_this<GameRep> {
   virtual size_t NumNodes() const = 0;
   /// Returns the number of non-terminal nodes in the game
   virtual size_t NumNonterminalNodes() const = 0;
+  /// Returns the last action taken by the node's owner before reaching this node
+  virtual GameAction GetOwnPriorAction(const GameNode &p_node) const
+  {
+    throw UndefinedException();
+  }
   //@}
 
   /// @name Modification