Remove GetActionProb(int) from GameInfoset.

Author: tturocy

src/games/behavmixed.cc

@@ -113,7 +113,7 @@ void MixedBehaviorProfile<T>::RealizationProbs(const MixedStrategyProfile<T> &mp
       }
     }
     else { // n.GetPlayer() == 0
-      prob = T(node->m_infoset->GetActionProb(i));
+      prob = T(node->m_infoset->GetActionProb(node->m_infoset->GetAction(i)));
     }
 
     GameTreeNodeRep *child = node->m_children[i];
@@ -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.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;
 };

src/games/gametree.h

@@ -121,7 +121,6 @@ class GameTreeInfosetRep : public GameInfosetRep {
 
   bool Precedes(GameNode) const override;
 
-  const Number &GetActionProb(int i) const override { return m_probs[i]; }
   const Number &GetActionProb(const GameAction &p_action) const override
   {
     if (p_action->GetInfoset() != GameInfoset(const_cast<GameTreeInfosetRep *>(this))) {

src/gui/analysis.cc

@@ -333,7 +333,7 @@ std::string gbtAnalysisProfileList<T>::GetActionProb(const GameNode &p_node, int
 
   if (p_node->GetPlayer() && p_node->GetPlayer()->IsChance()) {
     GameInfoset infoset = p_node->GetInfoset();
-    return static_cast<std::string>(infoset->GetActionProb(p_act));
+    return static_cast<std::string>(infoset->GetActionProb(infoset->GetAction(p_act)));
   }
 
   if (!p_node->GetPlayer()) {

src/gui/dleditmove.cc

@@ -64,9 +64,11 @@ gbtActionSheet::gbtActionSheet(wxWindow *p_parent, const Gambit::GameInfoset &p_
     SetCellValue(wxSheetCoords(act - 1, 0),
                  wxString(p_infoset->GetAction(act)->GetLabel().c_str(), *wxConvCurrent));
     if (p_infoset->IsChanceInfoset()) {
-      SetCellValue(wxSheetCoords(act - 1, 1),
-                   wxString(static_cast<std::string>(p_infoset->GetActionProb(act)).c_str(),
-                            *wxConvCurrent));
+      SetCellValue(
+          wxSheetCoords(act - 1, 1),
+          wxString(static_cast<std::string>(p_infoset->GetActionProb(p_infoset->GetAction(act)))
+                       .c_str(),
+                   *wxConvCurrent));
     }
   }
   SetDefaultColWidth(150);

src/gui/efglayout.cc

@@ -455,7 +455,8 @@ wxString gbtTreeLayout::CreateBranchLabel(const gbtNodeEntry *p_entry, int p_whi
     case GBT_BRANCH_LABEL_PROBS:
       if (parent->GetPlayer() && parent->GetPlayer()->IsChance()) {
         return {static_cast<std::string>(
-                    parent->GetInfoset()->GetActionProb(p_entry->GetChildNumber()))
+                    parent->GetInfoset()->GetActionProb(
+                        parent->GetInfoset()->GetAction(p_entry->GetChildNumber())))
                     .c_str(),
                 *wxConvCurrent};
       }
@@ -839,8 +840,8 @@ void gbtTreeLayout::GenerateLabels()
 
       Gambit::GameNode parent = entry->GetNode()->GetParent();
       if (parent->GetPlayer()->IsChance()) {
-        entry->SetActionProb(
-            static_cast<double>(parent->GetInfoset()->GetActionProb(entry->GetChildNumber())));
+        entry->SetActionProb(static_cast<double>(parent->GetInfoset()->GetActionProb(
+            parent->GetInfoset()->GetAction(entry->GetChildNumber()))));
       }
       else {
         int profile = m_doc->GetCurrentProfile();

src/pygambit/action.pxi

@@ -100,7 +100,7 @@ class Action:
             )
         py_string = cython.cast(
             string,
-            self.action.deref().GetInfoset().deref().GetActionProb(self.action.deref().GetNumber())
+            self.action.deref().GetInfoset().deref().GetActionProb(self.action)
         )
         if "." in py_string.decode("ascii"):
             return decimal.Decimal(py_string.decode("ascii"))

src/pygambit/gambit.pxd

@@ -119,8 +119,7 @@ cdef extern from "games/game.h":
         c_GameAction GetAction(int) except +IndexError
         c_GameAction InsertAction(c_GameAction) except +ValueError
 
-        c_Number GetActionProb(int) except +IndexError
-        void SetActionProb(int, c_Number) except +IndexError
+        c_Number GetActionProb(c_GameAction) except +IndexError
 
         int NumMembers() except +
         c_GameNode GetMember(int) except +IndexError

src/solvers/enumpoly/behavextend.cc

@@ -188,7 +188,7 @@ bool NashNodeProbabilityPoly(const MixedBehaviorProfile<double> &p_solution,
     GameInfoset last_infoset = last_action->GetInfoset();
 
     if (last_infoset->IsChanceInfoset()) {
-      node_prob *= static_cast<double>(last_infoset->GetActionProb(last_action->GetNumber()));
+      node_prob *= static_cast<double>(last_infoset->GetActionProb(last_action));
     }
     else if (dsupp.HasAction(last_infoset)) {
       if (last_infoset == iset) {
@@ -334,7 +334,7 @@ bool ANFNodeProbabilityPoly(const MixedBehaviorProfile<double> &p_solution,
     GameInfoset last_infoset = last_action->GetInfoset();
 
     if (last_infoset->IsChanceInfoset()) {
-      node_prob *= static_cast<double>(last_infoset->GetActionProb(last_action->GetNumber()));
+      node_prob *= static_cast<double>(last_infoset->GetActionProb(last_action));
     }
     else if (big_supp.HasAction(last_infoset)) {
       if (last_infoset == p_solution.GetGame()->GetPlayer(pl)->GetInfoset(i)) {

src/solvers/logit/logbehav.imp

@@ -70,7 +70,7 @@ template <class T> T LogBehavProfile<T>::GetActionProb(const GameAction &action)
   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 {
     return GetProb(action);
@@ -82,7 +82,7 @@ template <class T> T LogBehavProfile<T>::GetLogActionProb(const GameAction &acti
   if (action->GetInfoset()->GetPlayer()->IsChance()) {
     GameTreeInfosetRep *infoset =
         dynamic_cast<GameTreeInfosetRep *>(action->GetInfoset().operator->());
-    return log(static_cast<T>(infoset->GetActionProb(action->GetNumber())));
+    return log(static_cast<T>(infoset->GetActionProb(action)));
   }
   else {
     return m_logProbs[m_profileIndex.at(action)];