Remove GetAction(int) from Game as part of deprecating access-by-index methods

Author: tturocy

src/games/game.h

@@ -550,8 +550,6 @@ class GameRep : public BaseGameRep {
   virtual Array<GameInfoset> GetInfosets() const = 0;
   /// Returns an array with the number of information sets per personal player
   virtual Array<int> NumInfosets() const = 0;
-  /// Returns the act'th action in the game (numbered globally)
-  virtual GameAction GetAction(int act) const = 0;
   //@}
 
   /// @name Outcomes

src/games/gameagg.h

@@ -93,8 +93,6 @@ class GameAGGRep : public GameRep {
   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(); }
-  /// Returns the act'th action in the game (numbered globally)
-  GameAction GetAction(int act) const override { throw UndefinedException(); }
   //@}
 
   /// @name Outcomes

src/games/gamebagg.h

@@ -94,8 +94,6 @@ class GameBAGGRep : public GameRep {
   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(); }
-  /// Returns the act'th action in the game (numbered globally)
-  GameAction GetAction(int act) const override { throw UndefinedException(); }
   //@}
 
   /// @name Outcomes

src/games/gametable.h

@@ -82,8 +82,6 @@ class GameTableRep : public GameExplicitRep {
   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(); }
-  /// Returns the act'th action in the game (numbered globally)
-  GameAction GetAction(int act) const override { throw UndefinedException(); }
   //@}
 
   /// @name Nodes

src/games/gametree.cc

@@ -1031,21 +1031,6 @@ Array<int> GameTreeRep::NumInfosets() const
   return foo;
 }
 
-GameAction GameTreeRep::GetAction(int p_index) const
-{
-  int index = 1;
-  for (auto player : m_players) {
-    for (auto infoset : player->m_infosets) {
-      for (auto action : infoset->m_actions) {
-        if (index++ == p_index) {
-          return action;
-        }
-      }
-    }
-  }
-  throw IndexException();
-}
-
 //------------------------------------------------------------------------
 //                        GameTreeRep: Outcomes
 //------------------------------------------------------------------------

src/games/gametree.h

@@ -284,8 +284,6 @@ class GameTreeRep : public GameExplicitRep {
   Array<GameInfoset> GetInfosets() const override;
   /// Returns an array with the number of information sets per personal player
   Array<int> NumInfosets() const override;
-  /// Returns the act'th action in the game (numbered globally)
-  GameAction GetAction(int act) const override;
   //@}
 
   /// @name Modification

src/gui/analysis.cc

@@ -363,7 +363,7 @@ std::string gbtAnalysisProfileList<T>::GetActionProb(int p_action, int p_index)
   try {
     const MixedBehaviorProfile<T> &profile = *m_behavProfiles[index];
 
-    if (!profile.IsDefinedAt(profile.GetGame()->GetAction(p_action)->GetInfoset())) {
+    if (!profile.IsDefinedAt(m_doc->GetAction(p_action)->GetInfoset())) {
       return "*";
     }
 

src/gui/dlefglogit.cc

@@ -84,7 +84,7 @@ wxString gbtLogitBehavList::GetCellValue(const wxSheetCoords &p_coords)
       return wxT("Lambda");
     }
     else {
-      Gambit::GameAction action = m_doc->GetGame()->GetAction(p_coords.GetCol());
+      Gambit::GameAction action = m_doc->GetAction(p_coords.GetCol());
       return (wxString::Format(wxT("%d: "), action->GetInfoset()->GetNumber()) +
               wxString(action->GetLabel().c_str(), *wxConvCurrent));
     }
@@ -114,7 +114,7 @@ static wxColour GetPlayerColor(gbtGameDocument *p_doc, int p_index)
     return *wxBLACK;
   }
 
-  Gambit::GameAction action = p_doc->GetGame()->GetAction(p_index);
+  Gambit::GameAction action = p_doc->GetAction(p_index);
   return p_doc->GetStyle().GetPlayerColor(action->GetInfoset()->GetPlayer()->GetNumber());
 }
 
