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/preprocessing/passes | |
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/preprocessing/passes')
-rw-r--r-- | src/preprocessing/passes/ite_removal.cpp | 2 | ||||
-rw-r--r-- | src/preprocessing/passes/quantifier_macros.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/preprocessing/passes/ite_removal.cpp b/src/preprocessing/passes/ite_removal.cpp index 0a35e32eb..f788338be 100644 --- a/src/preprocessing/passes/ite_removal.cpp +++ b/src/preprocessing/passes/ite_removal.cpp @@ -57,7 +57,7 @@ PreprocessingPassResult IteRemoval::applyInternal(AssertionPipeline* assertions) imap[assertions->size()] = newSkolems[j]; assertions->pushBackTrusted(newAsserts[j]); // new assertions have a dependence on the node (old pf architecture) - if (options::unsatCores() && !options::proofNew()) + if (options::unsatCores() && !options::proof()) { ProofManager::currentPM()->addDependence(newAsserts[j].getProven(), assertion); diff --git a/src/preprocessing/passes/quantifier_macros.cpp b/src/preprocessing/passes/quantifier_macros.cpp index eef0326b6..840cb4c66 100644 --- a/src/preprocessing/passes/quantifier_macros.cpp +++ b/src/preprocessing/passes/quantifier_macros.cpp @@ -81,7 +81,7 @@ bool QuantifierMacros::simplify(AssertionPipeline* ap, bool doRewrite) for( int i=0; i<(int)assertions.size(); i++ ){ Trace("macros-debug") << " process assertion " << assertions[i] << std::endl; if( processAssertion( assertions[i] ) ){ - if (options::unsatCores() && !options::proofNew() + if (options::unsatCores() && !options::proof() && std::find(macro_assertions.begin(), macro_assertions.end(), assertions[i]) @@ -107,7 +107,7 @@ bool QuantifierMacros::simplify(AssertionPipeline* ap, bool doRewrite) // is an over-approximation. a more fine-grained unsat core // computation would require caching dependencies for each subterm of // the formula, which is expensive. - if (options::unsatCores() && !options::proofNew()) + if (options::unsatCores() && !options::proof()) { ProofManager::currentPM()->addDependence(curr, assertions[i]); for (unsigned j = 0; j < macro_assertions.size(); j++) |