diff options
author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2017-10-11 06:11:46 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-11 06:11:46 -0500 |
commit | 3153e2d94d1b12562557d60305bcac52d3128b83 (patch) | |
tree | ef4740a54d489b61d92163024a8c516f38aae050 /src/proof | |
parent | 5e2c7c3a25d334c0068b423225f8ff7793260069 (diff) |
Move unsat core names to smt engine (#1192)
* Move unsat core names to SmtEnginePrivate. Adds a SetExpressionNameCommand to do this. Removes the names field from GetUnsatCoreCommand.
* Comment
* Pass expression names by reference.
* Update throw specifiers.
* Minor
* Switch expression names to CDMap, simplify interface for printing unsat core names.
* Revert throw specifier change.
* Minor simplifcations
Diffstat (limited to 'src/proof')
-rw-r--r-- | src/proof/unsat_core.cpp | 7 | ||||
-rw-r--r-- | src/proof/unsat_core.h | 8 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/proof/unsat_core.cpp b/src/proof/unsat_core.cpp index c8696868e..3e5e493f1 100644 --- a/src/proof/unsat_core.cpp +++ b/src/proof/unsat_core.cpp @@ -44,13 +44,6 @@ void UnsatCore::toStream(std::ostream& out) const { Printer::getPrinter(options::outputLanguage())->toStream(out, *this); } -void UnsatCore::toStream(std::ostream& out, const std::map<Expr, std::string>& names) const { - Assert(d_smt != NULL); - smt::SmtScope smts(d_smt); - expr::ExprDag::Scope scope(out, false); - Printer::getPrinter(options::outputLanguage())->toStream(out, *this, names); -} - std::ostream& operator<<(std::ostream& out, const UnsatCore& core) { core.toStream(out); return out; diff --git a/src/proof/unsat_core.h b/src/proof/unsat_core.h index 6f03dfa5e..46a368372 100644 --- a/src/proof/unsat_core.h +++ b/src/proof/unsat_core.h @@ -52,7 +52,7 @@ public: ~UnsatCore() {} /** get the smt engine that this unsat core is hooked up to */ - SmtEngine* getSmtEngine() { return d_smt; } + SmtEngine* getSmtEngine() const { return d_smt; } size_t size() const { return d_core.size(); } @@ -61,9 +61,11 @@ public: const_iterator begin() const; const_iterator end() const; - + + /** prints this UnsatCore object to the stream out. + * We use the expression names stored in the SmtEngine d_smt + */ void toStream(std::ostream& out) const; - void toStream(std::ostream& out, const std::map<Expr, std::string>& names) const; };/* class UnsatCore */ |