diff options
| author | Morgan Deters <mdeters@gmail.com> | 2010-06-30 11:12:14 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2010-06-30 11:12:14 +0000 |
| commit | 4375b60d5df794b2c6193f3892185ea181a0748d (patch) | |
| tree | d346f9dc6bde42c3def6e0aac3b2711418e3d491 /src/prop/sat.cpp | |
| parent | 4206a75e7a1635d04bb69084404a75670e164b62 (diff) | |
* theory "tree" rewriting implemented and works
* added TheoryArith::preRewrite() to test and demonstrate
the use of pre-rewriting.
* array types and type checking now supported
* array type checking now supported
* theoryOf() dispatching properly to arrays now
* theories now required to implement a (simple) identify()
function that returns a string identifying them for
debugging/user output purposes
* added "builtin" theory to hold all built-in kinds and their
type rules and rewriting (currently only exploding distinct)
* fixed production build failure (regarding NodeSetDepth)
* removed an errant "using namespace std" in util/bitvector.h
(and made associated trivial fixes elsewhere)
* fixes to make unexpected exceptions more verbose in debug builds
* fixes to make multiple, cascading assertion fails simpler
* minor other fixes to comments etc.
Diffstat (limited to 'src/prop/sat.cpp')
| -rw-r--r-- | src/prop/sat.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/prop/sat.cpp b/src/prop/sat.cpp index a7b536a57..64efedd8a 100644 --- a/src/prop/sat.cpp +++ b/src/prop/sat.cpp @@ -55,7 +55,7 @@ void SatSolver::theoryPropagate(std::vector<SatLiteral>& output) { // If any literals, make a clause const unsigned i_end = outputNodes.size(); for (unsigned i = 0; i < i_end; ++ i) { - Debug("prop-explain") << "theoryPropagate() => " << outputNodes[i].toString() << endl; + Debug("prop-explain") << "theoryPropagate() => " << outputNodes[i].toString() << std::endl; // The second argument ("true") instructs the CNF stream to create // a new literal mapping if it doesn't exist. This can happen due // to a circular dependence, if a SAT literal "a" is asserted as a @@ -68,9 +68,9 @@ void SatSolver::theoryPropagate(std::vector<SatLiteral>& output) { void SatSolver::explainPropagation(SatLiteral l, SatClause& explanation) { TNode lNode = d_cnfStream->getNode(l); - Debug("prop-explain") << "explainPropagation(" << lNode.toString() << ")" << endl; + Debug("prop-explain") << "explainPropagation(" << lNode.toString() << ")" << std::endl; Node theoryExplanation = d_theoryEngine->getExplanation(lNode); - Debug("prop-explain") << "explainPropagation() => " << theoryExplanation.toString() << endl; + Debug("prop-explain") << "explainPropagation() => " << theoryExplanation.toString() << std::endl; if (lNode.getKind() == kind::AND) { Node::const_iterator it = theoryExplanation.begin(); Node::const_iterator it_end = theoryExplanation.end(); |