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

Remove deprecated methods

Browse Source
This commit is contained in:
Laurent Perron
2022-01-05 09:41:54 +01:00
parent ceabca677c
commit 8f3fd9cff2
2 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ortools/sat/cp_model.cc
View File

@@ -245,24 +245,6 @@ LinearExpr LinearExpr::Term(BoolVar var, int64_t coefficient) {
return result;
}
LinearExpr LinearExpr::BooleanSum(absl::Span<const BoolVar> vars) {
LinearExpr result;
for (const BoolVar& var : vars) {
result.AddVar(var);
}
return result;
}
LinearExpr LinearExpr::BooleanWeightedSum(absl::Span<const BoolVar> vars,
absl::Span<const int64_t> coeffs) {
CHECK_EQ(vars.size(), coeffs.size());
LinearExpr result;
for (int i = 0; i < vars.size(); ++i) {
result.AddTerm(vars[i], coeffs[i]);
}
return result;
}
LinearExpr& LinearExpr::AddConstant(int64_t value) {
constant_ += value;
return *this;

7
ortools/sat/cp_model.h
View File

@@ -279,13 +279,6 @@ class LinearExpr {
/// Constructs bool * coefficient.
static LinearExpr Term(BoolVar var, int64_t coefficient);
/// Deprecated. Use Sum() instead.
static LinearExpr BooleanSum(absl::Span<const BoolVar> vars);
/// Deprecated. Use WeightedSum() instead.
static LinearExpr BooleanWeightedSum(absl::Span<const BoolVar> vars,
absl::Span<const int64_t> coeffs);
/// Constructs a linear expr from its proto representation.
static LinearExpr FromProto(const LinearExpressionProto& proto);