@@ -146,7 +146,7 @@ wxSheetCellAttr gbtLogitBehavList::GetAttr(const wxSheetCoords &p_coords, wxShee
   attr.SetAlignment(wxALIGN_RIGHT, wxALIGN_CENTER);
   attr.SetOrientation(wxHORIZONTAL);
   if (p_coords.GetCol() > 0) {
-    Gambit::GameAction action = m_doc->GetGame()->GetAction(p_coords.GetCol());
+    Gambit::GameAction action = m_doc->GetAction(p_coords.GetCol());
     attr.SetForegroundColour(
         m_doc->GetStyle().GetPlayerColor(action->GetInfoset()->GetPlayer()->GetNumber()));
     if (action->GetInfoset()->GetNumber() % 2 == 0) {

src/gui/efgprofile.cc

@@ -58,7 +58,7 @@ void gbtBehavProfileList::OnLabelClick(wxSheetEvent &p_event)
   else {
     // Clicking on an action column sets the selected node to the first
     // member of that information set.
-    Gambit::GameAction action = m_doc->GetGame()->GetAction(p_event.GetCol() + 1);
+    Gambit::GameAction action = m_doc->GetAction(p_event.GetCol() + 1);
     m_doc->SetSelectNode(action->GetInfoset()->GetMember(1));
   }
 }
@@ -74,7 +74,7 @@ wxString gbtBehavProfileList::GetCellValue(const wxSheetCoords &p_coords)
     return wxString::Format(wxT("%d"), p_coords.GetRow() + 1);
   }
   else if (IsColLabelCell(p_coords)) {
-    Gambit::GameAction action = m_doc->GetGame()->GetAction(p_coords.GetCol() + 1);
+    Gambit::GameAction action = m_doc->GetAction(p_coords.GetCol() + 1);
     return (wxString::Format(wxT("%d: "), action->GetInfoset()->GetNumber()) +
             wxString(action->GetLabel().c_str(), *wxConvCurrent));
   }
@@ -88,7 +88,7 @@ wxString gbtBehavProfileList::GetCellValue(const wxSheetCoords &p_coords)
 
 static wxColour GetPlayerColor(gbtGameDocument *p_doc, int p_index)
 {
-  Gambit::GameAction action = p_doc->GetGame()->GetAction(p_index + 1);
+  Gambit::GameAction action = p_doc->GetAction(p_index + 1);
   return p_doc->GetStyle().GetPlayerColor(action->GetInfoset()->GetPlayer()->GetNumber());
 }
 
@@ -136,7 +136,7 @@ wxSheetCellAttr gbtBehavProfileList::GetAttr(const wxSheetCoords &p_coords, wxSh
   attr.SetRenderer(wxSheetCellRenderer(new gbtRationalRendererRefData()));
 
   try {
-    Gambit::GameAction action = m_doc->GetGame()->GetAction(p_coords.GetCol() + 1);
+    Gambit::GameAction action = m_doc->GetAction(p_coords.GetCol() + 1);
     attr.SetForegroundColour(
         m_doc->GetStyle().GetPlayerColor(action->GetInfoset()->GetPlayer()->GetNumber()));
     if (action->GetInfoset()->GetNumber() % 2 == 0) {

src/gui/gamedoc.cc

@@ -389,6 +389,21 @@ void gbtGameDocument::BuildNfg()
   }
 }
 
+GameAction gbtGameDocument::GetAction(int p_index) const
+{
+  int index = 1;
+  for (auto player : m_game->GetPlayers()) {
+    for (auto infoset : player->GetInfosets()) {
+      for (auto action : infoset->GetActions()) {
+        if (index++ == p_index) {
+          return action;
+        }
+      }
+    }
+  }
+  throw IndexException();
+}
+
 void gbtGameDocument::SetStyle(const gbtStyle &p_style)
 {
   m_style = p_style;