always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

constraint_solver: Export from google3

Browse Source 
* replace some std::vector by absl::Span
* cleanup some headers include
This commit is contained in:
Corentin Le Molgat
2024-01-19 17:57:04 +01:00
parent 96059b96f0
commit 653be26d29
27 changed files with 505 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ortools/constraint_solver/expr_array.cc
View File

@@ -2868,7 +2868,7 @@ Constraint* MakeScalProdEqualityFct(Solver* const solver,
Constraint* MakeScalProdEqualityVarFct(Solver* const solver,
const std::vector<IntVar*>& pre_vars,
const std::vector<int64_t>& pre_coefs,
absl::Span<const int64_t> pre_coefs,
IntVar* const target) {
int64_t constant = 0;
std::vector<IntVar*> vars;
@@ -2898,7 +2898,7 @@ Constraint* MakeScalProdEqualityVarFct(Solver* const solver,
Constraint* MakeScalProdGreaterOrEqualFct(Solver* solver,
const std::vector<IntVar*>& pre_vars,
const std::vector<int64_t>& pre_coefs,
absl::Span<const int64_t> pre_coefs,
int64_t cst) {
int64_t constant = 0;
std::vector<IntVar*> vars;
@@ -2933,7 +2933,7 @@ Constraint* MakeScalProdGreaterOrEqualFct(Solver* solver,
Constraint* MakeScalProdLessOrEqualFct(Solver* solver,
const std::vector<IntVar*>& pre_vars,
const std::vector<int64_t>& pre_coefs,
absl::Span<const int64_t> pre_coefs,
int64_t upper_bound) {
int64_t constant = 0;
std::vector<IntVar*> vars;
@@ -3200,7 +3200,7 @@ IntExpr* MakeScalProdAux(Solver* solver, const std::vector<IntVar*>& vars,
}
IntExpr* MakeScalProdFct(Solver* solver, const std::vector<IntVar*>& pre_vars,
const std::vector<int64_t>& pre_coefs) {
absl::Span<const int64_t> pre_coefs) {
int64_t constant = 0;
std::vector<IntVar*> vars;
std::vector<int64_t> coefs;