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

fix jobshop_sat

Browse Source
This commit is contained in:
Laurent Perron
2018-09-12 18:32:05 +02:00
parent 34f8cf3f6a
commit b676ac3c70
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/cpp/jobshop_sat.cc
View File

@@ -55,13 +55,13 @@ int64 ComputeHorizon(const JsspInputProblem& problem) {
int64 max_earliest_start = 0;
for (const Job& job : problem.jobs()) {
if (job.has_latest_end()) {
max_latest_end = std::max(max_latest_end, job.latest_end().value());
max_latest_end = std::max<int64>(max_latest_end, job.latest_end().value());
} else {
max_latest_end = kint64max;
}
if (job.has_earliest_start()) {
max_earliest_start =
std::max(max_earliest_start, job.earliest_start().value());
std::max<int64>(max_earliest_start, job.earliest_start().value());
}
for (const Task& task : job.tasks()) {
int64 max_duration = 0;
@@ -81,7 +81,7 @@ int64 ComputeHorizon(const JsspInputProblem& problem) {
int64 max_transition = 0;
for (int j = 0; j < num_jobs; ++j) {
max_transition =
std::max(max_transition, matrix.transition_time(i * num_jobs + j));
std::max<int64>(max_transition, matrix.transition_time(i * num_jobs + j));
}
sum_of_transitions += max_transition;
}