deep sync with base library renaming; lint checking; Speedup sat; new crash procedure for glop

This commit is contained in:
Laurent Perron
2018-08-28 11:19:49 +02:00
parent 77e76c1572
commit 4caaef3c23
129 changed files with 1584 additions and 1020 deletions

View File

@@ -21,6 +21,7 @@
#include "ortools/algorithms/dynamic_partition.h"
#include "ortools/base/adjustable_priority_queue-inl.h"
#include "ortools/base/logging.h"
#include "ortools/base/memory.h"
#include "ortools/base/random.h"
#include "ortools/base/stl_util.h"
#include "ortools/base/timer.h"
@@ -1222,7 +1223,7 @@ SatSolver::Status SolveWithPresolve(std::unique_ptr<SatSolver>* solver,
VLOG(1) << "UNSAT during presolve.";
// This is just here to reset the SatSolver::Solve() satistics.
(*solver).reset(new SatSolver());
(*solver) = absl::make_unique<SatSolver>();
return SatSolver::INFEASIBLE;
}
@@ -1232,7 +1233,7 @@ SatSolver::Status SolveWithPresolve(std::unique_ptr<SatSolver>* solver,
}
// Load the presolved problem in a new solver.
(*solver).reset(new SatSolver());
(*solver) = absl::make_unique<SatSolver>();
(*solver)->SetDratProofHandler(drat_proof_handler);
(*solver)->SetParameters(parameters);
presolver.LoadProblemIntoSatSolver((*solver).get());