Implement collection of members at infoset

tturocy · tturocy · commit 76cb7c1a937c · 2025-05-08T12:34:12.000+01:00
diff --git a/src/games/game.h b/src/games/game.h
@@ -261,6 +261,68 @@ class GameInfosetRep : public GameObject {
     iterator cend() const { return {m_infoset, (m_infoset) ? m_infoset->m_actions.size() : 0}; }
   };
 
+  class Members {
+    GameInfoset m_infoset{nullptr};
+
+  public:
+    class iterator {
+      GameInfoset m_infoset{nullptr};
+      size_t m_index{0};
+
+    public:
+      using iterator_category = std::bidirectional_iterator_tag;
+      using difference_type = std::ptrdiff_t;
+      using value_type = GameNode;
+      using pointer = value_type *;
+      using reference = value_type &;
+
+      iterator() = default;
+      iterator(const GameInfoset &p_infoset, size_t p_index = 0)
+        : m_infoset(p_infoset), m_index(p_index)
+      {
+      }
+      iterator(const iterator &) = default;
+      ~iterator() = default;
+      iterator &operator=(const iterator &) = default;
+
+      bool operator==(const iterator &p_iter) const
+      {
+        return m_infoset == p_iter.m_infoset && m_index == p_iter.m_index;
+      }
+      bool operator!=(const iterator &p_iter) const
+      {
+        return m_infoset != p_iter.m_infoset || m_index != p_iter.m_index;
+      }
+
+      iterator &operator++()
+      {
+        m_index++;
+        return *this;
+      }
+      iterator &operator--()
+      {
+        m_index--;
+        return *this;
+      }
+      GameNode operator*() const { return m_infoset->m_members.at(m_index); }
+    };
+
+    Members() = default;
+    explicit Members(const GameInfoset &p_infoset) : m_infoset(p_infoset) {}
+    Members(const Members &) = default;
+    ~Members() = default;
+    Members &operator=(const Members &) = default;
+
+    size_t size() const { return m_infoset->m_members.size(); }
+    GameNode front() const { return m_infoset->m_members.front(); }
+    GameNode back() const { return m_infoset->m_members.back(); }
+
+    iterator begin() const { return {m_infoset, 0}; }
+    iterator end() const { return {m_infoset, (m_infoset) ? m_infoset->m_members.size() : 0}; }
+    iterator cbegin() const { return {m_infoset, 0}; }
+    iterator cend() const { return {m_infoset, (m_infoset) ? m_infoset->m_members.size() : 0}; }
+  };
+
   Game GetGame() const;
   int GetNumber() const { return m_number; }
 
