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

remove template specialization in min/max after int64 revamp

Browse Source
This commit is contained in:
Laurent Perron
2018-12-01 15:20:35 +01:00
parent 123280f98e
commit 7ca7fc393a
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
examples/cpp/jobshop_sat.cc
View File

@@ -53,14 +53,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<int64>(max_latest_end, job.latest_end().value());
max_latest_end = std::max(max_latest_end, job.latest_end().value());
} else {
max_latest_end = kint64max;
}
if (job.has_earliest_start()) {
max_earliest_start =
std::max<int64>(max_earliest_start, job.earliest_start().value());
std::max(max_earliest_start, job.earliest_start().value());
}
for (const Task& task : job.tasks()) {
int64 max_duration = 0;
@@ -79,14 +78,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<int64>(
max_transition, matrix.transition_time(i * num_jobs + j));
max_transition =
std::max(max_transition, matrix.transition_time(i * num_jobs + j));
}
sum_of_transitions += max_transition;
}
}
return std::min<int64>(max_latest_end, sum_of_durations + sum_of_transitions +
max_earliest_start);
return std::min(max_latest_end, sum_of_durations + sum_of_transitions +
max_earliest_start);
// TODO(user): Uses transitions.
}
@@ -139,8 +138,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<int64>(min_duration, task.duration(i));
max_duration = std::max<int64>(max_duration, task.duration(i));
min_duration = std::min(min_duration, task.duration(i));
max_duration = std::max(max_duration, task.duration(i));
}
const IntVar start = cp_model.NewIntVar(Domain(hard_start, hard_end));
const IntVar duration =

3
ortools/bop/bop_base.cc
View File

@@ -78,8 +78,7 @@ ProblemState::ProblemState(const LinearBooleanProblem& problem)
const LinearObjective& objective = problem.objective();
lower_bound_ = 0;
for (int i = 0; i < objective.coefficients_size(); ++i) {
// Fix template version for or-tools.
lower_bound_ += std::min<int64>(0LL, objective.coefficients(i));
lower_bound_ += std::min(0LL, objective.coefficients(i));
}
upper_bound_ = solution_.IsFeasible() ? solution_.GetCost() : kint64max;
}

10
ortools/flatzinc/presolve.cc
View File

@@ -1962,14 +1962,14 @@ Presolver::RuleStatus Presolver::PresolveSimplifyElement(Constraint* ct,
if (ct->arguments[0].IsVariable()) {
absl::flat_hash_set<int64> all_values = GetValueSet(ct->arguments[2]);
const std::vector<int64>& array = ct->arguments[1].values;
const int array_size = array.size();
const int64 array_size = array.size();
if (!all_values.empty()) {
const Domain& domain = ct->arguments[0].Var()->domain;
std::vector<int64> to_keep;
bool remove_some = false;
if (domain.is_interval) {
for (int64 v = std::max<int64>(1, domain.values[0]);
v <= std::min<int64>(array_size, domain.values[1]); ++v) {
for (int64 v = std::max(1LL, domain.values[0]);
v <= std::min(array_size, domain.values[1]); ++v) {
const int64 value = array[v - 1];
if (gtl::ContainsKey(all_values, value)) {
to_keep.push_back(v);
@@ -2106,11 +2106,11 @@ Presolver::RuleStatus Presolver::PresolveSimplifyExprElement(Constraint* ct,
if (ct->arguments[0].IsVariable()) {
const Domain& domain = ct->arguments[0].Var()->domain;
std::vector<int64> to_keep;
const int array_size = ct->arguments[1].variables.size();
const int64 array_size = ct->arguments[1].variables.size();
bool remove_some = false;
if (domain.is_interval) {
for (int64 v = std::max<int64>(1, domain.values[0]);
v <= std::min<int64>(array_size, domain.values[1]); ++v) {
v <= std::min(array_size, domain.values[1]); ++v) {
if (OverlapsAt(ct->arguments[1], v - 1, ct->arguments[2])) {
to_keep.push_back(v);
} else {