Merge branch 'dev-install-fix' into catalog/744

Author: edwardchalstrey1

ChangeLog

@@ -5,6 +5,10 @@
 ### Changed
 - `Game.comment` has been renamed to `Game.description`
 
+### Fixed
+- `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)
 
 ## [16.5.1] - unreleased
 

README.md

@@ -10,8 +10,9 @@
 
 **Gambit** is the package for doing computation in (non-cooperative) game theory.
 
-- See our [documentation](https://gambitproject.readthedocs.io/)
-- Check our [project website](https://www.gambit-project.org/)
+- **Documentation:** for the package is hosted at [gambitproject.readthedocs.io](https://gambitproject.readthedocs.io/).
+- **The Gambit project:** Find out more about the project at [gambit-project.org](https://www.gambit-project.org/)
+- **Contributors:** Please read the [code of conduct and contribution guidelines](https://gambitproject.readthedocs.io/en/latest/developer.contributing.html) before posting on GitHub.
 
 Gambit provides:
 

build_support/osx/Info.plist.in

@@ -1,37 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
 <dict>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.gambit-project.gambit</string>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
+	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>gambit</string>
 	<key>CFBundleIconFile</key>
 	<string>gambit</string>
 	<key>CFBundleName</key>
 	<string>Gambit</string>
+	<key>CFBundleDisplayName</key>
+	<string>Gambit</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>@GAMBIT_VERSION@</string>
 	<key>CFBundleShortVersionString</key>
 	<string>@GAMBIT_VERSION@</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Gambit version @GAMBIT_VERSION@, (c) 1994-2025 The Gambit Project</string>
-	<key>CFBundleLongVersionString</key>
-	<string>@GAMBIT_VERSION@, (c) 1994-2025 The Gambit Project</string>
+	<string>Gambit version @GAMBIT_VERSION@, (c) 1994-2026 The Gambit Project</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 1994-2025 The Gambit Project</string>
-	<key>LSRequiresCarbon</key>
-	<true/>
-	<key>CSResourcesFileMapped</key>
-	<true/>
+	<string>Copyright 1994-2026 The Gambit Project</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 	  <dict>

build_support/osx/gambit.icns

@@ -188,7 +188,7 @@ Use `pip` to install from the **root directory of the source tree**:
 
    python -m venv venv
    source venv/bin/activate
-   python -m pip install .[test,doc]
+   python -m pip install ".[test,doc]"
 
 .. tip::
 

doc/developer.build.rst

@@ -6,11 +6,25 @@ Contributing to Gambit
 This section provides guidelines for contributing to Gambit, including how to report bugs, suggest features, and contribute code.
 It includes information relevant to both core developers and external contributors.
 
+.. _code-of-conduct:
+
+Code of Conduct
+---------------
+
+All participants in the Gambit community are expected to show respect and courtesy to others.
+We are committed to fostering a welcoming and harassment-free environment for everyone, regardless of background or identity.
+Please be kind and considerate in your interactions. We are all here to build a better tool for game theory research and education.
+Disagreements may happen, but they should be handled with respect and a focus on constructive resolution.
+
+To raise any concerns, please contact `Ted Turocy <mailto:ted.turocy@gmail.com>` or `Rahul Savani <mailto:rahul.savani@gmail.com>`.
+
 .. _github-issues:
 
 GitHub issues
 -------------
 
+Newcomer to the project? Please read the :ref:`code of conduct <code-of-conduct>` and :ref:`new contributors section <new-contributors>` sections before posting on GitHub.
+
 In the first instance, bug reports, feature requests and improvements to the Gambit documentation should be
 posted to the Gambit issue tracker, located at
 `<http://github.com/gambitproject/gambit/issues>`_.
@@ -39,6 +53,44 @@ latest development version.  New development should in general always
 be based off this branch.  Branches labeled ``maintX_Y``, where ``X`` is the major version number and ``Y`` is the minor version number, point to the latest commit on a stable
 version.
 
