Convert GamePlayerRep::m_strategies from Array to std::vector

Author: tturocy

src/games/game.h

@@ -290,6 +290,7 @@ class GameStrategyRep : public GameObject {
 
 /// A player in a game
 class GamePlayerRep : public GameObject {
+  friend class GameRep;
   friend class GameExplicitRep;
   friend class GameTreeRep;
   friend class GameTableRep;
@@ -311,7 +312,7 @@ class GamePlayerRep : public GameObject {
   int m_number;
   std::string m_label;
   std::vector<GameInfosetRep *> m_infosets;
-  Array<GameStrategyRep *> m_strategies;
+  std::vector<GameStrategyRep *> m_strategies;
 
   GamePlayerRep(GameRep *p_game, int p_id) : m_game(p_game), m_number(p_id) {}
   GamePlayerRep(GameRep *p_game, int p_id, int m_strats);
@@ -553,11 +554,21 @@ class GameRep : public BaseGameRep {
   /// Remove the strategy from the game
   virtual void DeleteStrategy(const GameStrategy &p_strategy) { throw UndefinedException(); }
   /// Returns the number of strategy contingencies in the game
-  virtual int NumStrategyContingencies() const = 0;
+  int NumStrategyContingencies() const
+  {
+    BuildComputedValues();
+    return std::transform_reduce(m_players.begin(), m_players.end(), 0, std::multiplies<>(),
+                                 [](const GamePlayerRep *p) { return p->m_strategies.size(); });
+  }
   /// Returns the total number of actions in the game
   virtual int BehavProfileLength() const = 0;
   /// Returns the total number of strategies in the game
-  virtual int MixedProfileLength() const = 0;
+  int MixedProfileLength() const
+  {
+    BuildComputedValues();
+    return std::transform_reduce(m_players.begin(), m_players.end(), 0, std::plus<>(),
+                                 [](const GamePlayerRep *p) { return p->m_strategies.size(); });
+  }
   //@}
 
   virtual PureStrategyProfile NewPureStrategyProfile() const = 0;
@@ -696,7 +707,7 @@ inline size_t GamePlayerRep::NumStrategies() const
 inline GameStrategy GamePlayerRep::GetStrategy(int st) const
 {
   m_game->BuildComputedValues();
-  return m_strategies[st];
+  return m_strategies.at(st - 1);
 }
 
 //=======================================================================

src/games/gameagg.h

@@ -52,9 +52,6 @@ class GameAGGRep : public GameRep {
   GameStrategy GetStrategy(int p_index) const override;
   /// Returns the total number of actions in the game
   int BehavProfileLength() const override { throw UndefinedException(); }
-  /// Returns the total number of strategies in the game
-  int MixedProfileLength() const override { return aggPtr->getNumActions(); }
-  int NumStrategyContingencies() const override { throw UndefinedException(); }
   //@}
 
   PureStrategyProfile NewPureStrategyProfile() const override;

src/games/gamebagg.cc

@@ -242,15 +242,6 @@ Array<int> GameBAGGRep::NumStrategies() const
   return ns;
 }
 
-int GameBAGGRep::MixedProfileLength() const
-{
-  int res = 0;
-  for (const auto &player : m_players) {
-    res += player->m_strategies.size();
-  }
-  return res;
-}
-
 PureStrategyProfile GameBAGGRep::NewPureStrategyProfile() const
 {
   return PureStrategyProfile(

src/games/gamebagg.h

@@ -57,12 +57,8 @@ class GameBAGGRep : public GameRep {
   Array<int> NumStrategies() const override;
   /// Gets the i'th strategy in the game, numbered globally
   GameStrategy GetStrategy(int p_index) const override { throw UndefinedException(); }
-  /// Returns the number of strategy contingencies in the game
-  int NumStrategyContingencies() const override { throw UndefinedException(); }
   /// Returns the total number of actions in the game
   int BehavProfileLength() const override { throw UndefinedException(); }
-  /// Returns the total number of strategies in the game
-  int MixedProfileLength() const override;
   //@}
 
   PureStrategyProfile NewPureStrategyProfile() const override;

src/games/gameexpl.cc

@@ -102,22 +102,6 @@ GameStrategy GameExplicitRep::GetStrategy(int p_index) const
   throw IndexException();
 }
 
-int GameExplicitRep::NumStrategyContingencies() const
-{
-  BuildComputedValues();
-  return std::accumulate(
-      m_players.begin(), m_players.end(), 1,
-      [](int ncont, const GamePlayerRep *p) { return ncont * p->m_strategies.size(); });
-}
-
-int GameExplicitRep::MixedProfileLength() const
-{
-  BuildComputedValues();
-  return std::accumulate(
-      m_players.begin(), m_players.end(), 0,
-      [](int size, const GamePlayerRep *p) { return size + p->m_strategies.size(); });
-}
-
 //------------------------------------------------------------------------
 //                      GameExplicitRep: Outcomes
 //------------------------------------------------------------------------

src/games/gameexpl.h

@@ -49,10 +49,6 @@ class GameExplicitRep : public GameRep {
   Array<int> NumStrategies() const override;
   /// Gets the i'th strategy in the game, numbered globally
   GameStrategy GetStrategy(int p_index) const override;
-  /// Returns the number of strategy contingencies in the game
-  int NumStrategyContingencies() const override;
-  /// Returns the total number of strategies in the game
-  int MixedProfileLength() const override;
   //@}
 
   /// @name Outcomes