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

polish cumulative presolve in CP-SAT

Browse Source
This commit is contained in:
Laurent Perron
2019-04-01 11:38:02 +02:00
parent 0b1cedf79e
commit f8eb8bb5db
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ortools/sat/cp_model_presolve.cc
View File

@@ -2245,17 +2245,18 @@ bool PresolveCumulative(ConstraintProto* ct, PresolveContext* context) {
// Filter absent intervals.
int new_size = 0;
bool changed = false;
int removed_zero_demands = 0;
int num_zero_demand_removed = 0;
for (int i = 0; i < proto.intervals_size(); ++i) {
if (context->working_model->constraints(proto.intervals(i))
.constraint_case() ==
ConstraintProto::ConstraintCase::CONSTRAINT_NOT_SET) {
continue;
}
const int demand_ref = proto.demands(i);
const int64 demand_max = context->MaxOf(demand_ref);
if (demand_max == 0) {
removed_zero_demands++;
num_zero_demand_removed++;
continue;
}
@@ -2269,8 +2270,8 @@ bool PresolveCumulative(ConstraintProto* ct, PresolveContext* context) {
ct->mutable_cumulative()->mutable_demands()->Truncate(new_size);
}
if (removed_zero_demands > 0) {
context->UpdateRuleStats("cumulative: removed null demands");
if (num_zero_demand_removed > 0) {
context->UpdateRuleStats("cumulative: removed intervals with no demands");
}
if (HasEnforcementLiteral(*ct)) return changed;

4
ortools/sat/cp_model_solver.cc
View File

@@ -2100,12 +2100,12 @@ CpSolverResponse SolveCpModelWithLNS(
total_num_calls++;
generators[selected_generator]->AddSolveData(
objective_diff, local_response.deterministic_time());
// TODO(user): Print the status in a better format.
VLOG(2)
<< generators[selected_generator]->name()
<< ": [difficulty: " << difficulty.value()
<< ", deterministic time: " << local_response.deterministic_time()
<< ", status: " << local_response.status()
<< ", status: "
<< ProtoEnumToString<CpSolverStatus>(local_response.status())
<< ", num calls: " << generators[selected_generator]->num_calls()
<< ", UCB1 Score: "
<< generators[selected_generator]->GetUCBScore(total_num_calls)