Conversation
set default branch to patch for patch branch
Patch to develop w ci 2025
Address SAM issue 1552 along with SAM branch SAM_1552
Patch to develop 7/23/25
matrix.h had unknown function nrows() and ncols() that should not have compiled
Update organization name in README.md
License update
* updates to c++20 for or-tools compatibility on Windows * testing using release versions of wxWidgets * Working on release versions for wxWidgets libraries * wxWidgets in top level - all but export_config building on Windows * fix issue with wex runner for Windows CMakeLists.txt * Fix broken wexsandbox and DView debug version build on Windows * Fix issue with wex GA Windows runner * Updates for Windows debug build for GA runners * Update all c++ cmake commands to be consistent with ortools v9.14 if(MSVC) set(CMAKE_CXX_STANDARD 20) else() set(CMAKE_CXX_STANDARD 17) endif() * All CMakeLists.txt set(CMAKE_CXX_STANDARD 20) per 2/28/2026 meeting
Fix debug build for Windows and ortools per email 3/16/2026
Rename NREL throughout code
Update Windows runner version in CI workflow
This avoids issue with information written to Windows registry and Mac/Linux config files not being correctly loaded for 2026 versions of SAM/DView and later. An alternative approach would be to add a condition when "NREL" entries in the Windows registry or Mac/Linux configuration files exist to read them and copy them to new "NLR" entries. The alternative approach would require more time and testing to implement than this simple approach of preserving the "NREL" entries.
…r-backward-compatibility Reverts wxConfig to NREL for backward compatibility
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Develop to main for SAM 2026.7.3