diff options
| author | Morgan Deters <mdeters@gmail.com> | 2011-09-02 20:41:08 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2011-09-02 20:41:08 +0000 |
| commit | 1d18e5ebed9a5b20ed6a8fe21d11842acf6fa7ea (patch) | |
| tree | 7074f04453914bc377ff6aeb307dd17b82b76ff3 /src/prop/prop_engine.cpp | |
| parent | 74770f1071e6102795393cf65dd0c651038db6b4 (diff) | |
Merge from my post-smtcomp branch. Includes:
Dumping infrastructure. Can dump preprocessed queries and clauses. Can
also dump queries (for testing with another solver) to see if any conflicts
are missed, T-propagations are missed, all lemmas are T-valid, etc. For a
full list of options see --dump=help.
CUDD building much cleaner.
Documentation and assertion fixes.
Printer improvements, printing of commands in language-defined way, etc.
Typechecker stuff in expr package now autogenerated, no need to manually
edit the expr package when adding a new theory.
CVC3 compatibility layer (builds as libcompat).
SWIG detection and language binding support (infrastructure).
Support for some Z3 extended commands (like datatypes) in SMT-LIBv2 mode
(when not in compliance mode).
Copyright and file headers regenerated.
Diffstat (limited to 'src/prop/prop_engine.cpp')
| -rw-r--r-- | src/prop/prop_engine.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/prop/prop_engine.cpp b/src/prop/prop_engine.cpp index 046e4ef7e..c8e4083b1 100644 --- a/src/prop/prop_engine.cpp +++ b/src/prop/prop_engine.cpp @@ -2,8 +2,8 @@ /*! \file prop_engine.cpp ** \verbatim ** Original author: mdeters - ** Major contributors: taking, cconway, dejan - ** Minor contributors (to current version): none + ** Major contributors: dejan + ** Minor contributors (to current version): barrett, taking, cconway ** This file is part of the CVC4 prototype. ** Copyright (c) 2009, 2010, 2011 The Analysis of Computer Systems Group (ACSys) ** Courant Institute of Mathematical Sciences @@ -90,14 +90,10 @@ void PropEngine::assertLemma(TNode node, bool negated, bool removable) { //Assert(d_inCheckSat, "Sat solver should be in solve()!"); Debug("prop::lemmas") << "assertLemma(" << node << ")" << endl; - if(Options::current()->preprocessOnly) { - if(Message.isOn()) { - // If "preprocess only" mode is in effect, the lemmas we get - // here are due to theory reasoning during preprocessing. So - // push the lemma to the Message() stream. - expr::ExprSetDepth::Scope sdScope(Message.getStream(), -1); - Message() << AssertCommand(BoolExpr(node.toExpr())) << endl; - } + if(!d_inCheckSat && Dump.isOn("learned")) { + Dump("learned") << AssertCommand(BoolExpr(node.toExpr())) << endl; + } else if(Dump.isOn("lemmas")) { + Dump("lemmas") << AssertCommand(BoolExpr(node.toExpr())) << endl; } //TODO This comment is now false |