diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 08d255d8..32d274b1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -92,9 +92,9 @@ jobs: - uses: actions/checkout@v3 - name: Install SCIP run: | - wget -q https://github.com/scipopt/scip/releases/download/v10.0.0/scipoptsuite_10.0.0-1+jammy_amd64.deb + wget -q https://github.com/scipopt/scip/releases/download/v10.1.0/scipoptsuite_10.1.0-1+jammy_amd64.deb sudo apt update - sudo apt install -y ./scipoptsuite_10.0.0-1+jammy_amd64.deb + sudo apt install -y ./scipoptsuite_10.1.0-1+jammy_amd64.deb sudo apt install -y libmpfr-dev libboost-all-dev - name: Build SCIP++ run: | diff --git a/changelog.md b/changelog.md index 5d10f554..f6446801 100644 --- a/changelog.md +++ b/changelog.md @@ -4,6 +4,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] - [Doc:Unreleased] +### Changed + +- [PR45](https://github.com/scipopt/SCIPpp/pull/45) Update to SCIP 10.1.0. + ## [1.4.0] - 2025-12-18 ### Added diff --git a/conanfile.py b/conanfile.py index 28228a48..ad9369d3 100644 --- a/conanfile.py +++ b/conanfile.py @@ -73,7 +73,7 @@ def layout(self): cmake_layout(self) def requirements(self): - self.requires("scip/10.0.0", transitive_headers=True) + self.requires("scip/10.1.0", transitive_headers=True) if self.options.with_tests: self.requires("boost/[>=1.84.0 <2]") # required only for tests diff --git a/include/scippp/parameters.hpp b/include/scippp/parameters.hpp index 6e077e16..bf2d71f1 100644 --- a/include/scippp/parameters.hpp +++ b/include/scippp/parameters.hpp @@ -1,7 +1,7 @@ #pragma once // This file is automatically generated using gen_constexpr_parameters from the utils -// updated for SCIP 10.0.0 +// updated for SCIP 10.1.0 #include "scippp/param.hpp" #undef INFINITY @@ -623,6 +623,8 @@ namespace CONCURRENT { constexpr Param COMMVARBNDS { "concurrent/commvarbnds" }; //! should the problem be presolved before it is copied to the concurrent solvers? constexpr Param PRESOLVEBEFORE { "concurrent/presolvebefore" }; + //! should symmetry be computed before concurrent solving? + constexpr Param SYMMETRYBEFORE { "concurrent/symmetrybefore" }; //! maximum number of solutions that will be shared in a one synchronization constexpr Param INITSEED { "concurrent/initseed" }; //! path prefix for parameter setting files of concurrent solvers @@ -1409,6 +1411,8 @@ namespace CONSTRAINTS::KNAPSACK { //! factor on the growth of global cliques to decide when to update a previous (negated) clique partition (used only //! if updatecliquepartitions is set to TRUE) constexpr Param CLQPARTUPDATEFAC { "constraints/knapsack/clqpartupdatefac" }; + //! should knapsack constraints be copied as knapsack instead of as linear constraints? + constexpr Param COPYTYPEDCONS { "constraints/knapsack/copytypedcons" }; } //! Parameters with prefix constraints/linear namespace CONSTRAINTS::LINEAR { @@ -1566,6 +1570,8 @@ namespace CONSTRAINTS::LOGICOR { constexpr Param IMPLICATIONS { "constraints/logicor/implications" }; //! should pairwise constraint comparison try to strengthen constraints by removing superflous non-zeros? constexpr Param STRENGTHEN { "constraints/logicor/strengthen" }; + //! should logicor constraints be copied as logicor instead of as linear constraints? + constexpr Param COPYTYPEDCONS { "constraints/logicor/copytypedcons" }; } //! Parameters with prefix constraints/nonlinear namespace CONSTRAINTS::NONLINEAR { @@ -1851,6 +1857,8 @@ namespace CONSTRAINTS::SETPPC { //! should we try to shrink the number of variables in a clique constraints, by replacing more than one variable by //! only one constexpr Param CLIQUESHRINKING { "constraints/setppc/cliqueshrinking" }; + //! should setppc constraints be copied as setppc instead of as linear constraints? + constexpr Param COPYTYPEDCONS { "constraints/setppc/copytypedcons" }; } //! Parameters with prefix constraints/sos1 namespace CONSTRAINTS::SOS1 { @@ -2045,6 +2053,8 @@ namespace CONSTRAINTS::VARBOUND { constexpr Param MAXLPCOEF { "constraints/varbound/maxlpcoef" }; //! should bound widening be used in conflict analysis? constexpr Param USEBDWIDENING { "constraints/varbound/usebdwidening" }; + //! should varbound constraints be copied as varbound instead of as linear constraints? + constexpr Param COPYTYPEDCONS { "constraints/varbound/copytypedcons" }; } //! Parameters with prefix constraints/xor namespace CONSTRAINTS::XOR { @@ -7280,9 +7290,9 @@ namespace SEPARATING::ZEROHALF { } //! Parameters with prefix solvingphases namespace SOLVINGPHASES { - //! should the event handler adapt the solver behavior? + //! is the event handler enabled? constexpr Param ENABLED { "solvingphases/enabled" }; - //! should the event handler test all phase transitions? + //! should the event handler only determine phase transitions, suppressing settings changes? constexpr Param TESTMODE { "solvingphases/testmode" }; //! settings file for feasibility phase -- precedence over emphasis settings constexpr Param FEASSETNAME { "solvingphases/feassetname" };