+.. _new-contributors:
+
+A Note for New Contributors
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+We warmly welcome new contributors to the Gambit project! Your help is valuable to us.
+
+Before you start working on a contribution, we encourage you to familiarize yourself with the project.
+Gambit is a mature and complex codebase. Even issues marked as "good first issue" may require some understanding of the context and how different parts of the project interact.
+
+We have always valued thoughtful contributions. A common issue for open-source projects is receiving pull requests that are not well-aligned with the project's needs or coding standards. To avoid unproductive effort on your part and on ours, we strongly encourage you to engage with us before you spend a lot of time on implementation.
+
+A great way to start is by:
+
+1. Looking through the code to understand the relevant parts for your intended change.
+2. Contacting the maintainers via commenting with a question on an open issue, or opening a Discussion on GitHub.
+3. After your discussion with the maintainers, open a draft pull request early in your process. This allows for discussion and feedback before you've invested too much time.
+
+We are happy to answer questions and provide guidance. Engaging with the maintainers early ensures that your contribution is likely to be accepted and integrated smoothly.
+
+.. _ai-policy:
+
+Policy on AI-Assisted Contributions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+We recognize that generative AI tools can be a useful aid in software development. We also expect authentic and thoughtful engagement from our contributors.
+
+- **You are responsible for your contributions.** If you use generative AI to help you write code or documentation, you must fully understand the output. You should be able to explain the changes and why they are the correct approach for the project.
+- **Add value.** Simply taking a prompt, feeding it to an AI, and posting the result as a contribution is not helpful. We expect you to use your own expertise to verify, test, and refine any AI-generated content. Out of respect for everyone's time, we reserve the right to rigorously reject low-value contributions, whether AI-generated or not.
+- **No AI-generated comments.** Please do not post output from Large Language Models (LLMs) or similar tools as comments on GitHub issues or pull requests. Such comments are often generic and do not add to the discussion.
+- **Humans over bots.** We discourage the use of automated tools, such as bots or agents, to post AI-generated content to issues or pull requests, without the advance approval of the core development team.
+
+
+How to submit a contribution
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To contribute code, please follow these steps:
+
 1. To get started contributing code in the `Gambit GitHub repo <https://github.com/gambitproject/gambit>`__, do one of the following:
 
    - Core developers: request contributor access from one of the `team <https://www.gambit-project.org/team/>`__

doc/developer.contributing.rst

@@ -1,10 +1,11 @@
-##########################
 Gambit: User documentation
-##########################
+^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 **Gambit** is a library of game theory software and tools for the
 construction and analysis of finite extensive and strategic games.
-We recommended most new users install the PyGambit Python package and read the associated documentation, which includes tutorials and a complete API reference.
+
+- **Users:** We recommend most newcomers install the PyGambit Python package and read the associated documentation, which includes tutorials and a complete API reference.
+- **Contributors:** Please read the :ref:`code of conduct and contribution guidelines <contributing>` before posting on GitHub.
 
 .. grid::
 

doc/index.rst

