diff options
| author | Morgan Deters <mdeters@gmail.com> | 2012-03-09 21:10:17 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2012-03-09 21:10:17 +0000 |
| commit | 84f26af22566f7c10dea45b399b944cb50b5e317 (patch) | |
| tree | 68fbe22665cc09f46c321c6132e49dabbc15c337 /src/prop/minisat/core | |
| parent | f29ea80fb3e238278a721d79077c9087bccbac0b (diff) | |
Some work on the dump infrastructure to support portfolio work.
Dump("foo") << FooCommand(...);
now "dumps" the textual representation of the command (in the current
output language) to a file, IF dumping is on at configure-time, AND the
"muzzle" feature is off, AND the "foo" flag is turned on for the dump
stream during this run.
If it's a portfolio build, the above will also store the command in a
CommandSequence, IF the "foo" flag is turned on for the dump stream
during this run. This is done even if the muzzle is on.
This commit also cleans up some code that used the dump feature (in arrays,
particularly).
Diffstat (limited to 'src/prop/minisat/core')
| -rw-r--r-- | src/prop/minisat/core/Solver.cc | 2 | ||||
| -rw-r--r-- | src/prop/minisat/core/Solver.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/prop/minisat/core/Solver.cc b/src/prop/minisat/core/Solver.cc index ac3c5e101..980cb1b3f 100644 --- a/src/prop/minisat/core/Solver.cc +++ b/src/prop/minisat/core/Solver.cc @@ -322,7 +322,7 @@ void Solver::cancelUntil(int level) { for (int l = trail_lim.size() - level; l > 0; --l) { context->pop(); if(Dump.isOn("state")) { - Dump("state") << PopCommand() << std::endl; + Dump("state") << PopCommand(); } } for (int c = trail.size()-1; c >= trail_lim[level]; c--){ diff --git a/src/prop/minisat/core/Solver.h b/src/prop/minisat/core/Solver.h index 8a5472725..ca5b2c30f 100644 --- a/src/prop/minisat/core/Solver.h +++ b/src/prop/minisat/core/Solver.h @@ -454,7 +454,7 @@ inline bool Solver::addClause (Lit p, bool removable) inline bool Solver::addClause (Lit p, Lit q, bool removable) { add_tmp.clear(); add_tmp.push(p); add_tmp.push(q); return addClause_(add_tmp, removable); } inline bool Solver::addClause (Lit p, Lit q, Lit r, bool removable) { add_tmp.clear(); add_tmp.push(p); add_tmp.push(q); add_tmp.push(r); return addClause_(add_tmp, removable); } inline bool Solver::locked (const Clause& c) const { return value(c[0]) == l_True && isPropagatedBy(var(c[0]), c); } -inline void Solver::newDecisionLevel() { trail_lim.push(trail.size()); context->push(); if(Dump.isOn("state")) { Dump("state") << CVC4::PushCommand() << std::endl; } } +inline void Solver::newDecisionLevel() { trail_lim.push(trail.size()); context->push(); if(Dump.isOn("state")) { Dump("state") << CVC4::PushCommand(); } } inline int Solver::decisionLevel () const { return trail_lim.size(); } inline uint32_t Solver::abstractLevel (Var x) const { return 1 << (level(x) & 31); } |