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

fix

Browse Source
This commit is contained in:
lperron@google.com
2014-05-21 13:50:10 +00:00
parent e8fb639bff
commit 3fc3bb9b3a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/constraint_solver/expressions.cc
View File

@@ -5811,7 +5811,7 @@ IntVar* Solver::MakeBoolVar() {
}
IntVar* Solver::MakeIntVar(const std::vector<int64>& values, const std::string& name) {
const vector<int64> cleaned = SortedNoDuplicates(values);
const std::vector<int64> cleaned = SortedNoDuplicates(values);
int64 gcd = 0;
for (int64 v : cleaned) {
if (v == 0) {
@@ -5829,7 +5829,7 @@ IntVar* Solver::MakeIntVar(const std::vector<int64>& values, const std::string&
if (gcd == 1) {
return RegisterIntVar(RevAlloc(new DomainIntVar(this, cleaned, name)));
} else {
vector<int64> new_values;
std::vector<int64> new_values;
new_values.reserve(values.size());
for (int64 v : cleaned) {
DCHECK_EQ(0, v % gcd);

1
src/constraint_solver/table.cc
View File

@@ -1175,6 +1175,7 @@ class SmallCompactPositiveTableConstraint : public BasePositiveTableConstraint {
};
bool HasCompactDomains(const std::vector<IntVar*>& vars) {
return true;
int64 sum_of_spans = 0LL;
int64 sum_of_sizes = 0LL;
for (IntVar* const var : vars) {