Remove some unneeded or unused classes and functions.

This removes the DVector container class, which is no longer needed now that we have re-implemented MixedBehaviorProfile. A follow-on from this is that we can remove the NumActions() and NumMembers() functions on games and behavior supports, as those were only providing the shapes to create the underlying DVectors.
gambitproject · Nov 21, 2024 · a6fcf5a · a6fcf5a
1 parent c524945
commit a6fcf5a
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 314 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -251,8 +251,6 @@ core_SOURCES = \
 	src/core/vector.imp \
 	src/core/pvector.h \
 	src/core/pvector.imp \
-	src/core/dvector.h \
-	src/core/dvector.imp \
 	src/core/recarray.h \
 	src/core/matrix.h \
 	src/core/matrix.imp \
@@ -264,7 +262,6 @@ core_SOURCES = \
 	src/core/rational.h \
 	src/core/vector.cc \
 	src/core/pvector.cc \
-	src/core/dvector.cc \
 	src/core/matrix.cc \
 	src/core/sqmatrix.cc \
 	src/core/function.cc \

diff --git a/src/core/dvector.cc b/src/core/dvector.cc
diff --git a/src/core/dvector.h b/src/core/dvector.h
diff --git a/src/core/dvector.imp b/src/core/dvector.imp
diff --git a/src/games/behavmixed.cc b/src/games/behavmixed.cc
@@ -35,7 +35,7 @@ namespace Gambit {
 
 template <class T>
 MixedBehaviorProfile<T>::MixedBehaviorProfile(const Game &p_game)
-  : m_probs(p_game->NumActions()), m_support(BehaviorSupportProfile(p_game)),
+  : m_probs(p_game->BehavProfileLength()), m_support(BehaviorSupportProfile(p_game)),
     m_gameversion(p_game->GetVersion())
 {
   int index = 1;
@@ -51,7 +51,7 @@ MixedBehaviorProfile<T>::MixedBehaviorProfile(const Game &p_game)
 
 template <class T>
 MixedBehaviorProfile<T>::MixedBehaviorProfile(const BehaviorSupportProfile &p_support)
-  : m_probs(p_support.NumActions()), m_support(p_support),
+  : m_probs(p_support.BehaviorProfileLength()), m_support(p_support),
     m_gameversion(p_support.GetGame()->GetVersion())
 {
   int index = 1;
@@ -127,20 +127,19 @@ void MixedBehaviorProfile<T>::RealizationProbs(const MixedStrategyProfile<T> &mp
 
 template <class T>
 MixedBehaviorProfile<T>::MixedBehaviorProfile(const MixedStrategyProfile<T> &p_profile)
-  : m_probs(p_profile.GetGame()->NumActions()), m_support(p_profile.GetGame()),
+  : m_probs(p_profile.GetGame()->BehavProfileLength()), m_support(p_profile.GetGame()),
     m_gameversion(p_profile.GetGame()->GetVersion())
 {
   int index = 1;
   for (const auto &player : p_profile.GetGame()->GetPlayers()) {
     for (const auto &infoset : player->GetInfosets()) {
       for (const auto &action : infoset->GetActions()) {
-        m_profileIndex[action] = index++;
+        m_profileIndex[action] = index;
+        m_probs[index++] = static_cast<T>(0);
       }
     }
   }
 
-  static_cast<Vector<T> &>(m_probs) = T(0);
-
   GameTreeNodeRep *root =
       dynamic_cast<GameTreeNodeRep *>(m_support.GetGame()->GetRoot().operator->());
 
@@ -184,16 +183,6 @@ MixedBehaviorProfile<T>::operator=(const MixedBehaviorProfile<T> &p_profile)
   return *this;
 }
 
-//========================================================================
-//               MixedBehaviorProfile<T>: Operator overloading
-//========================================================================
-
-template <class T>
-bool MixedBehaviorProfile<T>::operator==(const MixedBehaviorProfile<T> &p_profile) const
-{
-  return (m_support == p_profile.m_support && (DVector<T> &)*this == (DVector<T> &)p_profile);
-}
-
 //========================================================================
 //              MixedBehaviorProfile<T>: General data access
 //========================================================================

diff --git a/src/games/behavmixed.h b/src/games/behavmixed.h
@@ -33,7 +33,7 @@ namespace Gambit {
 ///
 template <class T> class MixedBehaviorProfile {
 protected:
-  DVector<T> m_probs;
+  Vector<T> m_probs;
   BehaviorSupportProfile m_support;
   /// The index into the action profile for a action (-1 if not in support)
   std::map<GameAction, int> m_profileIndex;
@@ -101,11 +101,14 @@ template <class T> class MixedBehaviorProfile {
 
   /// @name Operator overloading
   //@{
-  bool operator==(const MixedBehaviorProfile<T> &) const;
-  bool operator!=(const MixedBehaviorProfile<T> &x) const { return !(*this == x); }
-
-  bool operator==(const DVector<T> &x) const { return m_probs == x; }
-  bool operator!=(const DVector<T> &x) const { return m_probs != x; }
+  bool operator==(const MixedBehaviorProfile<T> &p_profile) const
+  {
+    return (m_support == p_profile.m_support && m_probs == p_profile.m_probs);
+  }
+  bool operator!=(const MixedBehaviorProfile<T> &p_profile) const
+  {
+    return (m_support != p_profile.m_support || m_probs != p_profile.m_probs);
+  }
 
   const T &operator[](const GameAction &p_action) const
   {

diff --git a/src/games/behavspt.cc b/src/games/behavspt.cc
@@ -54,19 +54,6 @@ BehaviorSupportProfile::BehaviorSupportProfile(const Game &p_efg) : m_efg(p_efg)
 //                 BehaviorSupportProfile: General information
 //========================================================================
 
-PVector<int> BehaviorSupportProfile::NumActions() const
-{
-  PVector<int> answer(m_efg->NumInfosets());
-  for (const auto &player : m_efg->GetPlayers()) {
-    for (const auto &infoset : player->GetInfosets()) {
-      answer(player->GetNumber(), infoset->GetNumber()) =
-          static_cast<int>(m_actions.at(infoset).size());
-    }
-  }
-
-  return answer;
-}
-
 size_t BehaviorSupportProfile::BehaviorProfileLength() const
 {
   size_t answer = 0;

diff --git a/src/games/behavspt.h b/src/games/behavspt.h
@@ -97,8 +97,6 @@ class BehaviorSupportProfile {
   /// Returns the game on which the support is defined.
   Game GetGame() const { return m_efg; }
 
-  /// Returns the number of actions in the support for all information sets
-  PVector<int> NumActions() const;
   /// Returns the total number of actions in the support
   size_t BehaviorProfileLength() const;
 

diff --git a/src/games/game.h b/src/games/game.h
@@ -28,7 +28,7 @@
 #include <set>
 #include <random>
 
-#include "core/dvector.h"
+#include "core/pvector.h"
 #include "number.h"
 #include "gameobject.h"
 
@@ -485,10 +485,6 @@ class GameRep : public BaseGameRep {
 
   /// @name Dimensions of the game
   //@{
-  /// The number of actions in each information set
-  virtual PVector<int> NumActions() const = 0;
-  /// The number of members in each information set
-  virtual PVector<int> NumMembers() const = 0;
   /// The number of strategies for each player
   virtual Array<int> NumStrategies() const = 0;
   /// Gets the i'th strategy in the game, numbered globally

diff --git a/src/games/gameagg.h b/src/games/gameagg.h
@@ -54,10 +54,6 @@ class GameAGGRep : public GameRep {
   std::shared_ptr<agg::AGG> GetUnderlyingAGG() const { return aggPtr; }
   /// @name Dimensions of the game
   //@{
-  /// The number of actions in each information set
-  PVector<int> NumActions() const override { throw UndefinedException(); }
-  /// The number of members in each information set
-  PVector<int> NumMembers() const override { throw UndefinedException(); }
   /// The number of strategies for each player
   Array<int> NumStrategies() const override;
   /// Gets the i'th strategy in the game, numbered globally

diff --git a/src/games/gamebagg.h b/src/games/gamebagg.h
@@ -54,10 +54,6 @@ class GameBAGGRep : public GameRep {
 
   /// @name Dimensions of the game
   //@{
-  /// The number of actions in each information set
-  PVector<int> NumActions() const override { throw UndefinedException(); }
-  /// The number of members in each information set
-  PVector<int> NumMembers() const override { throw UndefinedException(); }
   /// The number of strategies for each player
   Array<int> NumStrategies() const override;
   /// Gets the i'th strategy in the game, numbered globally