Added GetContingencies

Author: StephenPasteris

src/games/behavspt.cc

@@ -299,4 +299,9 @@ InfosetsWrapper BehaviorSupportProfile::GetInfosets() const {
   return InfosetsWrapper(infosets);
 }
 
+ContingenciesWrapper BehaviorSupportProfile::GetContingencies() const {
+  auto contingencies = GetSequenceForm()->GetContingencies();
+  return ContingenciesWrapper(contingencies);
+}
+
 } // end namespace Gambit

src/games/behavspt.h

@@ -34,6 +34,7 @@ struct GameSequenceRep;
 class SequencesWrapper;
 class PlayerSequencesWrapper;
 class InfosetsWrapper;
+class ContingenciesWrapper;
 
 /// This class represents a subset of the actions in an extensive game.
 /// It is enforced that each player has at least one action at each
@@ -155,6 +156,7 @@ class BehaviorSupportProfile {
   GameRep::Players GetPlayers() const {return GetGame()->GetPlayers();}
   MixedBehaviorProfile<double> ToMixedBehaviorProfile(const std::map<std::shared_ptr<GameSequenceRep>, double> &) const;
   InfosetsWrapper GetInfosets() const;
+  ContingenciesWrapper GetContingencies() const;
 
 };
 

src/games/gameseq.h

@@ -336,6 +336,19 @@ class InfosetsWrapper {
 };
 
 
+class ContingenciesWrapper {
+public:
+  explicit ContingenciesWrapper(const GameSequenceForm::Contingencies& contingencies)
+      : m_contingencies(contingencies) {}
+
+  auto begin() { return m_contingencies.begin(); }
+  auto end() { return m_contingencies.end(); }
+
+private:
+  GameSequenceForm::Contingencies m_contingencies;
+};
+
+
 } // end namespace Gambit
 
 #endif // GAMESEQ_H

src/solvers/enumpoly/efgpoly.cc

@@ -100,7 +100,7 @@ Polynomial<double> GetPayoff(ProblemData &p_data, const GamePlayer &p_player)
 {
   Polynomial<double> equation(p_data.space);
 
-  for (auto profile : p_data.m_support.GetSequenceForm()->GetContingencies()) {
+  for (auto profile : p_data.m_support.GetContingencies()) {
     auto pay = p_data.m_support.GetPayoff(profile, p_player);
     if (pay != Rational(0)) {
       Polynomial<double> term(p_data.space, double(pay));