More sign stuff

Author: tturocy

src/games/game.cc

@@ -153,7 +153,6 @@ void GamePlayerRep::MakeStrategy()
 
 void GamePlayerRep::MakeReducedStrats(GameTreeNodeRep *n, GameTreeNodeRep *nn)
 {
-  int i;
   GameTreeNodeRep *m, *mm;
 
   if (!n->GetParent()) {
@@ -165,7 +164,7 @@ void GamePlayerRep::MakeReducedStrats(GameTreeNodeRep *n, GameTreeNodeRep *nn)
       if (n->m_infoset->flag == 0) {
         // we haven't visited this infoset before
         n->m_infoset->flag = 1;
-        for (i = 1; i <= n->NumChildren(); i++) {
+        for (size_t i = 1; i <= n->NumChildren(); i++) {
           GameTreeNodeRep *m = n->m_children[i];
           n->whichbranch = m;
           n->m_infoset->whichbranch = i;

src/games/game.h

@@ -345,7 +345,7 @@ class GameNodeRep : public GameObject {
 
   virtual int GetNumber() const = 0;
 
-  virtual int NumChildren() const = 0;
+  virtual size_t NumChildren() const = 0;
   virtual GameNode GetChild(int i) const = 0;
   virtual GameNode GetChild(const GameAction &) const = 0;
   virtual Array<GameNode> GetChildren() const = 0;
@@ -566,7 +566,7 @@ class GameRep : public BaseGameRep {
   /// Returns the root node of the game
   virtual GameNode GetRoot() const = 0;
   /// Returns the number of nodes in the game
-  virtual int NumNodes() const = 0;
+  virtual size_t NumNodes() const = 0;
   //@}
 
   /// @name Modification

src/games/gameagg.h

@@ -112,7 +112,7 @@ class GameAGGRep : public GameRep {
   /// Returns the root node of the game
   GameNode GetRoot() const override { throw UndefinedException(); }
   /// Returns the number of nodes in the game
-  int NumNodes() const override { throw UndefinedException(); }
+  size_t NumNodes() const override { throw UndefinedException(); }
   //@}
 
   /// @name General data access

src/games/gamebagg.h

@@ -113,7 +113,7 @@ class GameBAGGRep : public GameRep {
   /// Returns the root node of the game
   GameNode GetRoot() const override { throw UndefinedException(); }
   /// Returns the number of nodes in the game
-  int NumNodes() const override { throw UndefinedException(); }
+  size_t NumNodes() const override { throw UndefinedException(); }
   //@}
 
   /// @name General data access

src/games/gametable.h

@@ -89,7 +89,7 @@ class GameTableRep : public GameExplicitRep {
   /// Returns the root node of the game
   GameNode GetRoot() const override { throw UndefinedException(); }
   /// Returns the number of nodes in the game
-  int NumNodes() const override { throw UndefinedException(); }
+  size_t NumNodes() const override { throw UndefinedException(); }
   //@}
 
   /// @name Outcomes

src/games/gametree.cc

@@ -699,7 +699,7 @@ Rational SubtreeSum(const GameNode &p_node)
 
   if (p_node->NumChildren() > 0) {
     sum = SubtreeSum(p_node->GetChild(1));
-    for (int i = 2; i <= p_node->NumChildren(); i++) {
+    for (size_t i = 2; i <= p_node->NumChildren(); i++) {
       if (SubtreeSum(p_node->GetChild(i)) != sum) {
         throw NotZeroSumException();
       }
@@ -1020,17 +1020,17 @@ void GameTreeRep::DeleteOutcome(const GameOutcome &p_outcome)
 //------------------------------------------------------------------------
 
 namespace {
-int CountNodes(GameNode p_node)
+size_t CountNodes(GameNode p_node)
 {
-  int num = 1;
-  for (int i = 1; i <= p_node->NumChildren(); num += CountNodes(p_node->GetChild(i++)))
+  size_t num = 1;
+  for (size_t i = 1; i <= p_node->NumChildren(); num += CountNodes(p_node->GetChild(i++)))
     ;
   return num;
 }
 
 } // end anonymous namespace
 
-int GameTreeRep::NumNodes() const { return CountNodes(m_root); }
+size_t GameTreeRep::NumNodes() const { return CountNodes(m_root); }
 
 //------------------------------------------------------------------------
 //                       GameTreeRep: Modification

src/games/gametree.h

@@ -162,7 +162,7 @@ class GameTreeNodeRep : public GameNodeRep {
   void SetLabel(const std::string &p_label) override { m_label = p_label; }
 
   int GetNumber() const override { return m_number; }
-  int NumChildren() const override { return m_children.size(); }
+  size_t NumChildren() const override { return m_children.size(); }
   GameNode GetChild(int i) const override { return m_children[i]; }
   GameNode GetChild(const GameAction &p_action) const override
   {
@@ -265,7 +265,7 @@ class GameTreeRep : public GameExplicitRep {
   /// Returns the root node of the game
   GameNode GetRoot() const override { return m_root; }
   /// Returns the number of nodes in the game
-  int NumNodes() const override;
+  size_t NumNodes() const override;
   //@}
 
   void DeleteOutcome(const GameOutcome &) override;

src/gui/dleditmove.cc

@@ -60,7 +60,7 @@ gbtActionSheet::gbtActionSheet(wxWindow *p_parent, const Gambit::GameInfoset &p_
     SetColLabelValue(1, wxT("Probability"));
   }
 
-  for (int act = 1; act <= p_infoset->NumActions(); act++) {
+  for (size_t act = 1; act <= p_infoset->NumActions(); act++) {
     SetCellValue(wxSheetCoords(act - 1, 0),
                  wxString(p_infoset->GetAction(act)->GetLabel().c_str(), *wxConvCurrent));
     if (p_infoset->IsChanceInfoset()) {
@@ -214,7 +214,7 @@ void gbtEditMoveDialog::OnOK(wxCommandEvent &p_event)
   }
   Array<Number> probs = m_actionSheet->GetActionProbs();
   Rational sum(0);
-  for (int act = 1; act <= m_infoset->NumActions(); act++) {
+  for (size_t act = 1; act <= m_infoset->NumActions(); act++) {
     auto prob = static_cast<Rational>(probs[act]);
     if (prob < Gambit::Rational(0)) {
       wxMessageBox("Action probabilities must be nonnegative numbers.", "Error");

src/gui/dlefgreveal.cc

@@ -28,6 +28,8 @@
 #include "gambit.h"
 #include "dlefgreveal.h"
 
+using namespace Gambit;
+
 //=========================================================================
 //                  gbtRevealMoveDialog: Member functions
 //=========================================================================
@@ -41,8 +43,8 @@ gbtRevealMoveDialog::gbtRevealMoveDialog(wxWindow *p_parent, gbtGameDocument *p_
 
   auto *boxSizer = new wxBoxSizer(wxVERTICAL);
 
-  for (int pl = 1; pl <= m_doc->NumPlayers(); pl++) {
-    const Gambit::GamePlayer player = m_doc->GetGame()->GetPlayer(pl);
+  for (size_t pl = 1; pl <= m_doc->NumPlayers(); pl++) {
+    auto player = m_doc->GetGame()->GetPlayer(pl);
     if (player->GetLabel().empty()) {
       m_players.push_back(
           new wxCheckBox(this, wxID_ANY, wxString(player->GetLabel().c_str(), *wxConvCurrent)));
@@ -71,11 +73,11 @@ gbtRevealMoveDialog::gbtRevealMoveDialog(wxWindow *p_parent, gbtGameDocument *p_
   CenterOnParent();
 }
 
-Gambit::Array<Gambit::GamePlayer> gbtRevealMoveDialog::GetPlayers() const
+Array<GamePlayer> gbtRevealMoveDialog::GetPlayers() const
 {
-  Gambit::Array<Gambit::GamePlayer> players;
+  Array<GamePlayer> players;
 
-  for (int pl = 1; pl <= m_doc->NumPlayers(); pl++) {
+  for (size_t pl = 1; pl <= m_doc->NumPlayers(); pl++) {
     if (m_players[pl]->GetValue()) {
       players.push_back(m_doc->GetGame()->GetPlayer(pl));
     }

src/gui/dlinsertmove.cc

@@ -36,14 +36,13 @@ gbtInsertMoveDialog::gbtInsertMoveDialog(wxWindow *p_parent, gbtGameDocument *p_
 {
   m_playerItem = new wxChoice(this, wxID_ANY);
   m_playerItem->Append(_("Insert move for the chance player"));
-  for (int pl = 1; pl <= m_doc->NumPlayers(); pl++) {
+  for (const auto &player : m_doc->GetGame()->GetPlayers()) {
     wxString s = _("Insert move for ");
-    const Gambit::GamePlayer player = m_doc->GetGame()->GetPlayer(pl);
     if (player->GetLabel() != "") {
       s += wxString(player->GetLabel().c_str(), *wxConvCurrent);
     }
     else {
-      s += wxString::Format(_("player %d"), pl);
+      s += wxString::Format(_("player %d"), player->GetNumber());
     }
     m_playerItem->Append(s);
   }
@@ -119,7 +118,7 @@ void gbtInsertMoveDialog::OnPlayer(wxCommandEvent &)
   if (playerNumber == 0) {
     player = m_doc->GetGame()->GetChance();
   }
-  else if (playerNumber <= m_doc->NumPlayers()) {
+  else if (playerNumber <= static_cast<int>(m_doc->NumPlayers())) {
     player = m_doc->GetGame()->GetPlayer(playerNumber);
   }
 
@@ -189,7 +188,7 @@ Gambit::GamePlayer gbtInsertMoveDialog::GetPlayer() const
   if (playerNumber == 0) {
     return m_doc->GetGame()->GetChance();
   }
-  else if (playerNumber <= m_doc->NumPlayers()) {
+  else if (playerNumber <= static_cast<int>(m_doc->NumPlayers())) {
     return m_doc->GetGame()->GetPlayer(playerNumber);
   }
   else {
@@ -201,7 +200,7 @@ Gambit::GamePlayer gbtInsertMoveDialog::GetPlayer() const
 
 Gambit::GameInfoset gbtInsertMoveDialog::GetInfoset() const
 {
-  if (m_playerItem->GetSelection() <= m_doc->NumPlayers()) {
+  if (m_playerItem->GetSelection() <= static_cast<int>(m_doc->NumPlayers())) {
     const Gambit::GamePlayer player = GetPlayer();
     const int infosetNumber = m_infosetItem->GetSelection();