Ensure ordering whenever we create a profile.

Author: tturocy

src/games/behavmixed.cc

@@ -37,6 +37,7 @@ MixedBehaviorProfile<T>::MixedBehaviorProfile(const Game &p_game)
   : m_probs(p_game->BehavProfileLength()), m_support(BehaviorSupportProfile(p_game)),
     m_gameversion(p_game->GetVersion())
 {
+  p_game->EnsureInfosetOrdering();
   int index = 1;
   for (const auto &infoset : p_game->GetInfosets()) {
     for (const auto &action : infoset->GetActions()) {
@@ -51,6 +52,7 @@ MixedBehaviorProfile<T>::MixedBehaviorProfile(const BehaviorSupportProfile &p_su
   : m_probs(p_support.BehaviorProfileLength()), m_support(p_support),
     m_gameversion(p_support.GetGame()->GetVersion())
 {
+  m_support.GetGame()->EnsureInfosetOrdering();
   int index = 1;
   for (const auto &infoset : p_support.GetGame()->GetInfosets()) {
     for (const auto &action : infoset->GetActions()) {
@@ -126,6 +128,7 @@ MixedBehaviorProfile<T>::MixedBehaviorProfile(const MixedStrategyProfile<T> &p_p
   : m_probs(p_profile.GetGame()->BehavProfileLength()), m_support(p_profile.GetGame()),
     m_gameversion(p_profile.GetGame()->GetVersion())
 {
+  m_support.GetGame()->EnsureInfosetOrdering();
   int index = 1;
   for (const auto &infoset : p_profile.GetGame()->GetInfosets()) {
     for (const auto &action : infoset->GetActions()) {

src/games/gametree.cc

@@ -916,7 +916,7 @@ void GameTreeRep::BuildComputedValues() const
   if (m_computedValues) {
     return;
   }
-  EnsureNodeOrdering();
+  EnsureInfosetOrdering();
   for (const auto &player : m_players) {
     std::map<GameInfosetRep *, int> behav;
     std::map<GameNodeRep *, GameNodeRep *> ptr, whichbranch;
@@ -1354,6 +1354,7 @@ MixedStrategyProfile<double> GameTreeRep::NewMixedStrategyProfile(double) const
   if (!IsPerfectRecall()) {
     throw UndefinedException("Mixed strategies not supported for games with imperfect recall.");
   }
+  EnsureInfosetOrdering();
   return StrategySupportProfile(std::const_pointer_cast<GameRep>(shared_from_this()))
       .NewMixedStrategyProfile<double>();
 }
@@ -1363,6 +1364,7 @@ MixedStrategyProfile<Rational> GameTreeRep::NewMixedStrategyProfile(const Ration
   if (!IsPerfectRecall()) {
     throw UndefinedException("Mixed strategies not supported for games with imperfect recall.");
   }
+  EnsureInfosetOrdering();
   return StrategySupportProfile(std::const_pointer_cast<GameRep>(shared_from_this()))
       .NewMixedStrategyProfile<Rational>();
 }
@@ -1373,6 +1375,7 @@ GameTreeRep::NewMixedStrategyProfile(double, const StrategySupportProfile &spt)
   if (!IsPerfectRecall()) {
     throw UndefinedException("Mixed strategies not supported for games with imperfect recall.");
   }
+  EnsureInfosetOrdering();
   return MixedStrategyProfile<double>(std::make_unique<TreeMixedStrategyProfileRep<double>>(spt));
 }
 
@@ -1382,6 +1385,7 @@ GameTreeRep::NewMixedStrategyProfile(const Rational &, const StrategySupportProf
   if (!IsPerfectRecall()) {
     throw UndefinedException("Mixed strategies not supported for games with imperfect recall.");
   }
+  EnsureInfosetOrdering();
   return MixedStrategyProfile<Rational>(
       std::make_unique<TreeMixedStrategyProfileRep<Rational>>(spt));
 }
@@ -1411,6 +1415,7 @@ class TreePureStrategyProfileRep : public PureStrategyProfileRep {
 
 PureStrategyProfile GameTreeRep::NewPureStrategyProfile() const
 {
+  EnsureInfosetOrdering();
   return PureStrategyProfile(std::make_shared<TreePureStrategyProfileRep>(
       std::const_pointer_cast<GameRep>(shared_from_this())));
 }