Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
16 changes: 13 additions & 3 deletions include/scippp/parameters.hpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -623,6 +623,8 @@ namespace CONCURRENT {
constexpr Param<bool> COMMVARBNDS { "concurrent/commvarbnds" };
//! should the problem be presolved before it is copied to the concurrent solvers?
constexpr Param<bool> PRESOLVEBEFORE { "concurrent/presolvebefore" };
//! should symmetry be computed before concurrent solving?
constexpr Param<bool> SYMMETRYBEFORE { "concurrent/symmetrybefore" };
//! maximum number of solutions that will be shared in a one synchronization
constexpr Param<int> INITSEED { "concurrent/initseed" };
//! path prefix for parameter setting files of concurrent solvers
Expand Down Expand Up @@ -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<double> CLQPARTUPDATEFAC { "constraints/knapsack/clqpartupdatefac" };
//! should knapsack constraints be copied as knapsack instead of as linear constraints?
constexpr Param<bool> COPYTYPEDCONS { "constraints/knapsack/copytypedcons" };
}
//! Parameters with prefix constraints/linear
namespace CONSTRAINTS::LINEAR {
Expand Down Expand Up @@ -1566,6 +1570,8 @@ namespace CONSTRAINTS::LOGICOR {
constexpr Param<bool> IMPLICATIONS { "constraints/logicor/implications" };
//! should pairwise constraint comparison try to strengthen constraints by removing superflous non-zeros?
constexpr Param<bool> STRENGTHEN { "constraints/logicor/strengthen" };
//! should logicor constraints be copied as logicor instead of as linear constraints?
constexpr Param<bool> COPYTYPEDCONS { "constraints/logicor/copytypedcons" };
}
//! Parameters with prefix constraints/nonlinear
namespace CONSTRAINTS::NONLINEAR {
Expand Down Expand Up @@ -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<bool> CLIQUESHRINKING { "constraints/setppc/cliqueshrinking" };
//! should setppc constraints be copied as setppc instead of as linear constraints?
constexpr Param<bool> COPYTYPEDCONS { "constraints/setppc/copytypedcons" };
}
//! Parameters with prefix constraints/sos1
namespace CONSTRAINTS::SOS1 {
Expand Down Expand Up @@ -2045,6 +2053,8 @@ namespace CONSTRAINTS::VARBOUND {
constexpr Param<double> MAXLPCOEF { "constraints/varbound/maxlpcoef" };
//! should bound widening be used in conflict analysis?
constexpr Param<bool> USEBDWIDENING { "constraints/varbound/usebdwidening" };
//! should varbound constraints be copied as varbound instead of as linear constraints?
constexpr Param<bool> COPYTYPEDCONS { "constraints/varbound/copytypedcons" };
}
//! Parameters with prefix constraints/xor
namespace CONSTRAINTS::XOR {
Expand Down Expand Up @@ -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<bool> ENABLED { "solvingphases/enabled" };
//! should the event handler test all phase transitions?
//! should the event handler only determine phase transitions, suppressing settings changes?
constexpr Param<bool> TESTMODE { "solvingphases/testmode" };
//! settings file for feasibility phase -- precedence over emphasis settings
constexpr Param<std::string> FEASSETNAME { "solvingphases/feassetname" };
Expand Down
Loading