Rename to BehaviorContingencies

gambitproject · Nov 7, 2024 · 373b652 · 373b652
1 parent 116891f
commit 373b652
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/games/behavpure.cc b/src/games/behavpure.cc
@@ -110,11 +110,11 @@ MixedBehaviorProfile<Rational> PureBehaviorProfile::ToMixedBehaviorProfile() con
 }
 
 //========================================================================
-//                    class BehaviorProfileIterator
+//                    class BehaviorContingencies
 //========================================================================
 
-BehaviorProfileIterator::BehaviorProfileIterator(const BehaviorSupportProfile &p_support,
-                                                 const std::list<GameAction> &p_frozen)
+BehaviorContingencies::BehaviorContingencies(const BehaviorSupportProfile &p_support,
+                                             const std::list<GameAction> &p_frozen)
   : m_atEnd(false), m_support(p_support), m_profile(p_support.GetGame()), m_frozen(p_frozen)
 {
   for (auto player : m_support.GetGame()->GetPlayers()) {
@@ -136,7 +136,7 @@ BehaviorProfileIterator::BehaviorProfileIterator(const BehaviorSupportProfile &p
   }
 }
 
-void BehaviorProfileIterator::operator++()
+void BehaviorContingencies::operator++()
 {
   for (auto infoset = m_activeInfosets.crbegin(); infoset != m_activeInfosets.crend(); ++infoset) {
     if (m_currentBehav.at(*infoset) < m_support.NumActions(*infoset)) {

diff --git a/src/games/behavpure.h b/src/games/behavpure.h
@@ -79,7 +79,7 @@ template <> inline std::string PureBehaviorProfile::GetPayoff(const GamePlayer &
   return lexical_cast<std::string>(GetPayoff<Rational>(m_efg->GetRoot(), p_player));
 }
 
-class BehaviorProfileIterator {
+class BehaviorContingencies {
 private:
   bool m_atEnd;
   BehaviorSupportProfile m_support;
@@ -92,7 +92,7 @@ class BehaviorProfileIterator {
   /// @name Lifecycle
   //@{
   /// Construct a new iterator on the support, holding the action fixed
-  BehaviorProfileIterator(const BehaviorSupportProfile &, const std::list<GameAction> & = {});
+  BehaviorContingencies(const BehaviorSupportProfile &, const std::list<GameAction> & = {});
   //@}
 
   /// @name Iteration and data access

diff --git a/src/games/behavspt.cc b/src/games/behavspt.cc
@@ -309,7 +309,7 @@ bool BehaviorSupportProfile::Dominates(const GameAction &a, const GameAction &b,
   bool equal = true;
 
   if (!p_conditional) {
-    for (BehaviorProfileIterator iter(*this, {a}); !iter.AtEnd(); iter++) {
+    for (BehaviorContingencies iter(*this, {a}); !iter.AtEnd(); iter++) {
       auto ap = (*iter).GetPayoff<Rational>(a);
       auto bp = (*iter).GetPayoff<Rational>(b);
 

diff --git a/src/solvers/enumpure/enumpure.h b/src/solvers/enumpure/enumpure.h
@@ -89,7 +89,7 @@ inline List<MixedBehaviorProfile<Rational>> EnumPureAgentSolver::Solve(const Gam
 {
   List<MixedBehaviorProfile<Rational>> solutions;
   BehaviorSupportProfile support(p_game);
-  for (auto citer = BehaviorProfileIterator(BehaviorSupportProfile(p_game)); !citer.AtEnd();
+  for (auto citer = BehaviorContingencies(BehaviorSupportProfile(p_game)); !citer.AtEnd();
        citer++) {
     if ((*citer).IsAgentNash()) {
       MixedBehaviorProfile<Rational> profile = (*citer).ToMixedBehaviorProfile();