Promote GameSequence to be a GameObject

Author: tturocy

src/games/behavspt.cc

@@ -288,9 +288,9 @@ int BehaviorSupportProfile::GetConstraintEntry(const GameInfoset &p_infoset,
   return GetSequenceForm()->GetConstraintEntry(p_infoset, p_action);
 }
 
-const Rational &BehaviorSupportProfile::GetPayoff(
-    const std::map<GamePlayer, std::shared_ptr<GameSequenceRep>> &p_profile,
-    const GamePlayer &p_player) const
+const Rational &
+BehaviorSupportProfile::GetPayoff(const std::map<GamePlayer, GameSequence> &p_profile,
+                                  const GamePlayer &p_player) const
 {
   return GetSequenceForm()->GetPayoff(p_profile, p_player);
 }

src/games/behavspt.h

@@ -30,12 +30,10 @@
 namespace Gambit {
 
 class GameSequenceForm;
-class GameSequenceRep;
 class SequencesWrapper;
 class PlayerSequencesWrapper;
 class InfosetsWrapper;
 class ContingenciesWrapper;
-using GameSequence = std::shared_ptr<GameSequenceRep>;
 
 /// This class represents a subset of the actions in an extensive game.
 /// It is enforced that each player has at least one action at each
@@ -48,6 +46,7 @@ class BehaviorSupportProfile {
   Game m_efg;
   std::map<GameInfoset, std::vector<GameAction>> m_actions;
   mutable std::shared_ptr<GameSequenceForm> m_sequenceForm;
+  mutable std::shared_ptr<std::map<GameInfoset, bool>> m_reachableInfosets;
 
   std::map<GameInfoset, bool> m_infosetReachable;
   std::map<GameNode, bool> m_nonterminalReachable;
@@ -248,16 +247,14 @@ class BehaviorSupportProfile {
   Sequences GetSequences() const;
   PlayerSequences GetSequences(GamePlayer &p_player) const;
   int GetConstraintEntry(const GameInfoset &p_infoset, const GameAction &p_action) const;
-  const Rational &
-  GetPayoff(const std::map<GamePlayer, std::shared_ptr<GameSequenceRep>> &p_profile,
-            const GamePlayer &p_player) const;
+  const Rational &GetPayoff(const std::map<GamePlayer, GameSequence> &p_profile,
+                            const GamePlayer &p_player) const;
   GameRep::Players GetPlayers() const { return GetGame()->GetPlayers(); }
   MixedBehaviorProfile<double>
-  ToMixedBehaviorProfile(const std::map<std::shared_ptr<GameSequenceRep>, double> &) const;
+  ToMixedBehaviorProfile(const std::map<GameSequence, double> &) const;
   Infosets GetInfosets() const { return {this}; };
   SequenceContingencies GetSequenceContingencies() const;
 
-  mutable std::shared_ptr<std::map<GameInfoset, bool>> m_reachableInfosets;
   void FindReachableInfosets(GameNode p_node) const;
   std::shared_ptr<std::map<GameInfoset, bool>> GetReachableInfosets() const;
 };

src/games/game.h

@@ -48,6 +48,9 @@ using GameInfoset = GameObjectPtr<GameInfosetRep>;
 class GameStrategyRep;
 using GameStrategy = GameObjectPtr<GameStrategyRep>;
 
+class GameSequenceRep;
+using GameSequence = GameObjectPtr<GameSequenceRep>;
+
 class GamePlayerRep;
 using GamePlayer = GameObjectPtr<GamePlayerRep>;
 
@@ -316,6 +319,36 @@ class GameStrategyRep : public std::enable_shared_from_this<GameStrategyRep> {
   //@}
 };
 
+class GameSequenceRep : public std::enable_shared_from_this<GameSequenceRep> {
+public:
+  bool m_valid{true};
+  GamePlayer player;
+  GameAction action;
+  size_t number;
+  std::weak_ptr<GameSequenceRep> parent;
+
+  explicit GameSequenceRep(const GamePlayer &p_player, const GameAction &p_action, size_t p_number,
+                           std::weak_ptr<GameSequenceRep> p_parent)
+    : player(p_player), action(p_action), number(p_number), parent(p_parent)
+  {
+  }
+
+  bool IsValid() const { return m_valid; }
+  void Invalidate() { m_valid = false; }
+
+  Game GetGame() const;
+  GameInfoset GetInfoset() const { return (action) ? action->GetInfoset() : nullptr; }
+
+  bool operator<(const GameSequenceRep &other) const
+  {
+    return player < other.player || (player == other.player && action < other.action);
+  }
+  bool operator==(const GameSequenceRep &other) const
+  {
+    return player == other.player && action == other.action;
+  }
+};
+
 /// A player in a game
 class GamePlayerRep : public std::enable_shared_from_this<GamePlayerRep> {
   friend class GameRep;
@@ -945,6 +978,8 @@ inline void GameOutcomeRep::SetPayoff(const GamePlayer &p_player, const Number &
 inline GamePlayer GameStrategyRep::GetPlayer() const { return m_player->shared_from_this(); }
 inline Game GameStrategyRep::GetGame() const { return m_player->GetGame(); }
 
+inline Game GameSequenceRep::GetGame() const { return player->GetGame(); }
+
 inline Game GameActionRep::GetGame() const { return m_infoset->GetGame(); }
 
 inline Game GameInfosetRep::GetGame() const { return m_game->shared_from_this(); }

src/games/gameseq.cc

@@ -44,7 +44,8 @@ void GameSequenceForm::BuildSequences(const GameNode &n,
     for (auto action : m_support.GetActions(n->GetInfoset())) {
       if (m_correspondence.find(action) == m_correspondence.end()) {
         m_sequences[n->GetPlayer()].push_back(std::make_shared<GameSequenceRep>(
-            n->GetPlayer(), action, m_sequences[n->GetPlayer()].size() + 1, tmp_sequence));
+            n->GetPlayer(), action, m_sequences[n->GetPlayer()].size() + 1,
+            tmp_sequence.get_shared()));
         m_correspondence[action] = m_sequences[n->GetPlayer()].back();
       }
       p_currentSequences[n->GetPlayer()] = m_correspondence[action];

src/games/gameseq.h

@@ -28,33 +28,6 @@
 
 namespace Gambit {
 
-class GameSequenceRep {
-public:
-  GamePlayer player;
-  GameAction action;
-  size_t number;
-  std::weak_ptr<GameSequenceRep> parent;
-
-  explicit GameSequenceRep(const GamePlayer &p_player, const GameAction &p_action, size_t p_number,
-                           std::weak_ptr<GameSequenceRep> p_parent)
-    : player(p_player), action(p_action), number(p_number), parent(p_parent)
-  {
-  }
-
-  GameInfoset GetInfoset() const { return (action) ? action->GetInfoset() : nullptr; }
-
-  bool operator<(const GameSequenceRep &other) const
-  {
-    return player < other.player || (player == other.player && action < other.action);
-  }
-  bool operator==(const GameSequenceRep &other) const
-  {
-    return player == other.player && action == other.action;
-  }
-};
-
-using GameSequence = std::shared_ptr<GameSequenceRep>;
-
 class GameSequenceForm {
   friend class BehaviorSupportProfile;