Remove unused functionality from BehaviorContingencies

Author: tturocy

src/games/behavpure.cc

@@ -98,30 +98,16 @@ MixedBehaviorProfile<Rational> PureBehaviorProfile::ToMixedBehaviorProfile() con
 //                    class BehaviorContingencies
 //========================================================================
 
-BehaviorContingencies::BehaviorContingencies(const BehaviorSupportProfile &p_support,
-                                             const std::set<GameInfoset> &p_reachable,
-                                             const std::vector<GameAction> &p_frozen)
-  : m_support(p_support), m_frozen(p_frozen)
+BehaviorContingencies::BehaviorContingencies(const BehaviorSupportProfile &p_support)
+  : m_support(p_support)
 {
-  if (!p_reachable.empty()) {
-    for (const auto &infoset : p_reachable) {
-      m_activeInfosets.push_back(infoset);
-    }
-  }
-  else {
-    for (const auto &player : m_support.GetGame()->GetPlayers()) {
-      for (const auto &infoset : player->GetInfosets()) {
-        if (p_support.IsReachable(infoset)) {
-          m_activeInfosets.push_back(infoset);
-        }
+  for (const auto &player : m_support.GetGame()->GetPlayers()) {
+    for (const auto &infoset : player->GetInfosets()) {
+      if (p_support.IsReachable(infoset)) {
+        m_reachableInfosets.push_back(infoset);
       }
     }
   }
-  for (const auto &action : m_frozen) {
-    m_activeInfosets.erase(std::find_if(
-        m_activeInfosets.begin(), m_activeInfosets.end(),
-        [action](const GameInfoset &infoset) { return infoset == action->GetInfoset(); }));
-  }
 }
 
 BehaviorContingencies::iterator::iterator(BehaviorContingencies *p_cont, bool p_end)
@@ -136,15 +122,12 @@ BehaviorContingencies::iterator::iterator(BehaviorContingencies *p_cont, bool p_
       m_profile.SetAction(*m_currentBehav[infoset]);
     }
   }
-  for (const auto &action : m_cont->m_frozen) {
-    m_profile.SetAction(action);
-  }
 }
 
 BehaviorContingencies::iterator &BehaviorContingencies::iterator::operator++()
 {
-  for (auto infoset = m_cont->m_activeInfosets.crbegin();
-       infoset != m_cont->m_activeInfosets.crend(); ++infoset) {
+  for (auto infoset = m_cont->m_reachableInfosets.crbegin();
+       infoset != m_cont->m_reachableInfosets.crend(); ++infoset) {
     ++m_currentBehav[*infoset];
     if (m_currentBehav.at(*infoset) != m_cont->m_support.GetActions(*infoset).end()) {
       m_profile.SetAction(*m_currentBehav[*infoset]);

src/games/behavpure.h

@@ -32,7 +32,6 @@ namespace Gambit {
 /// It specifies exactly one strategy for each information set in the
 /// game.
 class PureBehaviorProfile {
-private:
   Game m_efg;
   std::map<GameInfoset, GameAction> m_profile;
 
@@ -86,14 +85,11 @@ template <> inline std::string PureBehaviorProfile::GetPayoff(const GamePlayer &
 }
 
 class BehaviorContingencies {
-private:
   BehaviorSupportProfile m_support;
-  std::vector<GameAction> m_frozen;
-  std::list<GameInfoset> m_activeInfosets;
+  std::list<GameInfoset> m_reachableInfosets;
 
 public:
   class iterator {
-  private:
     BehaviorContingencies *m_cont;
     bool m_atEnd;
     std::map<GameInfoset, BehaviorSupportProfile::Support::const_iterator> m_currentBehav;
@@ -127,10 +123,8 @@ class BehaviorContingencies {
   };
   /// @name Lifecycle
   //@{
-  /// Construct a new iterator on the support, holding the listed actions fixed
-  explicit BehaviorContingencies(const BehaviorSupportProfile &,
-                                 const std::set<GameInfoset> &p_active = {},
-                                 const std::vector<GameAction> &p_frozen = {});
+  /// Construct a new iterator on the support
+  explicit BehaviorContingencies(const BehaviorSupportProfile &);
   //@}
   iterator begin() { return {this, false}; }
   iterator end() { return {this, true}; }

src/games/behavspt.cc

@@ -104,31 +104,6 @@ std::list<GameInfoset> BehaviorSupportProfile::GetInfosets(const GamePlayer &p_p
   return answer;
 }
 
-namespace {
-
-void ReachableInfosets(const BehaviorSupportProfile &p_support, const GameNode &p_node,
-                       std::set<GameInfoset> &p_reached)
-{
-  if (p_node->IsTerminal()) {
-    return;
-  }
-
-  const GameInfoset infoset = p_node->GetInfoset();
-  if (!infoset->GetPlayer()->IsChance()) {
-    p_reached.insert(infoset);
-    for (const auto &action : p_support.GetActions(infoset)) {
-      ReachableInfosets(p_support, p_node->GetChild(action), p_reached);
-    }
-  }
-  else {
-    for (const auto &child : p_node->GetChildren()) {
-      ReachableInfosets(p_support, child, p_reached);
-    }
-  }
-}
-
-} // end anonymous namespace
-
 bool BehaviorSupportProfile::HasReachableMembers(const GameInfoset &p_infoset) const
 {
   const auto &members = p_infoset->GetMembers();