Implement Infosets as collection for player

Author: tturocy

src/games/game.cc

@@ -79,9 +79,9 @@ Array<GameStrategy> GamePlayerRep::GetStrategies() const
 
 void GamePlayerRep::MakeStrategy()
 {
-  Array<int> c(NumInfosets());
+  Array<int> c(m_infosets.size());
 
-  for (size_t i = 1; i <= NumInfosets(); i++) {
+  for (size_t i = 1; i <= m_infosets.size(); i++) {
     if (m_infosets[i - 1]->flag == 1) {
       c[i] = m_infosets[i - 1]->whichbranch;
     }
@@ -175,16 +175,6 @@ void GamePlayerRep::MakeReducedStrats(GameNodeRep *n, GameNodeRep *nn)
   }
 }
 
-GameInfoset GamePlayerRep::GetInfoset(int p_index) const { return m_infosets[p_index - 1]; }
-
-Array<GameInfoset> GamePlayerRep::GetInfosets() const
-{
-  Array<GameInfoset> ret(m_infosets.size());
-  std::transform(m_infosets.cbegin(), m_infosets.cend(), ret.begin(),
-                 [](const GameInfosetRep *s) -> GameInfoset { return s; });
-  return ret;
-}
-
 size_t GamePlayerRep::NumSequences() const
 {
   if (!m_game->IsTree()) {

src/games/game.h

@@ -289,7 +289,6 @@ class GameInfosetRep : public GameObject {
   Actions GetActions() const { return Actions(this, &m_actions); }
   //@}
 
-  size_t NumMembers() const { return m_members.size(); }
   GameNode GetMember(int p_index) const { return m_members.at(p_index - 1); }
   Members GetMembers() const { return Members(this, &m_members); }
 
@@ -388,6 +387,8 @@ class GamePlayerRep : public GameObject {
   ~GamePlayerRep() override;
 
 public:
+  using Infosets = ElementCollection<GamePlayer, GameInfosetRep>;
+
   int GetNumber() const { return m_number; }
   Game GetGame() const;
 
@@ -398,12 +399,10 @@ class GamePlayerRep : public GameObject {
 
   /// @name Information sets
   //@{
-  /// Returns the number of information sets at which the player makes a choice
-  size_t NumInfosets() const { return m_infosets.size(); }
   /// Returns the p_index'th information set
-  GameInfoset GetInfoset(int p_index) const;
-  /// Returns the information sets for the players
-  Array<GameInfoset> GetInfosets() const;
+  GameInfoset GetInfoset(int p_index) const { return m_infosets.at(p_index - 1); }
+  /// Returns the information sets for the player
+  Infosets GetInfosets() const { return Infosets(this, &m_infosets); }
 
   /// @name Strategies
   //@{
@@ -685,14 +684,10 @@ class GameRep : public BaseGameRep {
   virtual GameInfoset GetInfoset(int iset) const = 0;
   /// Returns the set of information sets in the game
   virtual Array<GameInfoset> GetInfosets() const = 0;
-  /// Returns an array with the number of information sets per personal player
-  virtual Array<int> NumInfosets() const = 0;
   //@}
 
   /// @name Outcomes
   //@{
-  /// Returns the number of outcomes defined in the game
-  size_t NumOutcomes() const { return m_outcomes.size(); }
   /// Returns the index'th outcome defined in the game
   GameOutcome GetOutcome(int index) const { return m_outcomes.at(index - 1); }
   /// Returns the set of outcomes in the game

src/games/gameagg.h

@@ -79,8 +79,6 @@ class GameAGGRep : public GameRep {
   GameInfoset GetInfoset(int iset) const override { throw UndefinedException(); }
   /// Returns the set of information sets in the game
   Array<GameInfoset> GetInfosets() const override { throw UndefinedException(); }
-  /// Returns an array with the number of information sets per personal player
-  Array<int> NumInfosets() const override { throw UndefinedException(); }
   //@}
 
   /// @name Nodes

src/games/gamebagg.h

@@ -87,8 +87,6 @@ class GameBAGGRep : public GameRep {
   GameInfoset GetInfoset(int iset) const override { throw UndefinedException(); }
   /// Returns the set of information sets in the game
   Array<GameInfoset> GetInfosets() const override { throw UndefinedException(); }
-  /// Returns an array with the number of information sets per personal player
-  Array<int> NumInfosets() const override { throw UndefinedException(); }
   //@}
 
   /// @name Nodes

src/games/gametable.h

@@ -80,8 +80,6 @@ class GameTableRep : public GameExplicitRep {
   GameInfoset GetInfoset(int iset) const override { throw UndefinedException(); }
   /// Returns the set of information sets in the game
   Array<GameInfoset> GetInfosets() const override { throw UndefinedException(); }
-  /// Returns an array with the number of information sets per personal player
-  Array<int> NumInfosets() const override { throw UndefinedException(); }
   //@}
 
   /// @name Nodes

src/games/gametree.cc

@@ -735,9 +735,9 @@ bool GameTreeRep::IsConstSum() const
 bool GameTreeRep::IsPerfectRecall(GameInfoset &s1, GameInfoset &s2) const
 {
   for (auto player : m_players) {
-    for (size_t i = 1; i <= player->NumInfosets(); i++) {
+    for (size_t i = 1; i <= player->m_infosets.size(); i++) {
       auto *iset1 = player->m_infosets[i - 1];
-      for (size_t j = 1; j <= player->NumInfosets(); j++) {
+      for (size_t j = 1; j <= player->m_infosets.size(); j++) {
         auto *iset2 = player->m_infosets[j - 1];
 
         bool precedes = false;
@@ -995,15 +995,6 @@ Array<GameInfoset> GameTreeRep::GetInfosets() const
   return infosets;
 }
 
-Array<int> GameTreeRep::NumInfosets() const
-{
-  Array<int> foo;
-  for (const auto &player : m_players) {
-    foo.push_back(player->NumInfosets());
-  }
-  return foo;
-}
-
 //------------------------------------------------------------------------
 //                        GameTreeRep: Outcomes
 //------------------------------------------------------------------------
@@ -1152,7 +1143,7 @@ Rational TreePureStrategyProfileRep::GetPayoff(const GamePlayer &p_player) const
 {
   PureBehaviorProfile behav(m_nfg);
   for (const auto &player : m_nfg->GetPlayers()) {
-    for (size_t iset = 1; iset <= player->NumInfosets(); iset++) {
+    for (size_t iset = 1; iset <= player->GetInfosets().size(); iset++) {
       if (const int act = m_profile.at(player)->m_behav[iset]) {
         behav.SetAction(player->GetInfoset(iset)->GetAction(act));
       }

src/games/gametree.h

@@ -120,8 +120,6 @@ class GameTreeRep : public GameExplicitRep {
   GameInfoset GetInfoset(int iset) const override;
   /// Returns the set of information sets in the game
   Array<GameInfoset> GetInfosets() const override;
-  /// Returns an array with the number of information sets per personal player
-  Array<int> NumInfosets() const override;
   //@}
 
   /// @name Modification

src/pygambit/game.pxi

@@ -249,7 +249,7 @@ class GameOutcomes:
 
     def __len__(self) -> int:
         """The number of outcomes in the game."""
-        return self.game.deref().NumOutcomes()
+        return self.game.deref().GetOutcomes().size()
 
     def __iter__(self) -> typing.Iterator[Outcome]:
         for outcome in self.game.deref().GetOutcomes():
@@ -420,7 +420,7 @@ class GameStrategies:
         return obj
 
     def __repr__(self) -> str:
-        return f"GameOutcomes(game={self.game})"
+        return f"GameStrategies(game={self.game})"
 
     def __len__(self) -> int:
         return sum(len(p.strategies) for p in self.game.players)

src/solvers/lcp/efglcp.cc

@@ -70,7 +70,8 @@ template <class T> class NashLcpBehaviorSolver<T>::Solution {
 template <class T>
 NashLcpBehaviorSolver<T>::Solution::Solution(const Game &p_game)
   : ns1(p_game->GetPlayer(1)->NumSequences()), ns2(p_game->GetPlayer(2)->NumSequences()),
-    ni1(p_game->GetPlayer(1)->NumInfosets() + 1), ni2(p_game->GetPlayer(2)->NumInfosets() + 1),
+    ni1(p_game->GetPlayer(1)->GetInfosets().size() + 1),
+    ni2(p_game->GetPlayer(2)->GetInfosets().size() + 1),
     maxpay(p_game->GetMaxPayoff() + Rational(1))
 {
   for (const auto &player : p_game->GetPlayers()) {

src/solvers/lp/lp.cc

@@ -178,10 +178,10 @@ List<MixedBehaviorProfile<T>> LpBehaviorSolve(const Game &p_game,
 
   GameData<T> data(p_game);
 
-  Matrix<T> A(1, data.ns1 + p_game->GetPlayer(2)->NumInfosets() + 1, 1,
-              data.ns2 + p_game->GetPlayer(1)->NumInfosets() + 1);
-  Vector<T> b(1, data.ns1 + p_game->GetPlayer(2)->NumInfosets() + 1);
-  Vector<T> c(1, data.ns2 + p_game->GetPlayer(1)->NumInfosets() + 1);
+  Matrix<T> A(1, data.ns1 + p_game->GetPlayer(2)->GetInfosets().size() + 1, 1,
+              data.ns2 + p_game->GetPlayer(1)->GetInfosets().size() + 1);
+  Vector<T> b(1, data.ns1 + p_game->GetPlayer(2)->GetInfosets().size() + 1);
+  Vector<T> c(1, data.ns2 + p_game->GetPlayer(1)->GetInfosets().size() + 1);
 
   A = static_cast<T>(0);
   b = static_cast<T>(0);
@@ -196,7 +196,7 @@ List<MixedBehaviorProfile<T>> LpBehaviorSolve(const Game &p_game,
 
   Array<T> primal(A.NumColumns()), dual(A.NumRows());
   List<MixedBehaviorProfile<T>> solution;
-  SolveLP(A, b, c, p_game->GetPlayer(2)->NumInfosets() + 1, primal, dual);
+  SolveLP(A, b, c, p_game->GetPlayer(2)->GetInfosets().size() + 1, primal, dual);
   MixedBehaviorProfile<T> profile(p_game);
   data.GetBehavior(profile, primal, dual, p_game->GetRoot(), 1, 1);
   profile.UndefinedToCentroid();