backport cp-sat code from main

This commit is contained in:
Laurent Perron
2024-03-21 11:34:50 +01:00
committed by Corentin Le Molgat
parent d4f9b80c95
commit 511bf047a7
52 changed files with 1086 additions and 607 deletions

View File

@@ -114,9 +114,9 @@ class CoreBasedOptimizer {
// - Support resuming for interleaved search.
// - Implement all core heurisitics.
SatSolver::Status OptimizeWithSatEncoding(
const std::vector<Literal>& literals,
const std::vector<IntegerVariable>& vars,
const std::vector<Coefficient>& coefficients, Coefficient offset);
absl::Span<const Literal> literals,
absl::Span<const IntegerVariable> vars,
absl::Span<const Coefficient> coefficients, Coefficient offset);
private:
CoreBasedOptimizer(const CoreBasedOptimizer&) = delete;
@@ -168,6 +168,7 @@ class CoreBasedOptimizer {
SatParameters* parameters_;
SatSolver* sat_solver_;
ClauseManager* clauses_;
TimeLimit* time_limit_;
BinaryImplicationGraph* implications_;
IntegerTrail* integer_trail_;