diff options
| author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2021-02-22 16:07:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 16:07:16 -0600 |
| commit | 71d72df0437607723256bbd7b4f28cd6c89fe40f (patch) | |
| tree | 1021b9e166290db4637a0be447da359d0aed4752 /src/prop/minisat | |
| parent | 580f3e93c2cc4564e6fa87d07426dc1ff87224e4 (diff) | |
(proof-new) Change proof-new option to proof (#5955)
Also moves several proof-specific options to proof_options.
Diffstat (limited to 'src/prop/minisat')
| -rw-r--r-- | src/prop/minisat/core/Solver.cc | 2 | ||||
| -rw-r--r-- | src/prop/minisat/minisat.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/prop/minisat/core/Solver.cc b/src/prop/minisat/core/Solver.cc index ab3b0cfe7..dbf734a3c 100644 --- a/src/prop/minisat/core/Solver.cc +++ b/src/prop/minisat/core/Solver.cc @@ -55,7 +55,7 @@ namespace { */ bool assertionLevelOnly() { - return (options::proofNew() || options::unsatCores()) + return (options::proof() || options::unsatCores()) && options::incrementalSolving(); } diff --git a/src/prop/minisat/minisat.cpp b/src/prop/minisat/minisat.cpp index c48df4998..d87b6fc45 100644 --- a/src/prop/minisat/minisat.cpp +++ b/src/prop/minisat/minisat.cpp @@ -160,7 +160,7 @@ ClauseId MinisatSatSolver::addClause(SatClause& clause, bool removable) { } d_minisat->addClause(minisat_clause, removable, clause_id); // FIXME: to be deleted when we kill old proof code for unsat cores - Assert(!options::unsatCores() || options::proofNew() + Assert(!options::unsatCores() || options::proof() || clause_id != ClauseIdError); return clause_id; } |