Merge branch 'master' into issue_483

# Conflicts:
#	src/games/game.h
#	src/games/gametree.cc
#	src/games/gametree.h

Author: tturocy

.github/workflows/lint.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Run clang-format style check for C/C++
-        uses: jidicula/clang-format-action@v4.14.0
+        uses: jidicula/clang-format-action@v4.15.0
         with:
           clang-format-version: '17'
           check-path: 'src'

.github/workflows/python.yml

@@ -32,6 +32,52 @@ jobs:
       - name: Run tests
         run: pytest
 
+  macos-13:
+    runs-on: macos-13
+    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.12']
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Set up dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install cython pytest wheel lxml numpy scipy
+      - name: Build extension
+        run: |
+          python -m pip install -v .
+      - name: Run tests
+        run: pytest
+
+  macos-14:
+    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
+    strategy:
+      matrix:
+        python-version: ['3.12']
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Set up dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install cython pytest wheel lxml numpy scipy
+      - name: Build extension
+        run: |
+          python -m pip install -v .
+      - name: Run tests
+        run: pytest
+
   windows:
     runs-on: windows-latest
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name

ChangeLog

@@ -8,6 +8,13 @@
   been removed as planned. (#357)
 
 
+## [16.3.1] - unreleased
+
+### Fixed
+- Corrected a regression in which information sets were prematurely invalidated (and therefore
+  `delete this` called on them) when removing the last node from an information set.
+
+
 ## [16.3.0] - 2025-01-13
 
 ### General

doc/pygambit.api.rst

@@ -212,8 +212,8 @@ Probability distributions over strategies
    MixedStrategyProfile.strategy_value
    MixedStrategyProfile.strategy_regret
    MixedStrategyProfile.player_regret
-   MixedStrategyProfile.max_regret
    MixedStrategyProfile.strategy_value_deriv
+   MixedStrategyProfile.max_regret
    MixedStrategyProfile.liap_value
    MixedStrategyProfile.as_behavior
    MixedStrategyProfile.normalize
@@ -239,14 +239,16 @@ Probability distributions over behavior
    MixedBehaviorProfile.__getitem__
    MixedBehaviorProfile.__setitem__
    MixedBehaviorProfile.payoff
-   MixedBehaviorProfile.action_regret
    MixedBehaviorProfile.action_value
+   MixedBehaviorProfile.action_regret
    MixedBehaviorProfile.infoset_value
+   MixedBehaviorProfile.infoset_regret
    MixedBehaviorProfile.node_value
    MixedBehaviorProfile.realiz_prob
    MixedBehaviorProfile.infoset_prob
    MixedBehaviorProfile.belief
    MixedBehaviorProfile.is_defined_at
+   MixedBehaviorProfile.max_regret
    MixedBehaviorProfile.liap_value
    MixedBehaviorProfile.as_strategy
    MixedBehaviorProfile.normalize

src/games/behavmixed.cc

@@ -94,7 +94,7 @@ void MixedBehaviorProfile<T>::RealizationProbs(const MixedStrategyProfile<T> &mp
 {
   T prob;
 
-  for (int i = 1; i <= node->children.size(); i++) {
+  for (int i = 1; i <= node->m_children.size(); i++) {
     if (node->GetPlayer() && !node->GetPlayer()->IsChance()) {
       if (node->GetPlayer() == player) {
         if (actions[node->GetInfoset()->GetNumber()] == i) {
@@ -113,10 +113,10 @@ void MixedBehaviorProfile<T>::RealizationProbs(const MixedStrategyProfile<T> &mp
       }
     }
     else { // n.GetPlayer() == 0
-      prob = T(node->infoset->GetActionProb(i));
+      prob = T(node->m_infoset->GetActionProb(node->m_infoset->GetAction(i)));
     }
 
-    GameTreeNodeRep *child = node->children[i];
+    GameTreeNodeRep *child = node->m_children[i];
 
     map_bvals[child] = prob * map_bvals[node];
     map_nvals[child] += map_bvals[child];
@@ -335,7 +335,7 @@ template <class T> T MixedBehaviorProfile<T>::GetActionProb(const GameAction &ac
   if (action->GetInfoset()->GetPlayer()->IsChance()) {
     GameTreeInfosetRep *infoset =
         dynamic_cast<GameTreeInfosetRep *>(action->GetInfoset().operator->());
-    return static_cast<T>(infoset->GetActionProb(action->GetNumber()));
+    return static_cast<T>(infoset->GetActionProb(action));
   }
   else if (!m_support.Contains(action)) {
     return T(0);
@@ -381,7 +381,7 @@ void MixedBehaviorProfile<T>::GetPayoff(const GameNode &node, const T &prob,
                                         const GamePlayer &player, T &value) const
 {
   if (node->GetOutcome()) {
-    value += prob * static_cast<T>(node->GetOutcome()->GetPayoff(player));
+    value += prob * node->GetOutcome()->GetPayoff<T>(player);
   }
 
   if (!node->IsTerminal()) {
@@ -520,7 +520,7 @@ void MixedBehaviorProfile<T>::ComputePass2_beliefs_nodeValues_actionValues(
   if (node->GetOutcome()) {
     GameOutcome outcome = node->GetOutcome();
     for (auto player : m_support.GetGame()->GetPlayers()) {
-      map_nodeValues[node][player] += static_cast<T>(outcome->GetPayoff(player));
+      map_nodeValues[node][player] += outcome->GetPayoff<T>(player);
     }
   }
 

src/games/behavpure.cc

@@ -49,7 +49,7 @@ T PureBehaviorProfile::GetPayoff(const GameNode &p_node, const GamePlayer &p_pla
   T payoff(0);
 
   if (p_node->GetOutcome()) {
-    payoff += static_cast<T>(p_node->GetOutcome()->GetPayoff(p_player));
+    payoff += p_node->GetOutcome()->GetPayoff<T>(p_player);
   }
 
   if (!p_node->IsTerminal()) {

src/games/game.cc

@@ -41,9 +41,11 @@ namespace Gambit {
 //                       class GameOutcomeRep
 //========================================================================
 
-GameOutcomeRep::GameOutcomeRep(GameRep *p_game, int p_number)
-  : m_game(p_game), m_number(p_number), m_payoffs(m_game->NumPlayers())
+GameOutcomeRep::GameOutcomeRep(GameRep *p_game, int p_number) : m_game(p_game), m_number(p_number)
 {
+  for (const auto &player : p_game->GetPlayers()) {
+    m_payoffs[player] = Number();
+  }
 }
 
 //========================================================================
@@ -121,8 +123,8 @@ void GamePlayerRep::MakeStrategy()
   Array<int> c(NumInfosets());
 
   for (int i = 1; i <= NumInfosets(); i++) {
-    if (m_infosets[i]->flag == 1) {
-      c[i] = m_infosets[i]->whichbranch;
+    if (m_infosets[i - 1]->flag == 1) {
+      c[i] = m_infosets[i - 1]->whichbranch;
     }
     else {
       c[i] = 0;
@@ -161,33 +163,33 @@ void GamePlayerRep::MakeReducedStrats(GameTreeNodeRep *n, GameTreeNodeRep *nn)
   }
 
   if (n->NumChildren() > 0) {
-    if (n->infoset->m_player == this) {
-      if (n->infoset->flag == 0) {
+    if (n->m_infoset->m_player == this) {
+      if (n->m_infoset->flag == 0) {
         // we haven't visited this infoset before
-        n->infoset->flag = 1;
+        n->m_infoset->flag = 1;
         for (i = 1; i <= n->NumChildren(); i++) {
-          GameTreeNodeRep *m = n->children[i];
+          GameTreeNodeRep *m = n->m_children[i];
           n->whichbranch = m;
-          n->infoset->whichbranch = i;
+          n->m_infoset->whichbranch = i;
           MakeReducedStrats(m, nn);
         }
-        n->infoset->flag = 0;
+        n->m_infoset->flag = 0;
       }
       else {
         // we have visited this infoset, take same action
-        MakeReducedStrats(n->children[n->infoset->whichbranch], nn);
+        MakeReducedStrats(n->m_children[n->m_infoset->whichbranch], nn);
       }
     }
     else {
       n->ptr = nullptr;
       if (nn != nullptr) {
         n->ptr = nn->m_parent;
       }
-      n->whichbranch = n->children[1];
-      if (n->infoset) {
-        n->infoset->whichbranch = 0;
+      n->whichbranch = n->m_children[1];
+      if (n->m_infoset) {
+        n->m_infoset->whichbranch = 0;
       }
-      MakeReducedStrats(n->children[1], n->children[1]);
+      MakeReducedStrats(n->m_children[1], n->m_children[1]);
     }
   }
   else if (nn) {
@@ -217,7 +219,7 @@ void GamePlayerRep::MakeReducedStrats(GameTreeNodeRep *n, GameTreeNodeRep *nn)
   }
 }
 
-GameInfoset GamePlayerRep::GetInfoset(int p_index) const { return m_infosets[p_index]; }
+GameInfoset GamePlayerRep::GetInfoset(int p_index) const { return m_infosets[p_index - 1]; }
 
 Array<GameInfoset> GamePlayerRep::GetInfosets() const
 {
@@ -398,46 +400,31 @@ template <class T>
 MixedStrategyProfile<T>::MixedStrategyProfile(const MixedBehaviorProfile<T> &p_profile)
   : m_rep(new TreeMixedStrategyProfileRep<T>(p_profile))
 {
-  Game game = p_profile.GetGame();
-  auto *efg = dynamic_cast<GameTreeRep *>(game.operator->());
-  for (int pl = 1; pl <= m_rep->m_support.GetGame()->NumPlayers(); pl++) {
-    GamePlayer player = m_rep->m_support.GetGame()->GetPlayer(pl);
-    for (int st = 1; st <= player->NumStrategies(); st++) {
-      T prob = (T)1;
-
-      for (int iset = 1; iset <= efg->GetPlayer(pl)->NumInfosets(); iset++) {
-        if (efg->m_players[pl]->m_strategies[st]->m_behav[iset] > 0) {
-          GameInfoset infoset = player->GetInfoset(iset);
-          prob *=
-              p_profile[infoset->GetAction(efg->m_players[pl]->m_strategies[st]->m_behav[iset])];
+  auto *efg = dynamic_cast<GameTreeRep *>(p_profile.GetGame().operator->());
+  for (const auto &player : efg->m_players) {
+    for (const auto &strategy : player->m_strategies) {
+      auto prob = static_cast<T>(1);
+      for (const auto &infoset : player->m_infosets) {
+        if (strategy->m_behav[infoset->GetNumber()] > 0) {
+          prob *= p_profile[infoset->GetAction(strategy->m_behav[infoset->GetNumber()])];
         }
       }
-      (*this)[m_rep->m_support.GetGame()->GetPlayer(pl)->GetStrategy(st)] = prob;
+      (*m_rep)[strategy] = prob;
     }
   }
 }
 
-template <class T>
-MixedStrategyProfile<T>::MixedStrategyProfile(const MixedStrategyProfile<T> &p_profile)
-  : m_rep(p_profile.m_rep->Copy())
-{
-  InvalidateCache();
-}
-
 template <class T>
 MixedStrategyProfile<T> &
 MixedStrategyProfile<T>::operator=(const MixedStrategyProfile<T> &p_profile)
 {
   if (this != &p_profile) {
     InvalidateCache();
-    delete m_rep;
-    m_rep = p_profile.m_rep->Copy();
+    m_rep.reset(p_profile.m_rep->Copy());
   }
   return *this;
 }
 
-template <class T> MixedStrategyProfile<T>::~MixedStrategyProfile() { delete m_rep; }
-
 //========================================================================
 //             MixedStrategyProfile<T>: General data access
 //========================================================================
@@ -447,10 +434,8 @@ template <class T> Vector<T> MixedStrategyProfile<T>::operator[](const GamePlaye
   CheckVersion();
   auto strategies = m_rep->m_support.GetStrategies(p_player);
   Vector<T> probs(strategies.size());
-  int st = 1;
-  for (auto strategy : strategies) {
-    probs[st] = (*this)[strategy];
-  }
+  std::transform(strategies.begin(), strategies.end(), probs.begin(),
+                 [this](const GameStrategy &s) { return (*m_rep)[s]; });
   return probs;
 }
 
@@ -459,9 +444,10 @@ template <class T> MixedStrategyProfile<T> MixedStrategyProfile<T>::ToFullSuppor
   CheckVersion();
   MixedStrategyProfile<T> full(m_rep->m_support.GetGame()->NewMixedStrategyProfile(T(0)));
 
-  for (auto player : m_rep->m_support.GetGame()->GetPlayers()) {
-    for (auto strategy : player->GetStrategies()) {
-      full[strategy] = (m_rep->m_support.Contains(strategy)) ? (*this)[strategy] : T(0);
+  for (const auto &player : m_rep->m_support.GetGame()->GetPlayers()) {
+    for (const auto &strategy : player->GetStrategies()) {
+      full[strategy] =
+          (m_rep->m_support.Contains(strategy)) ? (*m_rep)[strategy] : static_cast<T>(0);
     }
   }
   return full;
@@ -470,17 +456,18 @@ template <class T> MixedStrategyProfile<T> MixedStrategyProfile<T>::ToFullSuppor
 //========================================================================
 //    MixedStrategyProfile<T>: Computation of interesting quantities
 //========================================================================
+
 template <class T> void MixedStrategyProfile<T>::ComputePayoffs() const
 {
   if (!map_profile_payoffs.empty()) {
     // caches (map_profile_payoffs and map_strategy_payoffs) are valid,
     // so don't compute anything, simply return
     return;
   }
-  for (auto player : m_rep->m_support.GetPlayers()) {
+  for (const auto &player : m_rep->m_support.GetPlayers()) {
     map_profile_payoffs[player] = GetPayoff(player);
     // values of the player's strategies
-    for (auto strategy : m_rep->m_support.GetStrategies(player)) {
+    for (const auto &strategy : m_rep->m_support.GetStrategies(player)) {
       map_strategy_payoffs[player][strategy] = GetPayoff(strategy);
     }
   }
@@ -491,13 +478,10 @@ template <class T> T MixedStrategyProfile<T>::GetLiapValue() const
   CheckVersion();
   ComputePayoffs();
 
-  T liapValue = T(0);
-  for (auto player : m_rep->m_support.GetPlayers()) {
+  auto liapValue = static_cast<T>(0);
+  for (auto [player, payoff] : map_profile_payoffs) {
     for (auto v : map_strategy_payoffs[player]) {
-      T regret = v.second - map_profile_payoffs[player];
-      if (regret > T(0)) {
-        liapValue += regret * regret; // penalty if not best response
-      }
+      liapValue += sqr(std::max(v.second - payoff, static_cast<T>(0)));
     }
   }
   return liapValue;