Merge branch 'maint16_4'

tturocy · tturocy · commit a311874464a4 · 2025-10-29T16:26:46.000Z
# Conflicts:
#	src/gui/dlefglogit.cc
#	src/gui/gamedoc.cc
#	src/gui/gamedoc.h
#	src/gui/gameframe.cc
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -53,7 +53,7 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.12"
       - uses: py-actions/flake8@v2
@@ -64,7 +64,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.12"
       - name: Install Python packages
diff --git a/.github/workflows/osxbinary.yml b/.github/workflows/osxbinary.yml
@@ -35,7 +35,7 @@ jobs:
       - run: make
       - run: sudo make install
       - run: make osx-dmg
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: artifact-osx-13
           path: "*.dmg"
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Set up dependencies
@@ -50,7 +50,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Set up dependencies
@@ -73,7 +73,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Set up dependencies
@@ -96,7 +96,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Set up dependencies
diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml
@@ -54,7 +54,7 @@ jobs:
       - run: make
       - run: sudo make install
       - run: make osx-dmg
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: artifact-osx-13
           path: "*.dmg"
@@ -73,7 +73,7 @@ jobs:
       - run: make
       - run: sudo make install
       - run: make osx-dmg
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: artifact-osx-14
           path: "*.dmg"
@@ -101,7 +101,7 @@ jobs:
           cp gambit* installer
           "${WIX}bin/candle" gambit.wxs
           "${WIX}bin/light" -ext WixUIExtension gambit.wixobj
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: artifact-msw
           path: "*.msi"
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
       - name: Set up dependencies
