Make GameRep::BuildComputedValues logically const

Author: tturocy

src/games/game.h

@@ -641,7 +641,7 @@ class GameRep : public BaseGameRep {
   //@}
 
   /// Build any computed values anew
-  virtual void BuildComputedValues() {}
+  virtual void BuildComputedValues() const {}
 };
 
 //=======================================================================

src/games/gameexpl.cc

@@ -94,7 +94,7 @@ Rational GameExplicitRep::GetMaxPayoff(const GamePlayer &p_player) const
 
 Array<int> GameExplicitRep::NumStrategies() const
 {
-  const_cast<GameExplicitRep *>(this)->BuildComputedValues();
+  BuildComputedValues();
   Array<int> dim;
   for (const auto &player : m_players) {
     dim.push_back(player->m_strategies.size());
@@ -104,7 +104,7 @@ Array<int> GameExplicitRep::NumStrategies() const
 
 GameStrategy GameExplicitRep::GetStrategy(int p_index) const
 {
-  const_cast<GameExplicitRep *>(this)->BuildComputedValues();
+  BuildComputedValues();
   int i = 1;
   for (const auto &player : m_players) {
     for (const auto &strategy : player->m_strategies) {
@@ -118,15 +118,15 @@ GameStrategy GameExplicitRep::GetStrategy(int p_index) const
 
 int GameExplicitRep::NumStrategyContingencies() const
 {
-  const_cast<GameExplicitRep *>(this)->BuildComputedValues();
+  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
 {
-  const_cast<GameExplicitRep *>(this)->BuildComputedValues();
+  BuildComputedValues();
   return std::accumulate(
       m_players.begin(), m_players.end(), 0,
       [](int size, const GamePlayerRep *p) { return size + p->m_strategies.size(); });

src/games/gametree.cc

@@ -884,12 +884,12 @@ void GameTreeRep::ClearComputedValues() const
   m_computedValues = false;
 }
 
-void GameTreeRep::BuildComputedValues()
+void GameTreeRep::BuildComputedValues() const
 {
   if (m_computedValues) {
     return;
   }
-  Canonicalize();
+  const_cast<GameTreeRep *>(this)->Canonicalize();
   for (const auto &player : m_players) {
     player->MakeReducedStrats(m_root, nullptr);
   }
@@ -959,8 +959,7 @@ void GameTreeRep::WriteEfgFile(std::ostream &p_file, const GameNode &p_subtree /
 
 void GameTreeRep::WriteNfgFile(std::ostream &p_file) const
 {
-  // FIXME: Building computed values is logically const.
-  const_cast<GameTreeRep *>(this)->BuildComputedValues();
+  BuildComputedValues();
   GameRep::WriteNfgFile(p_file);
 }
 

src/games/gametree.h

@@ -48,7 +48,7 @@ class GameTreeRep : public GameExplicitRep {
   /// @name Managing the representation
   //@{
   void Canonicalize();
-  void BuildComputedValues() override;
+  void BuildComputedValues() const override;
   void ClearComputedValues() const;
 
   /// Removes the node from the information set, invalidating if emptied