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

revert last commit

Browse Source
This commit is contained in:
Laurent Perron
2018-12-01 16:06:18 +01:00
parent 7ca7fc393a
commit 8b6da37ed5
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
examples/cpp/jobshop_sat.cc
View File

@@ -53,13 +53,14 @@ 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;
@@ -78,14 +79,14 @@ int64 ComputeHorizon(const JsspInputProblem& problem) {
for (int i = 0; i < num_jobs; ++i) {
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));
max_transition = std::max<int64>(
max_transition, matrix.transition_time(i * num_jobs + j));
}
sum_of_transitions += max_transition;
}
}
return std::min(max_latest_end, sum_of_durations + sum_of_transitions +
max_earliest_start);
return std::min<int64>(max_latest_end, sum_of_durations + sum_of_transitions +
max_earliest_start);
// TODO(user): Uses transitions.
}
@@ -138,8 +139,8 @@ void Solve(const JsspInputProblem& problem) {
int64 min_duration = task.duration(0);
int64 max_duration = task.duration(0);
for (int i = 1; i < num_alternatives; ++i) {
min_duration = std::min(min_duration, task.duration(i));
max_duration = std::max(max_duration, task.duration(i));
min_duration = std::min<int64>(min_duration, task.duration(i));
max_duration = std::max<int64>(max_duration, task.duration(i));
}
const IntVar start = cp_model.NewIntVar(Domain(hard_start, hard_end));
const IntVar duration =