Merge branch 'master' into integrate_llm

# Conflicts:
#	src/games/game.h
#	src/games/gametree.cc
#	src/games/gametree.h

Author: tturocy

src/games/behavmixed.cc

@@ -94,7 +94,7 @@ void MixedBehaviorProfile<T>::RealizationProbs(const MixedStrategyProfile<T> &mp
 {
   T prob;
 
-  for (int i = 1; i <= node->children.size(); i++) {
+  for (int i = 1; i <= node->m_children.size(); i++) {
     if (node->GetPlayer() && !node->GetPlayer()->IsChance()) {
       if (node->GetPlayer() == player) {
         if (actions[node->GetInfoset()->GetNumber()] == i) {
@@ -113,10 +113,10 @@ void MixedBehaviorProfile<T>::RealizationProbs(const MixedStrategyProfile<T> &mp
       }
     }
     else { // n.GetPlayer() == 0
-      prob = T(node->infoset->GetActionProb(i));
+      prob = T(node->m_infoset->GetActionProb(node->m_infoset->GetAction(i)));
     }
 
-    GameTreeNodeRep *child = node->children[i];
+    GameTreeNodeRep *child = node->m_children[i];
 
     map_bvals[child] = prob * map_bvals[node];
     map_nvals[child] += map_bvals[child];
@@ -335,7 +335,7 @@ template <class T> T MixedBehaviorProfile<T>::GetActionProb(const GameAction &ac
   if (action->GetInfoset()->GetPlayer()->IsChance()) {
     GameTreeInfosetRep *infoset =
         dynamic_cast<GameTreeInfosetRep *>(action->GetInfoset().operator->());
-    return static_cast<T>(infoset->GetActionProb(action->GetNumber()));
+    return static_cast<T>(infoset->GetActionProb(action));
   }
   else if (!m_support.Contains(action)) {
     return T(0);

src/games/game.cc

@@ -161,33 +161,33 @@ void GamePlayerRep::MakeReducedStrats(GameTreeNodeRep *n, GameTreeNodeRep *nn)
   }
 
   if (n->NumChildren() > 0) {
-    if (n->infoset->m_player == this) {
-      if (n->infoset->flag == 0) {
+    if (n->m_infoset->m_player == this) {
+      if (n->m_infoset->flag == 0) {
         // we haven't visited this infoset before
-        n->infoset->flag = 1;
+        n->m_infoset->flag = 1;
         for (i = 1; i <= n->NumChildren(); i++) {
-          GameTreeNodeRep *m = n->children[i];
+          GameTreeNodeRep *m = n->m_children[i];
           n->whichbranch = m;
-          n->infoset->whichbranch = i;
+          n->m_infoset->whichbranch = i;
           MakeReducedStrats(m, nn);
         }
-        n->infoset->flag = 0;
+        n->m_infoset->flag = 0;
       }
       else {
         // we have visited this infoset, take same action
-        MakeReducedStrats(n->children[n->infoset->whichbranch], nn);
+        MakeReducedStrats(n->m_children[n->m_infoset->whichbranch], nn);
       }
     }
     else {
       n->ptr = nullptr;
       if (nn != nullptr) {
         n->ptr = nn->m_parent;
       }
-      n->whichbranch = n->children[1];
-      if (n->infoset) {
-        n->infoset->whichbranch = 0;
+      n->whichbranch = n->m_children[1];
+      if (n->m_infoset) {
+        n->m_infoset->whichbranch = 0;
       }
-      MakeReducedStrats(n->children[1], n->children[1]);
+      MakeReducedStrats(n->m_children[1], n->m_children[1]);
     }
   }
   else if (nn) {

src/games/game.h

@@ -208,7 +208,6 @@ class GameInfosetRep : public GameObject {
 
   virtual bool Precedes(GameNode) const = 0;
 
-  virtual const Number &GetActionProb(int i) const = 0;
   virtual const Number &GetActionProb(const GameAction &) const = 0;
   virtual void Reveal(GamePlayer) = 0;
 };
@@ -550,8 +549,6 @@ class GameRep : public BaseGameRep {
   virtual Array<GameInfoset> GetInfosets() const = 0;
   /// Returns an array with the number of information sets per personal player
   virtual Array<int> NumInfosets() const = 0;
-  /// Returns the act'th action in the game (numbered globally)
-  virtual GameAction GetAction(int act) const = 0;
   /// Sort the information sets for each player in a canonical order
   virtual void SortInfosets() {}
   //@}

src/games/gameagg.h

@@ -93,8 +93,6 @@ class GameAGGRep : public GameRep {
   Array<GameInfoset> GetInfosets() const override { throw UndefinedException(); }
   /// Returns an array with the number of information sets per personal player
   Array<int> NumInfosets() const override { throw UndefinedException(); }
-  /// Returns the act'th action in the game (numbered globally)
-  GameAction GetAction(int act) const override { throw UndefinedException(); }
   //@}
 
   /// @name Outcomes

src/games/gamebagg.h

@@ -94,8 +94,6 @@ class GameBAGGRep : public GameRep {
   Array<GameInfoset> GetInfosets() const override { throw UndefinedException(); }
   /// Returns an array with the number of information sets per personal player
   Array<int> NumInfosets() const override { throw UndefinedException(); }
-  /// Returns the act'th action in the game (numbered globally)
-  GameAction GetAction(int act) const override { throw UndefinedException(); }
   //@}
 
   /// @name Outcomes

src/games/gametable.h

@@ -82,8 +82,6 @@ class GameTableRep : public GameExplicitRep {
   Array<GameInfoset> GetInfosets() const override { throw UndefinedException(); }
   /// Returns an array with the number of information sets per personal player
   Array<int> NumInfosets() const override { throw UndefinedException(); }
-  /// Returns the act'th action in the game (numbered globally)
-  GameAction GetAction(int act) const override { throw UndefinedException(); }
   //@}
 
   /// @name Nodes