@@ -32,7 +32,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-test = ["pytest", "nbformat", "nbclient", "ipykernel"]
+test = ["pytest", "pytest-subtests", "nbformat", "nbclient", "ipykernel"]
 doc = [
     "pydata-sphinx-theme",
     "sphinx_design",
@@ -100,6 +100,16 @@ markers = [
     "nash_lcp_behavior: tests of lcp_solve in mixed behaviors",
     "nash_lp_strategy: tests of lp_solve in mixed strategies",
     "nash_lp_behavior: tests of lp_solve in mixed behaviors",
+    "nash_logit_strategy: tests of logit_solve in mixed strategies",
+    "nash_logit_behavior: tests of logit_solve in behavior strategies",
+    "nash_gnm_strategy: tests of gnm_solve in mixed strategies",
+    "nash_ipa_strategy: tests of lpa_solve in mixed strategies",
+    "nash_simpdiv: tests of simpdiv_solve (in mixed strategies)",
+    "nash_liap_strategy: tests of liap_solve (in mixed strategies)",
+    "nash_liap_agent: tests of liap_agent_solve (in mixed behaviors)",
+    "qre_logit: tests of logit_solve and related methods",
+    "qre_logit_lambda: tests of logit_solve_lambda",
+    "qre_logit_branch: tests of logit_solve_branch",
     "nash: all tests of Nash equilibrium solvers",
     "slow: all time-consuming tests",
 ]

pyproject.toml

@@ -26,19 +26,55 @@
 #ifndef WX_PRECOMP
 #include <wx/wx.h>
 #endif // WX_PRECOMP
+#include <wx/display.h>
 #include <wx/image.h>
-#include <wx/splash.h>
 
 #include "gambit.h"
 
 #include "app.h"
 #include "gameframe.h"
 
+#include "bitmaps/gambitbig.xpm"
+
 namespace Gambit::GUI {
 
-bool Application::OnInit()
+static wxBitmap MakeScaledSplashBitmap(const wxBitmap &srcBmp, double fracOfShortSide)
 {
-#include "bitmaps/gambitbig.xpm"
+  const wxPoint mouse = wxGetMousePosition();
+  const int dispIdx = wxDisplay::GetFromPoint(mouse);
+  wxDisplay disp(dispIdx == wxNOT_FOUND ? 0 : dispIdx);
+
+  wxRect geom = disp.GetGeometry(); // pixels in that display
+  const int shortSide = std::min(geom.width, geom.height);
+  const int targetMax = std::max(200, int(shortSide * fracOfShortSide));
+
+  const int w = srcBmp.GetWidth();
+  const int h = srcBmp.GetHeight();
+  const double s = double(targetMax) / double(std::max(w, h));
+
+  const int newW = std::max(1, int(std::lround(w * s)));
+  const int newH = std::max(1, int(std::lround(h * s)));
+
+  wxImage img = srcBmp.ConvertToImage();
+  img.Rescale(newW, newH, wxIMAGE_QUALITY_HIGH);
+
+  return wxBitmap(img);
+}
+
+wxBEGIN_EVENT_TABLE(Application, wxApp) EVT_TIMER(wxID_ANY, Application::OnSplashDismissTimer)
+    wxEND_EVENT_TABLE()
+
+        bool Application::OnInit()
+{
+  wxApp::OnInit();
+
+  const wxBitmap bitmap(gambitbig_xpm);
+  m_splashTimer.Start();
+  m_splash = new wxSplashScreen(MakeScaledSplashBitmap(bitmap, 0.45),
+                                wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, nullptr,
+                                wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE);
+  m_splash->Show();
+  m_splash->Update();
   wxConfigBase::Set(new wxConfig(_T("Gambit"), _T("Gambit")));
   m_fileHistory.Load(*wxConfigBase::Get());
   // Immediately saving this back forces the entries to be created at
@@ -47,12 +83,6 @@ bool Application::OnInit()
   // m_fileHistory.Save(config);
   wxConfigBase::Get()->Read(_T("/General/CurrentDirectory"), &m_currentDir, _T(""));
 
-  const wxBitmap bitmap(gambitbig_xpm);
-  /*wxSplashScreen *splash =*/
-  new wxSplashScreen(bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_TIMEOUT, 2000, nullptr, -1,
-                     wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER | wxSTAY_ON_TOP);
-  wxYield();
-
   // Process command line arguments, if any.
   for (int i = 1; i < wxApp::argc; i++) {
     const AppLoadResult result = LoadFile(wxApp::argv[i]);
@@ -86,9 +116,30 @@ bool Application::OnInit()
   // Set up the help system.
   wxInitAllImageHandlers();
 
+  this->CallAfter(&Application::DismissSplash);
+
   return true;
 }
 
+void Application::DismissSplash()
+{
+  if (!m_splash) {
+    return;
+  }
+
+  const long minDisplay = 1000;
+  const long elapsed = m_splashTimer.Time();
+
+  if (elapsed < minDisplay) {
+    m_splashDismissTimer.SetOwner(this);
+    m_splashDismissTimer.StartOnce(minDisplay - elapsed);
+    return;
+  }
+
+  m_splash->Destroy();
+  m_splash = nullptr;
+}
+
 AppLoadResult Application::LoadFile(const wxString &p_filename)
 {
   std::ifstream infile((const char *)p_filename.mb_str());

src/gui/app.cc

@@ -26,6 +26,7 @@
 #include <wx/wx.h>
 #include <wx/config.h>  // for wxConfig
 #include <wx/docview.h> // for wxFileHistory
+#include <wx/splash.h>
 
 namespace Gambit::GUI {
 
@@ -37,8 +38,15 @@ class Application final : public wxApp {
   wxString m_currentDir; /* Current position in directory tree. */
   wxFileHistory m_fileHistory{10};
   std::list<GameDocument *> m_documents;
+  wxSplashScreen *m_splash{nullptr};
+  wxStopWatch m_splashTimer;
+  wxTimer m_splashDismissTimer;
 
   bool OnInit() override;
+  void DismissSplash();
+  void OnSplashDismissTimer(wxTimerEvent &) { DismissSplash(); }
+
+  wxDECLARE_EVENT_TABLE();
 
 public:
   Application() = default;