Merge branch 'master' into catalog/744

Author: edwardchalstrey1

ChangeLog

@@ -9,6 +9,8 @@
 - `enumpoly` would take a very long time on some supports where an equilibrium is located on the
   boundary of the projected game.  Search is now restricted to the interior of the space ruling
   these out; these will always be found by another projection.  (#756)
+- In the graphical interface, the logit correspondence display would fail and terminate the program
+  on very small (<10^{-300}) probabilities.
 
 ## [16.5.1] - unreleased
 

src/games/game.h

@@ -593,6 +593,21 @@ inline GameNodeRep::Actions::iterator::iterator(GameInfosetRep::Actions::iterato
 
 inline GameNode GameNodeRep::Actions::iterator::GetOwner() const { return m_child_it.GetOwner(); }
 
+inline void ValidateDistribution(const Array<Number> &p_probs, const bool p_normalized = true)
+{
+  if (std::any_of(p_probs.begin(), p_probs.end(),
+                  [](const Number &x) { return static_cast<Rational>(x) < Rational(0); })) {
+    throw ValueException("Probabilities must be non-negative numbers");
+  }
+  if (!p_normalized) {
+    return;
+  }
+  if (sum_function(p_probs, [](const Number &n) { return static_cast<Rational>(n); }) !=
+      Rational(1)) {
+    throw ValueException("Probabilities must sum to exactly one");
+  }
+}
+
 enum class TraversalOrder { Preorder, Postorder };
 
 class CartesianProductSpace {

src/games/gametree.cc

@@ -1324,17 +1324,8 @@ Game GameTreeRep::SetChanceProbs(const GameInfoset &p_infoset, const Array<Numbe
   if (p_infoset->m_actions.size() != p_probs.size()) {
     throw DimensionException("The number of probabilities given must match the number of actions");
   }
+  ValidateDistribution(p_probs);
   IncrementVersion();
-  if (std::any_of(p_probs.begin(), p_probs.end(),
-                  [](const Number &x) { return static_cast<Rational>(x) < Rational(0); })) {
-    throw ValueException("Probabilities must be non-negative numbers");
-  }
-  auto sum = std::accumulate(
-      p_probs.begin(), p_probs.end(), Rational(0),
-      [](const Rational &r, const Number &n) { return r + static_cast<Rational>(n); });
-  if (sum != Rational(1)) {
-    throw ValueException("Probabilities must sum to exactly one");
-  }
   std::copy(p_probs.begin(), p_probs.end(), p_infoset->m_probs.begin());
   ClearComputedValues();
   return shared_from_this();

src/gui/dleditmove.cc

@@ -32,8 +32,11 @@
 #include "renratio.h"
 
 namespace Gambit::GUI {
+
 class ActionSheet final : public wxSheet {
-  GameInfoset m_infoset;
+  GameInfoset m_infoset{nullptr};
+  wxSheetCellAttr m_labelAttr;
+  wxFont m_labelFont, m_cellFont;
 
   // Overriding wxSheet members
   wxSheetCellAttr GetAttr(const wxSheetCoords &p_coords, wxSheetAttr_Type) const override;
@@ -48,8 +51,17 @@ class ActionSheet final : public wxSheet {
 };
 
 ActionSheet::ActionSheet(wxWindow *p_parent, const GameInfoset &p_infoset)
-  : wxSheet(p_parent, wxID_ANY), m_infoset(p_infoset)
+  : wxSheet(p_parent, wxID_ANY), m_infoset(p_infoset), m_labelFont(GetFont()),
+    m_cellFont(GetFont())
 {
+  m_labelFont.MakeBold();
+
+  m_labelAttr = GetSheetRefData()->m_defaultRowLabelAttr;
+  m_labelAttr.SetFont(m_labelFont);
+  m_labelAttr.SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER);
+  m_labelAttr.SetOrientation(wxHORIZONTAL);
+  m_labelAttr.SetReadOnly(true);
+
   CreateGrid(p_infoset->GetActions().size(), (p_infoset->IsChanceInfoset()) ? 2 : 1);
   SetRowLabelWidth(40);
   SetColLabelHeight(25);
@@ -103,29 +115,12 @@ Array<Number> ActionSheet::GetActionProbs()
 
 wxSheetCellAttr ActionSheet::GetAttr(const wxSheetCoords &p_coords, wxSheetAttr_Type) const
 {
-  if (IsRowLabelCell(p_coords)) {
-    wxSheetCellAttr attr(GetSheetRefData()->m_defaultRowLabelAttr);
-    attr.SetFont(wxFont(10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD));
-    attr.SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER);
-    attr.SetOrientation(wxHORIZONTAL);
-    attr.SetReadOnly(true);
-    return attr;
-  }
-  else if (IsColLabelCell(p_coords)) {
-    wxSheetCellAttr attr(GetSheetRefData()->m_defaultColLabelAttr);
-    attr.SetFont(wxFont(10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD));
-    attr.SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER);
-    attr.SetOrientation(wxHORIZONTAL);
-    attr.SetReadOnly(true);
-    return attr;
-  }
-  else if (IsCornerLabelCell(p_coords)) {
-    const wxSheetCellAttr attr(GetSheetRefData()->m_defaultCornerLabelAttr);
-    return attr;
+  if (IsLabelCell(p_coords)) {
+    return m_labelAttr;
   }
 
   wxSheetCellAttr attr(GetSheetRefData()->m_defaultGridCellAttr);
-  attr.SetFont(wxFont(10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL));
+  attr.SetFont(m_cellFont);
   attr.SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER);
   attr.SetOrientation(wxHORIZONTAL);
   attr.SetReadOnly(false);
@@ -143,9 +138,7 @@ wxSheetCellAttr ActionSheet::GetAttr(const wxSheetCoords &p_coords, wxSheetAttr_
 //                      class EditMoveDialog
 //======================================================================
 
-wxBEGIN_EVENT_TABLE(EditMoveDialog, wxDialog) EVT_BUTTON(wxID_OK, EditMoveDialog::OnOK)
-    wxEND_EVENT_TABLE() EditMoveDialog::EditMoveDialog(wxWindow *p_parent,
-                                                       const GameInfoset &p_infoset)
+EditMoveDialog::EditMoveDialog(wxWindow *p_parent, const GameInfoset &p_infoset)
   : wxDialog(p_parent, wxID_ANY, _("Move properties"), wxDefaultPosition), m_infoset(p_infoset)
 {
   auto *topSizer = new wxBoxSizer(wxVERTICAL);
@@ -158,10 +151,11 @@ wxBEGIN_EVENT_TABLE(EditMoveDialog, wxDialog) EVT_BUTTON(wxID_OK, EditMoveDialog
   labelSizer->Add(m_infosetName, 1, wxALL | wxEXPAND, 5);
   topSizer->Add(labelSizer, 0, wxALL | wxEXPAND, 0);
 
-  topSizer->Add(new wxStaticText(
-                    this, wxID_STATIC,
-                    wxString::Format(_("Number of members: %d"), p_infoset->GetMembers().size())),
-                0, wxALL | wxALIGN_CENTER, 5);
+  {
+    wxString label;
+    label << _("Number of members: ") << p_infoset->GetMembers().size();
+    topSizer->Add(new wxStaticText(this, wxID_STATIC, label), 0, wxALL | wxALIGN_CENTER, 5);
+  }
 
   auto *playerSizer = new wxBoxSizer(wxHORIZONTAL);
   playerSizer->Add(new wxStaticText(this, wxID_STATIC, _("Belongs to player")), 0,
@@ -170,11 +164,13 @@ wxBEGIN_EVENT_TABLE(EditMoveDialog, wxDialog) EVT_BUTTON(wxID_OK, EditMoveDialog
   if (p_infoset->IsChanceInfoset()) {
     m_player->Append(_("Chance"));
     m_player->SetSelection(0);
+    m_player->Disable();
   }
   else {
     for (const auto &player : p_infoset->GetGame()->GetPlayers()) {
-      m_player->Append(wxString::Format(_T("%d: "), player->GetNumber()) +
-                       wxString(player->GetLabel().c_str(), *wxConvCurrent));
+      wxString label;
+      label << player->GetNumber() << ": " << player->GetLabel();
+      m_player->Append(label);
     }
     m_player->SetSelection(p_infoset->GetPlayer()->GetNumber() - 1);
   }
@@ -187,18 +183,13 @@ wxBEGIN_EVENT_TABLE(EditMoveDialog, wxDialog) EVT_BUTTON(wxID_OK, EditMoveDialog
   actionBoxSizer->Add(m_actionSheet, 1, wxALL | wxEXPAND, 5);
   topSizer->Add(actionBoxSizer, 0, wxALL | wxEXPAND, 5);
 
-  auto *buttonSizer = new wxBoxSizer(wxHORIZONTAL);
-  buttonSizer->Add(new wxButton(this, wxID_CANCEL, _("Cancel")), 0, wxALL, 5);
-  auto *okButton = new wxButton(this, wxID_OK, _("OK"));
-  okButton->SetDefault();
-  buttonSizer->Add(okButton, 0, wxALL, 5);
-  topSizer->Add(buttonSizer, 0, wxALL | wxALIGN_RIGHT, 5);
-
-  SetSizer(topSizer);
-  topSizer->Fit(this);
-  topSizer->SetSizeHints(this);
-  wxTopLevelWindowBase::Layout();
+  if (auto *buttons = CreateSeparatedButtonSizer(wxOK | wxCANCEL)) {
+    topSizer->Add(buttons, 0, wxALL | wxEXPAND, 5);
+  }
+  SetSizerAndFit(topSizer);
   CenterOnParent();
+
+  Bind(wxEVT_BUTTON, &EditMoveDialog::OnOK, this, wxID_OK);
 }
 
 void EditMoveDialog::OnOK(wxCommandEvent &p_event)
@@ -207,23 +198,16 @@ void EditMoveDialog::OnOK(wxCommandEvent &p_event)
     p_event.Skip();
     return;
   }
-  auto probs = m_actionSheet->GetActionProbs();
-  if (std::any_of(probs.begin(), probs.end(),
-                  [](const Number &p) { return static_cast<Rational>(p) < Rational(0); })) {
-    wxMessageBox("Action probabilities must be non-negative numbers.", "Error");
-    return;
-  }
-  if (std::accumulate(probs.begin(), probs.end(), Rational(0),
-                      [](const Rational &s, const Number &p) {
-                        return s + static_cast<Rational>(p);
-                      }) != Rational(1)) {
-    p_event.Skip();
+  try {
+    ValidateDistribution(m_actionSheet->GetActionProbs());
   }
-  else {
-    wxRichMessageDialog(this, "Action probabilities must sum to exactly one", "Error",
+  catch (ValueException &) {
+    wxRichMessageDialog(this, "Probabilities must be nonnegative numbers summing to one.", "Error",
                         wxOK | wxCENTRE | wxICON_ERROR)
         .ShowModal();
+    return;
   }
+  p_event.Skip();
 }
 
 int EditMoveDialog::NumActions() const { return m_actionSheet->NumActions(); }

src/gui/dleditmove.h

@@ -45,8 +45,6 @@ class EditMoveDialog final : public wxDialog {
   int NumActions() const;
   wxString GetActionName(int p_act) const;
   Array<Number> GetActionProbs() const;
-
-  wxDECLARE_EVENT_TABLE();
 };
 } // namespace Gambit::GUI
 

src/gui/dleditnode.cc

@@ -55,7 +55,9 @@ EditNodeDialog::EditNodeDialog(wxWindow *p_parent, const GameNode &p_node)
       for (const auto &infoset : p_node->GetGame()->GetChance()->GetInfosets()) {
         if (infoset->GetActions().size() == p_node->GetChildren().size()) {
           m_infosetList.push_back(infoset);
-          m_infoset->Append(wxString::Format(_("Chance infoset %d"), infoset->GetNumber()));
+          wxString label;
+          label << _("Chance infoset ") << infoset->GetNumber();
+          m_infoset->Append(label);
           if (infoset == p_node->GetInfoset()) {
             selection = m_infosetList.size();
           }
@@ -69,8 +71,10 @@ EditNodeDialog::EditNodeDialog(wxWindow *p_parent, const GameNode &p_node)
         for (const auto &infoset : player->GetInfosets()) {
           if (infoset->GetActions().size() == p_node->GetChildren().size()) {
             m_infosetList.push_back(infoset);
-            m_infoset->Append(wxString::Format(_("Player %d, Infoset %d"), player->GetNumber(),
-                                               infoset->GetNumber()));
+            wxString label;
+            label << _("Player ") << player->GetNumber() << _(", Infoset ")
+                  << infoset->GetNumber();
+            m_infoset->Append(label);
             if (infoset == p_node->GetInfoset()) {
               selection = m_infosetList.size();
             }

src/gui/dlefglayout.cc

@@ -100,24 +100,28 @@ LayoutNodesPanel::LayoutNodesPanel(wxWindow *p_parent, const TreeRenderConfig &p
   gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Horizontal size of nodes")), 0,
                  wxALIGN_CENTER_VERTICAL | wxALL, 5);
 
-  constexpr int NODE_LENGTH_MIN = 5;
-  constexpr int NODE_LENGTH_MAX = 100;
-
-  m_nodeSize = new wxSpinCtrl(this, wxID_ANY, wxString::Format(_T("%d"), p_settings.GetNodeSize()),
-                              wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, NODE_LENGTH_MIN,
-                              NODE_LENGTH_MAX);
-  gridSizer->Add(m_nodeSize, 1, wxEXPAND | wxALL, 5);
+  {
+    constexpr int NODE_LENGTH_MIN = 5;
+    constexpr int NODE_LENGTH_MAX = 100;
+    wxString label;
+    label << p_settings.GetNodeSize();
+    m_nodeSize = new wxSpinCtrl(this, wxID_ANY, label, wxDefaultPosition, wxDefaultSize,
+                                wxSP_ARROW_KEYS, NODE_LENGTH_MIN, NODE_LENGTH_MAX);
+    gridSizer->Add(m_nodeSize, 1, wxEXPAND | wxALL, 5);
+  }
 
   gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Vertical spacing between terminal nodes")), 0,
                  wxALIGN_CENTER_VERTICAL | wxALL, 5);
 
-  constexpr int Y_SPACING_MIN = 15;
-  constexpr int Y_SPACING_MAX = 60;
-
-  m_terminalSpacing = new wxSpinCtrl(
-      this, wxID_ANY, wxString::Format(_T("%d"), p_settings.GetTerminalSpacing()),
-      wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, Y_SPACING_MIN, Y_SPACING_MAX);
-  gridSizer->Add(m_terminalSpacing, 1, wxEXPAND | wxALL, 5);
+  {
+    constexpr int Y_SPACING_MIN = 15;
+    constexpr int Y_SPACING_MAX = 60;
+    wxString label;
+    label << p_settings.GetTerminalSpacing();
+    m_terminalSpacing = new wxSpinCtrl(this, wxID_ANY, label, wxDefaultPosition, wxDefaultSize,
+                                       wxSP_ARROW_KEYS, Y_SPACING_MIN, Y_SPACING_MAX);
+    gridSizer->Add(m_terminalSpacing, 1, wxEXPAND | wxALL, 5);
+  }
 
   sizeSizer->Add(gridSizer, 1, wxALL | wxEXPAND, 5);
   topSizer->Add(sizeSizer, 0, wxALL | wxALIGN_CENTER, 5);
@@ -151,12 +155,6 @@ class LayoutBranchesPanel : public wxPanel {
 LayoutBranchesPanel::LayoutBranchesPanel(wxWindow *p_parent, const TreeRenderConfig &p_settings)
   : wxPanel(p_parent, wxID_ANY)
 {
-  constexpr int BRANCH_LENGTH_MIN = 0;
-  constexpr int BRANCH_LENGTH_MAX = 100;
-
-  constexpr int TINE_LENGTH_MIN = 20;
-  constexpr int TINE_LENGTH_MAX = 100;
-
   auto *topSizer = new wxBoxSizer(wxVERTICAL);
 
   auto *styleBoxSizer = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Drawing branches"));
@@ -186,19 +184,29 @@ LayoutBranchesPanel::LayoutBranchesPanel(wxWindow *p_parent, const TreeRenderCon
   auto *gridSizer = new wxFlexGridSizer(2);
   gridSizer->AddGrowableCol(1);
 
-  gridSizer->Add(new wxStaticText(this, wxID_ANY, _("size of branch fork")), 0,
-                 wxALIGN_CENTER_VERTICAL | wxALL, 5);
-  m_branchLength = new wxSpinCtrl(
-      this, wxID_ANY, wxString::Format(_T("%d"), p_settings.GetBranchLength()), wxDefaultPosition,
-      wxDefaultSize, wxSP_ARROW_KEYS, BRANCH_LENGTH_MIN, BRANCH_LENGTH_MAX);
-  gridSizer->Add(m_branchLength, 1, wxALL | wxEXPAND, 5);
+  {
+    constexpr int BRANCH_LENGTH_MIN = 0;
+    constexpr int BRANCH_LENGTH_MAX = 100;
+    gridSizer->Add(new wxStaticText(this, wxID_ANY, _("size of branch fork")), 0,
+                   wxALIGN_CENTER_VERTICAL | wxALL, 5);
+    wxString label;
+    label << p_settings.GetBranchLength();
+    m_branchLength = new wxSpinCtrl(this, wxID_ANY, label, wxDefaultPosition, wxDefaultSize,
+                                    wxSP_ARROW_KEYS, BRANCH_LENGTH_MIN, BRANCH_LENGTH_MAX);
+    gridSizer->Add(m_branchLength, 1, wxALL | wxEXPAND, 5);
+  }
 
-  gridSizer->Add(new wxStaticText(this, wxID_ANY, _("size of branch tine")), 1,
-                 wxALIGN_CENTER_VERTICAL | wxALL, 5);
-  m_tineLength = new wxSpinCtrl(
-      this, wxID_ANY, wxString::Format(_T("%d"), p_settings.GetTineLength()), wxDefaultPosition,
-      wxDefaultSize, wxSP_ARROW_KEYS, TINE_LENGTH_MIN, TINE_LENGTH_MAX);
-  gridSizer->Add(m_tineLength, 1, wxALL | wxEXPAND, 5);
+  {
+    constexpr int TINE_LENGTH_MIN = 20;
+    constexpr int TINE_LENGTH_MAX = 100;
+    gridSizer->Add(new wxStaticText(this, wxID_ANY, _("size of branch tine")), 1,
+                   wxALIGN_CENTER_VERTICAL | wxALL, 5);
+    wxString label;
+    label << p_settings.GetTineLength();
+    m_tineLength = new wxSpinCtrl(this, wxID_ANY, label, wxDefaultPosition, wxDefaultSize,
+                                  wxSP_ARROW_KEYS, TINE_LENGTH_MIN, TINE_LENGTH_MAX);
+    gridSizer->Add(m_tineLength, 1, wxALL | wxEXPAND, 5);
+  }
 
   lengthSizer->Add(gridSizer, 1, wxALL | wxEXPAND, 5);
   topSizer->Add(lengthSizer, 0, wxALL | wxALIGN_CENTER, 5);

src/gui/dlefglogit.cc

@@ -74,15 +74,18 @@ LogitBehavList::LogitBehavList(wxWindow *p_parent, GameDocument *p_doc)
 wxString LogitBehavList::GetCellValue(const wxSheetCoords &p_coords)
 {
   if (IsRowLabelCell(p_coords)) {
-    return wxString::Format(wxT("%d"), p_coords.GetRow() + 1);
+    wxString label;
+    label << (p_coords.GetRow() + 1);
+    return label;
   }
   if (IsColLabelCell(p_coords)) {
     if (p_coords.GetCol() == 0) {
       return wxT("Lambda");
     }
     const GameAction action = m_doc->GetAction(p_coords.GetCol());
-    return (wxString::Format(wxT("%d: "), action->GetInfoset()->GetNumber()) +
-            wxString(action->GetLabel().c_str(), *wxConvCurrent));
+    wxString label;
+    label << action->GetInfoset()->GetNumber() << ": " << action->GetLabel();
+    return label;
   }
   if (IsCornerLabelCell(p_coords)) {
     return wxT("#");
@@ -171,7 +174,12 @@ void LogitBehavList::AddProfile(const wxString &p_text, bool p_forceShow)
   }
   m_lambdas.push_back(std::stod(next.ToStdString()));
   for (size_t i = 1; i <= profile->BehaviorProfileLength(); i++) {
-    (*profile)[i] = std::stod(tok.GetNextToken().ToStdString());
+    try {
+      (*profile)[i] = std::stod(tok.GetNextToken().ToStdString());
+    }
+    catch (std::out_of_range &) {
+      (*profile)[i] = 0.0;
+    }
   }
   m_profiles.push_back(profile);
   if (p_forceShow || m_profiles.size() - GetNumberRows() > 20) {

src/gui/dlefgreveal.cc

@@ -71,10 +71,10 @@ RevealMoveDialog::RevealMoveDialog(wxWindow *p_parent, const Game &p_game)
   for (const auto &player : players) {
     wxString label;
     if (!player->GetLabel().empty()) {
-      label = wxString::FromUTF8(player->GetLabel());
+      label << player->GetLabel();
     }
     else {
-      label = wxString::Format("Player %u", player->GetNumber());
+      label << "Player " << player->GetNumber();
     }
     auto *cb = new wxCheckBox(this, wxID_ANY, label);
     cb->SetValue(true);