diff options
author | Mathias Preiner <mathias.preiner@gmail.com> | 2018-03-06 16:54:06 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-06 16:54:06 -0800 |
commit | c6b2e085d4eb2c232a528a96e13fc7b65fd98fea (patch) | |
tree | 632708f158acc6a3b5b3201212fa2ba1a0606c30 /src/proof | |
parent | 612bb0013f180a7d414f0a4b1e770aaa7ed09152 (diff) |
Make statistics output consistent. (#1647)
* Fixes --hide-zero-stats (and really skips the 0 values)
* Removes the additional newline after each statistic
* Introduces theory::getStatsPrefix(TheoryId) to generate consistent
prefixes for statistics based on the theory id
(e.g., THEORY_BV -> "theory::bv").
Diffstat (limited to 'src/proof')
-rw-r--r-- | src/proof/array_proof.cpp | 4 | ||||
-rw-r--r-- | src/proof/proof_manager.cpp | 2 | ||||
-rw-r--r-- | src/proof/theory_proof.cpp | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/proof/array_proof.cpp b/src/proof/array_proof.cpp index 511a82617..b0290fb3e 100644 --- a/src/proof/array_proof.cpp +++ b/src/proof/array_proof.cpp @@ -1232,9 +1232,9 @@ std::string ArrayProof::skolemToLiteral(Expr skolem) { } void LFSCArrayProof::printOwnedTerm(Expr term, std::ostream& os, const ProofLetMap& map) { - Assert (theory::Theory::theoryOf(term) == theory::THEORY_ARRAY); + Assert (theory::Theory::theoryOf(term) == theory::THEORY_ARRAYS); - if (theory::Theory::theoryOf(term) != theory::THEORY_ARRAY) { + if (theory::Theory::theoryOf(term) != theory::THEORY_ARRAYS) { // We can get here, for instance, if there's a (select ite ...), e.g. a non-array term // hiding as a subterm of an array term. In that case, send it back to the dispatcher. d_proofEngine->printBoundTerm(term, os, map); diff --git a/src/proof/proof_manager.cpp b/src/proof/proof_manager.cpp index 89adf6c2b..f0fdf38b5 100644 --- a/src/proof/proof_manager.cpp +++ b/src/proof/proof_manager.cpp @@ -123,7 +123,7 @@ BitVectorProof* ProofManager::getBitVectorProof() { ArrayProof* ProofManager::getArrayProof() { Assert (options::proof()); - TheoryProof* pf = getTheoryProofEngine()->getTheoryProof(theory::THEORY_ARRAY); + TheoryProof* pf = getTheoryProofEngine()->getTheoryProof(theory::THEORY_ARRAYS); return (ArrayProof*)pf; } diff --git a/src/proof/theory_proof.cpp b/src/proof/theory_proof.cpp index 47a1191ad..0dd573dc6 100644 --- a/src/proof/theory_proof.cpp +++ b/src/proof/theory_proof.cpp @@ -83,7 +83,7 @@ void TheoryProofEngine::registerTheory(theory::Theory* th) { return; } - if (id == theory::THEORY_ARRAY) { + if (id == theory::THEORY_ARRAYS) { d_theoryProofTable[id] = new LFSCArrayProof((theory::arrays::TheoryArrays*)th, this); return; } @@ -169,9 +169,9 @@ void TheoryProofEngine::registerTerm(Expr term) { // A special case: the array theory needs to know of every skolem, even if // it belongs to another theory (e.g., a BV skolem) - if (ProofManager::getSkolemizationManager()->isSkolem(term) && theory_id != theory::THEORY_ARRAY) { + if (ProofManager::getSkolemizationManager()->isSkolem(term) && theory_id != theory::THEORY_ARRAYS) { Debug("pf::tp::register") << "TheoryProofEngine::registerTerm: registering a non-array skolem: " << term << std::endl; - getTheoryProof(theory::THEORY_ARRAY)->registerTerm(term); + getTheoryProof(theory::THEORY_ARRAYS)->registerTerm(term); } d_registrationCache.insert(term); @@ -272,7 +272,7 @@ void LFSCTheoryProofEngine::printSort(Type type, std::ostream& os) { } if (type.isArray()) { - getTheoryProof(theory::THEORY_ARRAY)->printOwnedSort(type, os); + getTheoryProof(theory::THEORY_ARRAYS)->printOwnedSort(type, os); return; } @@ -989,7 +989,7 @@ void TheoryProof::printTheoryLemmaProof(std::vector<Expr>& lemma, th = new theory::uf::TheoryUF(&fakeContext, &fakeContext, oc, v, ProofManager::currentPM()->getLogicInfo(), "replay::"); - } else if (d_theory->getId()==theory::THEORY_ARRAY) { + } else if (d_theory->getId()==theory::THEORY_ARRAYS) { th = new theory::arrays::TheoryArrays(&fakeContext, &fakeContext, oc, v, ProofManager::currentPM()->getLogicInfo(), "replay::"); @@ -1067,7 +1067,7 @@ void TheoryProof::printTheoryLemmaProof(std::vector<Expr>& lemma, } bool TheoryProofEngine::supportedTheory(theory::TheoryId id) { - return (id == theory::THEORY_ARRAY || + return (id == theory::THEORY_ARRAYS || id == theory::THEORY_ARITH || id == theory::THEORY_BV || id == theory::THEORY_UF || |