Move InsertAction

Author: tturocy

src/games/game.h

@@ -215,8 +215,6 @@ class GameInfosetRep : public GameObject {
   void SetLabel(const std::string &p_label) { m_label = p_label; }
   const std::string &GetLabel() const { return m_label; }
 
-  GameAction InsertAction(GameAction p_where = nullptr);
-
   /// @name Actions
   //@{
   /// Returns the number of actions available at the information set
@@ -321,7 +319,7 @@ class GamePlayerRep : public GameObject {
   GameRep *m_game;
   int m_number;
   std::string m_label;
-  std::vector<class GameInfosetRep *> m_infosets;
+  std::vector<GameInfosetRep *> m_infosets;
   Array<GameStrategyRep *> m_strategies;
 
   GamePlayerRep(GameRep *p_game, int p_id) : m_game(p_game), m_number(p_id) {}
@@ -546,6 +544,10 @@ class GameRep : public BaseGameRep {
   virtual void Reveal(GameInfoset, GamePlayer) { throw UndefinedException(); }
   virtual void SetInfoset(GameNode, GameInfoset) { throw UndefinedException(); }
   virtual GameInfoset LeaveInfoset(GameNode) { throw UndefinedException(); }
+  virtual GameAction InsertAction(GameInfoset, GameAction p_where = nullptr)
+  {
+    throw UndefinedException();
+  }
   virtual void DeleteAction(GameAction) { throw UndefinedException(); }
 
   /// @name Dimensions of the game

src/games/gametree.cc

@@ -213,32 +213,35 @@ bool GameInfosetRep::Precedes(GameNode p_node) const
   return false;
 }
 
-GameAction GameInfosetRep::InsertAction(GameAction p_action /* =0 */)
+GameAction GameTreeRep::InsertAction(GameInfoset p_infoset, GameAction p_action /* =nullptr */)
 {
-  if (p_action && p_action->GetInfoset() != this) {
+  if (p_action && p_action->GetInfoset() != p_infoset) {
+    throw MismatchException();
+  }
+  if (p_infoset->m_efg != this) {
     throw MismatchException();
   }
 
-  m_efg->IncrementVersion();
-  int where = m_actions.size() + 1;
+  IncrementVersion();
+  int where = p_infoset->m_actions.size() + 1;
   if (p_action) {
-    for (where = 1; m_actions[where] != p_action; where++)
+    for (where = 1; p_infoset->m_actions[where] != p_action; where++)
       ;
   }
 
-  auto *action = new GameActionRep(where, "", this);
-  m_actions.insert(std::next(m_actions.cbegin(), where - 1), action);
-  if (m_player->IsChance()) {
-    m_probs.insert(std::next(m_probs.cbegin(), where - 1), Number());
+  auto *action = new GameActionRep(where, "", p_infoset);
+  p_infoset->m_actions.insert(std::next(p_infoset->m_actions.cbegin(), where - 1), action);
+  if (p_infoset->m_player->IsChance()) {
+    p_infoset->m_probs.insert(std::next(p_infoset->m_probs.cbegin(), where - 1), Number());
   }
-  RenumberActions();
-  for (const auto &member : m_members) {
+  p_infoset->RenumberActions();
+  for (const auto &member : p_infoset->m_members) {
     member->m_children.insert(std::next(member->m_children.cbegin(), where - 1),
-                              new GameNodeRep(m_efg, member));
+                              new GameNodeRep(this, member));
   }
 
-  dynamic_cast<GameTreeRep *>(m_efg)->ClearComputedValues();
-  dynamic_cast<GameTreeRep *>(m_efg)->Canonicalize();
+  ClearComputedValues();
+  Canonicalize();
   return action;
 }
 

src/games/gametree.h

@@ -136,6 +136,7 @@ class GameTreeRep : public GameExplicitRep {
   void SetInfoset(GameNode, GameInfoset) override;
   GameInfoset LeaveInfoset(GameNode) override;
   Game SetChanceProbs(const GameInfoset &, const Array<Number> &) override;
+  GameAction InsertAction(GameInfoset, GameAction p_where = nullptr) override;
   void DeleteAction(GameAction) override;
 
   Game CopySubgame(GameNode) const override;

src/gui/gamedoc.cc

@@ -671,7 +671,7 @@ void gbtGameDocument::DoInsertAction(GameNode p_node)
   if (!p_node || !p_node->GetInfoset()) {
     return;
   }
-  const GameAction action = p_node->GetInfoset()->InsertAction();
+  const GameAction action = m_game->InsertAction(p_node->GetInfoset());
   action->SetLabel(std::to_string(action->GetNumber()));
   UpdateViews(GBT_DOC_MODIFIED_GAME);
 }

src/pygambit/gambit.pxd

@@ -114,8 +114,6 @@ cdef extern from "games/game.h":
 
         int NumActions() except +
         c_GameAction GetAction(int) except +IndexError
-        c_GameAction InsertAction(c_GameAction) except +ValueError
-
         c_Number GetActionProb(c_GameAction) except +IndexError
 
         int NumMembers() except +
@@ -222,6 +220,7 @@ cdef extern from "games/game.h":
         void Reveal(c_GameInfoset, c_GamePlayer) except +
         void SetInfoset(c_GameNode, c_GameInfoset) except +ValueError
         c_GameInfoset LeaveInfoset(c_GameNode) except +
+        c_GameAction InsertAction(c_GameInfoset, c_GameAction) except +ValueError
         void DeleteAction(c_GameAction) except +ValueError
         c_Game SetChanceProbs(c_GameInfoset, Array[c_Number]) except +
 

src/pygambit/game.pxi

@@ -1679,14 +1679,15 @@ class Game:
         """
         resolved_infoset = cython.cast(Infoset, self._resolve_infoset(infoset, "add_action"))
         if before is None:
-            resolved_infoset.infoset.deref().InsertAction(cython.cast(c_GameAction, NULL))
+            self.game.deref().InsertAction(resolved_infoset.infoset,
+                                           cython.cast(c_GameAction, NULL))
         else:
             resolved_action = cython.cast(
                 Action, self._resolve_action(before, "add_action", "before")
             )
             if resolved_infoset != resolved_action.infoset:
                 raise MismatchError("add_action(): must specify an action from the same infoset")
-            resolved_infoset.infoset.deref().InsertAction(resolved_action.action)
+            self.game.deref().InsertAction(resolved_infoset.infoset, resolved_action.action)
 
     def delete_action(self, action: typing.Union[Action, str]) -> None:
         """Deletes `action` from its information set.  The subtrees which