@@ -280,8 +342,8 @@ class GameInfosetRep : public GameObject {
   //@}
 
   size_t NumMembers() const { return m_members.size(); }
-  GameNode GetMember(int p_index) const;
-  Array<GameNode> GetMembers() const;
+  GameNode GetMember(int p_index) const { return m_members.at(p_index - 1); }
+  Members GetMembers() const { return Members(this); }
 
   bool Precedes(GameNode) const;
 
@@ -922,6 +984,8 @@ inline void GameOutcomeRep::SetPayoff(const GamePlayer &p_player, const Number &
 inline GamePlayer GameStrategyRep::GetPlayer() const { return m_player; }
 
 inline Game GameInfosetRep::GetGame() const { return m_game; }
+inline GamePlayer GameInfosetRep::GetPlayer() const { return m_player; }
+inline bool GameInfosetRep::IsChanceInfoset() const { return m_player->IsChance(); }
 
 inline Game GamePlayerRep::GetGame() const { return m_game; }
 inline size_t GamePlayerRep::NumStrategies() const
diff --git a/src/games/gametree.cc b/src/games/gametree.cc
@@ -281,20 +281,6 @@ void GameTreeRep::Reveal(GameInfoset p_atInfoset, GamePlayer p_player)
   Canonicalize();
 }
 
-GameNode GameInfosetRep::GetMember(int p_index) const { return m_members[p_index - 1]; }
-
-Array<GameNode> GameInfosetRep::GetMembers() const
-{
-  Array<GameNode> ret(m_members.size());
-  std::transform(m_members.cbegin(), m_members.cend(), ret.begin(),
-                 [](const GameNodeRep *n) -> GameNode { return n; });
-  return ret;
-}
-
-GamePlayer GameInfosetRep::GetPlayer() const { return m_player; }
-
-bool GameInfosetRep::IsChanceInfoset() const { return m_player->IsChance(); }
-
 //========================================================================
 //                         class GameNodeRep
 //========================================================================
@@ -373,7 +359,7 @@ bool GameNodeRep::IsSuccessorOf(GameNode p_node) const
 bool GameNodeRep::IsSubgameRoot() const
 {
   // First take care of a couple easy cases
-  if (m_children.empty() || m_infoset->NumMembers() > 1) {
+  if (m_children.empty() || m_infoset->m_members.size() > 1) {
     return false;
   }
   if (!m_parent) {
@@ -385,9 +371,10 @@ bool GameNodeRep::IsSubgameRoot() const
   // or all members do not succeed the node in the tree.
   for (auto player : m_game->GetPlayers()) {
     for (auto infoset : player->GetInfosets()) {
-      const bool precedes = infoset->GetMember(1)->IsSuccessorOf(const_cast<GameNodeRep *>(this));
-      for (size_t mem = 2; mem <= infoset->NumMembers(); mem++) {
-        if (infoset->GetMember(mem)->IsSuccessorOf(const_cast<GameNodeRep *>(this)) != precedes) {
+      const bool precedes =
+          infoset->m_members.front()->IsSuccessorOf(const_cast<GameNodeRep *>(this));
+      for (size_t mem = 0; mem < infoset->m_members.size(); mem++) {
+        if (infoset->m_members[mem]->IsSuccessorOf(const_cast<GameNodeRep *>(this)) != precedes) {
           return false;
         }
       }
@@ -755,9 +742,9 @@ bool GameTreeRep::IsPerfectRecall(GameInfoset &s1, GameInfoset &s2) const
         bool precedes = false;
         GameAction action = nullptr;
 
-        for (size_t m = 1; m <= iset2->NumMembers(); m++) {
+        for (size_t m = 1; m <= iset2->m_members.size(); m++) {
           size_t n;
-          for (n = 1; n <= iset1->NumMembers(); n++) {
+          for (n = 1; n <= iset1->m_members.size(); n++) {
             if (iset2->GetMember(m)->IsSuccessorOf(iset1->GetMember(n)) &&
                 iset1->GetMember(n) != iset2->GetMember(m)) {
               precedes = true;
@@ -781,7 +768,7 @@ bool GameTreeRep::IsPerfectRecall(GameInfoset &s1, GameInfoset &s2) const
             return false;
           }
 
-          if (n > iset1->NumMembers() && precedes) {
+          if (n > iset1->m_members.size() && precedes) {
             s1 = iset1;
             s2 = iset2;
             return false;
diff --git a/src/gui/dleditmove.cc b/src/gui/dleditmove.cc
@@ -160,10 +160,10 @@ wxBEGIN_EVENT_TABLE(gbtEditMoveDialog,
   labelSizer->Add(m_infosetName, 1, wxALL | wxEXPAND, 5);
   topSizer->Add(labelSizer, 0, wxALL | wxEXPAND, 0);
 
-  topSizer->Add(
-      new wxStaticText(this, wxID_STATIC,
-                       wxString::Format(_("Number of members: %d"), p_infoset->NumMembers())),
-      0, wxALL | wxALIGN_CENTER, 5);
+  topSizer->Add(new wxStaticText(
+                    this, wxID_STATIC,
+                    wxString::Format(_("Number of members: %d"), p_infoset->GetMembers().size())),
+                0, wxALL | wxALIGN_CENTER, 5);
 
   auto *playerSizer = new wxBoxSizer(wxHORIZONTAL);
   playerSizer->Add(new wxStaticText(this, wxID_STATIC, _("Belongs to player")), 0,
diff --git a/src/gui/dlinsertmove.cc b/src/gui/dlinsertmove.cc
@@ -68,8 +68,8 @@ gbtInsertMoveDialog::gbtInsertMoveDialog(wxWindow *p_parent, gbtGameDocument *p_
       s += wxT("s");
     }
 
-    s += wxString::Format(wxT(", %d member node"), infoset->NumMembers());
-    if (infoset->NumMembers() > 1) {
+    s += wxString::Format(wxT(", %d member node"), infoset->GetMembers().size());
+    if (infoset->GetMembers().size() > 1) {
       s += wxT("s)");
     }
     else {
@@ -144,8 +144,8 @@ void gbtInsertMoveDialog::OnPlayer(wxCommandEvent &)
       s += wxT("s");
     }
 
-    s += wxString::Format(wxT(", %d member node"), infoset->NumMembers());
-    if (infoset->NumMembers() > 1) {
+    s += wxString::Format(wxT(", %d member node"), infoset->GetMembers().size());
+    if (infoset->GetMembers().size() > 1) {
       s += wxT("s)");
     }
     else {
diff --git a/src/gui/efgdisplay.cc b/src/gui/efgdisplay.cc
@@ -375,15 +375,10 @@ static GameNode PriorSameIset(const GameNode &n)
   if (!iset) {
     return nullptr;
   }
-  for (size_t i = 1; i <= iset->NumMembers(); i++) {
-    if (iset->GetMember(i) == n) {
-      if (i > 1) {
-        return iset->GetMember(i - 1);
-      }
-      else {
-        return nullptr;
-      }
-    }
+  auto members = iset->GetMembers();
+  auto node = std::find(members.begin(), members.end(), n);
+  if (node != members.begin()) {
+    return *std::prev(node);
   }
   return nullptr;
 }
@@ -394,15 +389,10 @@ static GameNode NextSameIset(const GameNode &n)
   if (!iset) {
     return nullptr;
   }
-  for (size_t i = 1; i <= iset->NumMembers(); i++) {
-    if (iset->GetMember(i) == n) {
-      if (i < iset->NumMembers()) {
-        return iset->GetMember(i + 1);
-      }
-      else {
-        return nullptr;
-      }
-    }
+  auto members = iset->GetMembers();
+  auto node = std::find(members.begin(), members.end(), n);
+  if (node != members.end()) {
+    return *std::next(node);
   }
   return nullptr;
 }
diff --git a/src/pygambit/gambit.pxd b/src/pygambit/gambit.pxd
@@ -117,6 +117,16 @@ cdef extern from "games/game.h":
             iterator begin() except +
             iterator end() except +
 
+        cppclass Members:
+            cppclass iterator:
+                c_GameNode operator *()
+                iterator operator++()
+                bint operator ==(iterator)
+                bint operator !=(iterator)
+            int size() except +
+            iterator begin() except +
+            iterator end() except +
+
         int GetNumber() except +
         c_Game GetGame() except +
         c_GamePlayer GetPlayer() except +
@@ -128,8 +138,8 @@ cdef extern from "games/game.h":
         Actions GetActions() except +
         c_Number GetActionProb(c_GameAction) except +IndexError
 
-        int NumMembers() except +
         c_GameNode GetMember(int) except +IndexError
+        Members GetMembers() except +
 
         bint IsChanceInfoset() except +
         bint Precedes(c_GameNode) except +
diff --git a/src/pygambit/infoset.pxi b/src/pygambit/infoset.pxi
@@ -39,11 +39,11 @@ class InfosetMembers:
         return f"InfosetMembers(infoset={Infoset.wrap(self.infoset)})"
 
     def __len__(self) -> int:
-        return self.infoset.deref().NumMembers()
+        return self.infoset.deref().GetMembers().size()
 
     def __iter__(self) -> typing.Iterator[Node]:
-        for i in range(self.infoset.deref().NumMembers()):
-            yield Node.wrap(self.infoset.deref().GetMember(i + 1))
+        for member in self.infoset.deref().GetMembers():
+            yield Node.wrap(member)
 
     def __getitem__(self, index: typing.Union[int, str]) -> Node:
         if isinstance(index, str):
diff --git a/src/solvers/logit/logbehav.imp b/src/solvers/logit/logbehav.imp
@@ -234,7 +234,7 @@ template <class T> void LogBehavProfile<T>::ComputeSolutionData() const
       }
       if (infosetProb == T(0)) {
         for (auto member : infoset->GetMembers()) {
-          m_beliefs[member] = 1.0 / T(infoset->NumMembers());
+          m_beliefs[member] = 1.0 / T(infoset->GetMembers().size());
         }
         continue;
       }

Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,8 @@ gbtInsertMoveDialog::gbtInsertMoveDialog(wxWindow p_parent, gbtGameDocument p_`
`68`	`68`	`s += wxT("s");`
`69`	`69`	`}`
`70`	`70`
`71`		`- s += wxString::Format(wxT(", %d member node"), infoset->NumMembers());`
`72`		`- if (infoset->NumMembers() > 1) {`
	`71`	`+ s += wxString::Format(wxT(", %d member node"), infoset->GetMembers().size());`
	`72`	`+ if (infoset->GetMembers().size() > 1) {`
`73`	`73`	`s += wxT("s)");`
`74`	`74`	`}`
`75`	`75`	`else {`
`@@ -144,8 +144,8 @@ void gbtInsertMoveDialog::OnPlayer(wxCommandEvent &)`
`144`	`144`	`s += wxT("s");`
`145`	`145`	`}`
`146`	`146`
`147`		`- s += wxString::Format(wxT(", %d member node"), infoset->NumMembers());`
`148`		`- if (infoset->NumMembers() > 1) {`
	`147`	`+ s += wxString::Format(wxT(", %d member node"), infoset->GetMembers().size());`
	`148`	`+ if (infoset->GetMembers().size() > 1) {`
`149`	`149`	`s += wxT("s)");`
`150`	`150`	`}`
`151`	`151`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ template <class T> void LogBehavProfile<T>::ComputeSolutionData() const`
`234`	`234`	`}`
`235`	`235`	`if (infosetProb == T(0)) {`
`236`	`236`	`for (auto member : infoset->GetMembers()) {`
`237`		`- m_beliefs[member] = 1.0 / T(infoset->NumMembers());`
	`237`	`+ m_beliefs[member] = 1.0 / T(infoset->GetMembers().size());`
`238`	`238`	`}`
`239`	`239`	`continue;`
`240`	`240`	`}`