@@ -31,6 +31,6 @@ jobs:
           python -m cibuildwheel --output-dir wheelhouse/
         env:
           CIBW_SKIP: "pp*"
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           path: ./wheelhouse/*.whl
diff --git a/ChangeLog b/ChangeLog
@@ -12,6 +12,24 @@
 ### Fixed
 - Fixed a regression in which null outcomes in strategic game tables were not handled correctly
   when changing the number of strategies in the game (#571)
+- Fixed improper shared pointer handling when writing a .nfg file based on a game in
+  extensive form.
+
+
+## [16.3.2] - unreleased
+
+### Fixed
+- Parsing of output of `gambit-logit` in the graphical interface did not handle the
+  terminal Nash profile correctly.  (#172)
+- Improved sizing of list of logit profiles computed for normal form games.
+
+### Changed
+- Removed Ctrl/Cmd-X accelerator for closing program, as this clashes with modern standard
+  expectations.  (#507)
+
+### Removed
+- Undo and redo have been removed from the graphical interface.  (These were meant to be
+  removed previously as they did not work properly and gave unpredictable behaviour.) (#505)
 
 
 ## [16.4.0] - 2025-09-05
@@ -41,6 +59,7 @@
   by the order encountered in a depth-first traversal of the tree - can now be obtained by calling
   `SortInfosets` (C++) or `sort_infosets` (Python) on the game.  (#483)
 
+
 ## [16.3.1] - 2025-08-18
 
 ### Fixed
diff --git a/src/games/behavmixed.h b/src/games/behavmixed.h
@@ -226,7 +226,8 @@ template <class T> class MixedBehaviorProfile {
 template <class Generator>
 MixedBehaviorProfile<double> GameRep::NewRandomBehaviorProfile(Generator &generator) const
 {
-  auto profile = MixedBehaviorProfile<double>(Game(const_cast<GameRep *>(this)));
+  auto profile =
+      MixedBehaviorProfile<double>(std::const_pointer_cast<GameRep>(shared_from_this()));
   std::exponential_distribution<> dist(1); // NOLINT(misc-const-correctness)
   for (auto player : GetPlayers()) {
     for (auto infoset : player->GetInfosets()) {
@@ -242,7 +243,8 @@ template <class Generator>
 MixedBehaviorProfile<Rational> GameRep::NewRandomBehaviorProfile(int p_denom,
                                                                  Generator &generator) const
 {
-  auto profile = MixedBehaviorProfile<Rational>(Game(const_cast<GameRep *>(this)));
+  auto profile =
+      MixedBehaviorProfile<Rational>(std::const_pointer_cast<GameRep>(shared_from_this()));
   for (auto player : GetPlayers()) {
     for (auto infoset : player->GetInfosets()) {
       std::list<Rational> dist =
diff --git a/src/games/game.cc b/src/games/game.cc
@@ -213,8 +213,8 @@ void GameRep::WriteNfgFile(std::ostream &p_file) const
   p_file << "}" << std::endl;
   p_file << std::quoted(GetComment()) << std::endl << std::endl;
 
-  for (auto iter :
-       StrategyContingencies(StrategySupportProfile(Game(const_cast<GameRep *>(this))))) {
+  for (auto iter : StrategyContingencies(
+           StrategySupportProfile(std::const_pointer_cast<GameRep>(shared_from_this())))) {
     p_file << FormatList(
                   players,
                   [&iter](const GamePlayer &p) {
diff --git a/src/gui/dlefglogit.cc b/src/gui/dlefglogit.cc
@@ -165,14 +165,14 @@ void LogitBehavList::AddProfile(const wxString &p_text, bool p_forceShow)
   const auto profile = std::make_shared<MixedBehaviorProfile<double>>(m_doc->GetGame());
 
   wxStringTokenizer tok(p_text, wxT(","));
-
-  m_lambdas.push_back(
-      (double)lexical_cast<Rational>(std::string((const char *)tok.GetNextToken().mb_str())));
-
+  const auto next = tok.GetNextToken();
+  if (next == "NE") {
+    return;
+  }
+  m_lambdas.push_back(std::stod(next.ToStdString()));
   for (size_t i = 1; i <= profile->BehaviorProfileLength(); i++) {
-    (*profile)[i] = lexical_cast<Rational>(std::string(tok.GetNextToken().mb_str()));
+    (*profile)[i] = std::stod(tok.GetNextToken().ToStdString());
   }
-
   m_profiles.push_back(profile);
   if (p_forceShow || m_profiles.size() - GetNumberRows() > 20) {
     AppendRows(m_profiles.size() - GetNumberRows());
diff --git a/src/gui/dlnfglogit.cc b/src/gui/dlnfglogit.cc
@@ -70,11 +70,14 @@ void LogitMixedBranch::AddProfile(const wxString &p_text)
 
   wxStringTokenizer tok(p_text, wxT(","));
 
-  m_lambdas.push_back(
-      (double)lexical_cast<Rational>(std::string((const char *)tok.GetNextToken().mb_str())));
+  const auto next = tok.GetNextToken();
+  if (next == "NE") {
+    return;
+  }
+  m_lambdas.push_back(std::stod(next.ToStdString()));
 
   for (size_t i = 1; i <= profile->MixedProfileLength(); i++) {
-    (*profile)[i] = lexical_cast<Rational>(std::string((const char *)tok.GetNextToken().mb_str()));
+    (*profile)[i] = std::stod(tok.GetNextToken().ToStdString());
   }
 
   m_profiles.push_back(profile);
@@ -111,7 +114,8 @@ class LogitMixedSheet final : public wxSheet {
 
 LogitMixedSheet::LogitMixedSheet(wxWindow *p_parent, GameDocument *p_doc,
                                  LogitMixedBranch &p_branch)
-  : wxSheet(p_parent, wxID_ANY), m_doc(p_doc), m_branch(p_branch)
+  : wxSheet(p_parent, wxID_ANY, wxDefaultPosition, wxSize(800, 600)), m_doc(p_doc),
+    m_branch(p_branch)
 {
   CreateGrid(p_branch.NumPoints(), p_doc->GetGame()->MixedProfileLength() + 1);
   SetRowLabelWidth(40);
@@ -224,7 +228,7 @@ LogitBranchDialog::LogitBranchDialog(wxWindow *p_parent, GameDocument *p_doc,
   m_sheet->AutoSizeCol(0);
 
   auto *sizer = new wxBoxSizer(wxVERTICAL);
-  sizer->Add(m_sheet, 0, wxALL, 5);
+  sizer->Add(m_sheet, 0, wxEXPAND | wxALL, 5);
   sizer->Add(CreateButtonSizer(wxOK), 0, wxALL | wxEXPAND, 5);
 
   SetSizer(sizer);
diff --git a/src/gui/efgdisplay.cc b/src/gui/efgdisplay.cc
@@ -336,11 +336,6 @@ EfgDisplay::EfgDisplay(wxWindow *p_parent, GameDocument *p_doc)
 void EfgDisplay::MakeMenus()
 {
   m_nodeMenu = new wxMenu;
-
-  m_nodeMenu->Append(wxID_UNDO, _("&Undo\tCtrl-Z"), _("Undo the last change"));
-  m_nodeMenu->Append(wxID_REDO, _("&Redo\tCtrl-Y"), _("Redo the last undone change"));
-  m_nodeMenu->AppendSeparator();
-
   m_nodeMenu->Append(GBT_MENU_EDIT_INSERT_MOVE, _("&Insert move"), _("Insert a move"));
   m_nodeMenu->Append(GBT_MENU_EDIT_INSERT_ACTION, _("Insert &action"),
                      _("Insert an action at the current move"));
@@ -581,8 +576,6 @@ void EfgDisplay::OnUpdate()
 
   const GameNode selectNode = m_doc->GetSelectNode();
 
-  m_nodeMenu->Enable(wxID_UNDO, m_doc->CanUndo());
-  m_nodeMenu->Enable(wxID_REDO, m_doc->CanRedo());
   m_nodeMenu->Enable(GBT_MENU_EDIT_INSERT_MOVE, selectNode);
   m_nodeMenu->Enable(GBT_MENU_EDIT_INSERT_ACTION, selectNode && selectNode->GetInfoset());
   m_nodeMenu->Enable(GBT_MENU_EDIT_REVEAL, selectNode && selectNode->GetInfoset());
diff --git a/src/gui/gamedoc.cc b/src/gui/gamedoc.cc
@@ -169,7 +169,6 @@ GameDocument::GameDocument(Game p_game)
 
   std::ostringstream s;
   SaveDocument(s);
-  m_undoList.push_back(s.str());
 }
 
 GameDocument::~GameDocument() { wxGetApp().RemoveDocument(this); }
@@ -285,7 +284,6 @@ bool GameDocument::LoadDocument(const wxString &p_filename, bool p_saveUndo)
   if (p_saveUndo) {
     std::ostringstream s;
     SaveDocument(s);
-    m_undoList.push_back(s.str());
   }
 
   return true;
@@ -332,11 +330,8 @@ void GameDocument::UpdateViews(GameModificationType p_modifications)
 {
   if (p_modifications != GBT_DOC_MODIFIED_NONE) {
     m_modified = true;
-    m_redoList = std::list<std::string>();
-
     std::ostringstream s;
     SaveDocument(s);
-    m_undoList.push_back(s.str());
   }
 
   if (p_modifications == GBT_DOC_MODIFIED_GAME || p_modifications == GBT_DOC_MODIFIED_PAYOFFS) {
@@ -388,57 +383,6 @@ void GameDocument::SetStyle(const TreeRenderConfig &p_style)
   UpdateViews(GBT_DOC_MODIFIED_VIEWS);
 }
 
-//
-// A word about the undo and redo features:
-// We store a list of the textual representation of games.  We don't
-// store other aspects of the state (e.g., profiles) as yet.
-// The "undo" list includes the representation of the current state
-// of the game (hence, CanUndo() only returns true when the list has
-// more than one element.
-//
-void GameDocument::Undo()
-{
-  // The current game is at the end of the undo list; move it to the redo list
-  m_redoList.push_back(m_undoList.back());
-  m_undoList.pop_back();
-
-  m_game = nullptr;
-
-  m_profiles.clear();
-  m_currentProfileList = 0;
-
-  const wxString tempfile = wxFileName::CreateTempFileName(wxT("gambit"));
-  std::ofstream f((const char *)tempfile.mb_str());
-  f << m_undoList.back() << std::endl;
-  f.close();
-
-  LoadDocument(tempfile, false);
-  wxRemoveFile(tempfile);
-
-  std::for_each(m_views.begin(), m_views.end(), std::mem_fn(&GameView::OnUpdate));
-}
-
-void GameDocument::Redo()
-{
-  m_undoList.push_back(m_redoList.back());
-  m_redoList.pop_back();
-
-  m_game = nullptr;
-
-  m_profiles.clear();
-  m_currentProfileList = 0;
-
-  const wxString tempfile = wxFileName::CreateTempFileName(wxT("gambit"));
-  std::ofstream f((const char *)tempfile.mb_str());
-  f << m_undoList.back() << std::endl;
-  f.close();
-
-  LoadDocument(tempfile, false);
-  wxRemoveFile(tempfile);
-
-  std::for_each(m_views.begin(), m_views.end(), [](GameView *v) { v->OnUpdate(); });
-}
-
 void GameDocument::SetCurrentProfile(int p_profile)
 {
   m_profiles[m_currentProfileList]->SetCurrent(p_profile);
diff --git a/src/gui/gamedoc.h b/src/gui/gamedoc.h
@@ -232,8 +232,6 @@ class GameDocument {
   Array<std::shared_ptr<AnalysisOutput>> m_profiles;
   int m_currentProfileList;
 
-  std::list<std::string> m_undoList, m_redoList;
-
   void UpdateViews(GameModificationType p_modifications);
 
 public:
@@ -267,17 +265,6 @@ class GameDocument {
   bool IsTree() const { return m_game->IsTree(); }
   GameAction GetAction(int p_index) const;
 
-  //!
-  //! @name Handling of undo/redo features
-  //!
-  //@{
-  bool CanUndo() const { return (m_undoList.size() > 1); }
-  void Undo();
-
-  bool CanRedo() const { return (m_redoList.size() > 0); }
-  void Redo();
-  //@}
-
   //!
   //! @name Handling of list of computed profiles
   //!
diff --git a/src/gui/gameframe.cc b/src/gui/gameframe.cc
diff --git a/src/gui/gameframe.h b/src/gui/gameframe.h
diff --git a/tests/test_io.py b/tests/test_io.py
