change m_outcomes from Array to std::vector and move them to GameRep

Author: d-kad

src/games/game.cc

@@ -221,6 +221,16 @@ Array<GameStrategy> GameRep::GetStrategies() const
   return ret;
 }
 
+GameRep::~GameRep()
+{
+  for (auto player : m_players) {
+    player->Invalidate();
+  }
+  for (auto outcome : m_outcomes) {
+    outcome->Invalidate();
+  }
+}
+
 //------------------------------------------------------------------------
 //                     GameRep: Writing data files
 //------------------------------------------------------------------------

src/games/game.h

@@ -420,6 +420,7 @@ class GameRep : public BaseGameRep {
 
 protected:
   std::vector<GamePlayerRep *> m_players;
+  std::vector<GameOutcomeRep *> m_outcomes;
   std::string m_title, m_comment;
   unsigned int m_version{0};
 
@@ -435,7 +436,8 @@ class GameRep : public BaseGameRep {
   /// @name Lifecycle
   //@{
   /// Clean up the game
-  ~GameRep() override = default;
+  virtual ~GameRep();
+
   /// Create a copy of the game, as a new game
   virtual Game Copy() const = 0;
   //@}

src/games/gameagg.h

@@ -39,13 +39,6 @@ class GameAGGRep : public GameRep {
   //@{
   /// Constructor
   explicit GameAGGRep(std::shared_ptr<agg::AGG>);
-  /// Destructor
-  ~GameAGGRep() override
-  {
-    for (auto player : m_players) {
-      player->Invalidate();
-    }
-  }
   /// Create a copy of the game, as a new game
   Game Copy() const override;
   //@}

src/games/gameexpl.cc

@@ -32,20 +32,6 @@ namespace Gambit {
 //                       class GameExplicitRep
 //========================================================================
 
-//------------------------------------------------------------------------
-//                     GameExplicitRep: Lifecycle
-//------------------------------------------------------------------------
-
-GameExplicitRep::~GameExplicitRep()
-{
-  for (auto player : m_players) {
-    player->Invalidate();
-  }
-  for (auto outcome : m_outcomes) {
-    outcome->Invalidate();
-  }
-}
-
 //------------------------------------------------------------------------
 //                  GameExplicitRep: General data access
 //------------------------------------------------------------------------

src/games/gameexpl.h

@@ -30,16 +30,7 @@ namespace Gambit {
 class GameExplicitRep : public GameRep {
   template <class T> friend class MixedStrategyProfile;
 
-protected:
-  Array<GameOutcomeRep *> m_outcomes;
-
 public:
-  /// @name Lifecycle
-  //@{
-  /// Destructor
-  ~GameExplicitRep() override;
-  //@}
-
   /// @name General data access
   //@{
   /// Returns the smallest payoff to any player in any outcome of the game
@@ -69,7 +60,7 @@ class GameExplicitRep : public GameRep {
   /// Returns the number of outcomes defined in the game
   size_t NumOutcomes() const override { return m_outcomes.size(); }
   /// Returns the index'th outcome defined in the game
-  GameOutcome GetOutcome(int index) const override { return m_outcomes[index]; }
+  GameOutcome GetOutcome(int index) const override { return m_outcomes.at(index - 1); }
   /// Creates a new outcome in the game
   GameOutcome NewOutcome() override;
 

src/games/gametable.cc

@@ -295,10 +295,10 @@ GameTableRep::GameTableRep(const Array<int> &dim, bool p_sparseOutcomes /* = fal
     std::fill(m_results.begin(), m_results.end(), nullptr);
   }
   else {
-    m_outcomes = Array<GameOutcomeRep *>(m_results.size());
+    m_outcomes = std::vector<GameOutcomeRep *>(m_results.size());
     std::generate(m_outcomes.begin(), m_outcomes.end(),
                   [this, outc = 1]() mutable { return new GameOutcomeRep(this, outc++); });
-    m_results = m_outcomes;
+    std::copy(m_outcomes.begin(), m_outcomes.end(), m_results.begin());
   }
 }