Fix up rebase to latest master.

Author: tturocy

src/games/game.h

@@ -863,9 +863,9 @@ class GameRep : public std::enable_shared_from_this<GameRep> {
   /// Returns the set of information sets in the game
   virtual std::vector<GameInfoset> GetInfosets() const { throw UndefinedException(); }
   /// Returns an array with the number of information sets per personal player
-  virtual Array<int> NumInfosets() const = 0;
+  virtual Array<int> NumInfosets() const { throw UndefinedException(); }
   /// Returns the act'th action in the game (numbered globally)
-  virtual GameAction GetAction(int act) const = 0;
+  virtual GameAction GetAction(int act) const { throw UndefinedException(); }
   /// Sort the information sets for each player in a canonical order
   virtual void SortInfosets() {}
   //@}

src/games/gametree.cc

@@ -145,7 +145,6 @@ void GameTreeRep::DeleteAction(GameAction p_action)
     member->m_children.erase(it);
   }
   ClearComputedValues();
-  Canonicalize();
 }
 
 GameInfoset GameActionRep::GetInfoset() const { return m_infoset->shared_from_this(); }
@@ -193,7 +192,6 @@ void GameTreeRep::SetPlayer(GameInfoset p_infoset, GamePlayer p_player)
   p_player->m_infosets.push_back(p_infoset);
 
   ClearComputedValues();
-  Canonicalize();
 }
 
 bool GameInfosetRep::Precedes(GameNode p_node) const
@@ -237,7 +235,6 @@ GameAction GameTreeRep::InsertAction(GameInfoset p_infoset, GameAction p_action
   m_numNodes += p_infoset->m_members.size();
   // m_numNonterminalNodes stays unchanged when an action is appended to an information set
   ClearComputedValues();
-  Canonicalize();
   return action;
 }
 
@@ -284,7 +281,6 @@ void GameTreeRep::Reveal(GameInfoset p_atInfoset, GamePlayer p_player)
   }
 
   ClearComputedValues();
-  Canonicalize();
 }
 
 //========================================================================
@@ -422,7 +418,6 @@ void GameTreeRep::DeleteParent(GameNode p_node)
 
   oldParent->Invalidate();
   ClearComputedValues();
-  Canonicalize();
 }
 
 void GameTreeRep::DeleteTree(GameNode p_node)
@@ -449,7 +444,6 @@ void GameTreeRep::DeleteTree(GameNode p_node)
   node->m_label = "";
 
   ClearComputedValues();
-  Canonicalize();
 }
 
 void GameTreeRep::CopySubtree(GameNodeRep *dest, GameNodeRep *src, GameNodeRep *stop)
@@ -491,7 +485,6 @@ void GameTreeRep::CopyTree(GameNode p_dest, GameNode p_src)
       CopySubtree(dest_child->get(), src_child->get(), dest);
     }
     ClearComputedValues();
-    Canonicalize();
   }
 }
 
@@ -515,7 +508,6 @@ void GameTreeRep::MoveTree(GameNode p_dest, GameNode p_src)
   dest->m_outcome = nullptr;
 
   ClearComputedValues();
-  Canonicalize();
 }
 
 Game GameTreeRep::CopySubgame(GameNode p_root) const
@@ -547,7 +539,6 @@ void GameTreeRep::SetInfoset(GameNode p_node, GameInfoset p_infoset)
   node->m_infoset = p_infoset.get();
 
   ClearComputedValues();
-  Canonicalize();
 }
 
 GameInfoset GameTreeRep::LeaveInfoset(GameNode p_node)
@@ -578,7 +569,6 @@ GameInfoset GameTreeRep::LeaveInfoset(GameNode p_node)
     (*new_act)->SetLabel((*old_act)->GetLabel());
   }
   ClearComputedValues();
-  Canonicalize();
   return node->m_infoset->shared_from_this();
 }
 
@@ -619,7 +609,6 @@ GameInfoset GameTreeRep::AppendMove(GameNode p_node, GameInfoset p_infoset)
                 });
   m_numNonterminalNodes++;
   ClearComputedValues();
-  Canonicalize();
   return node->m_infoset->shared_from_this();
 }
 
@@ -671,7 +660,6 @@ GameInfoset GameTreeRep::InsertMove(GameNode p_node, GameInfoset p_infoset)
   m_numNodes += newNode->m_infoset->m_actions.size();
   m_numNonterminalNodes++;
   ClearComputedValues();
-  Canonicalize();
   return p_infoset;
 }
 
@@ -845,7 +833,7 @@ void GameTreeRep::BuildComputedValues() const
   if (m_computedValues) {
     return;
   }
-  const_cast<GameTreeRep *>(this)->Canonicalize();
+  const_cast<GameTreeRep *>(this)->SortInfosets();
   for (const auto &player : m_players) {
     std::map<GameInfosetRep *, int> behav;
     std::map<GameNodeRep *, GameNodeRep *> ptr, whichbranch;

src/games/gametree.h

@@ -50,7 +50,6 @@ class GameTreeRep : public GameExplicitRep {
 
   /// @name Managing the representation
   //@{
-  void Canonicalize();
   void BuildComputedValues() const override;
   void BuildConsistentPlays();
   void ClearComputedValues() const;
@@ -114,10 +113,6 @@ class GameTreeRep : public GameExplicitRep {
   GameInfoset GetInfoset(int iset) const override;
   /// Returns the set of information sets in the game
   std::vector<GameInfoset> GetInfosets() const override;
-   /// Returns an array with the number of information sets per personal player
-  Array<int> NumInfosets() const override;
-  /// Returns the act'th action in the game (numbered globally)
-  GameAction GetAction(int act) const override;
   /// Sort the information sets for each player in a canonical order
   void SortInfosets() override;
   //@}