diff options
| author | Tim King <taking@google.com> | 2016-02-02 09:47:34 -0800 |
|---|---|---|
| committer | Tim King <taking@google.com> | 2016-02-02 09:47:34 -0800 |
| commit | e21e99b7dfe45f042260db7eb754e25e7108f288 (patch) | |
| tree | 689bc1fead54d62b46c75196f8be0fb4b35444c9 /src/prop/minisat | |
| parent | 18973b31c440d998230aaba3e17bd915b168aa6f (diff) | |
Moving dump.*, command.*, model.*, and ite_removal.* from smt_util/ to smt/. Breaking an edge between the sat solver and command.h.
Diffstat (limited to 'src/prop/minisat')
| -rw-r--r-- | src/prop/minisat/core/Solver.cc | 8 | ||||
| -rw-r--r-- | src/prop/minisat/core/Solver.h | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/prop/minisat/core/Solver.cc b/src/prop/minisat/core/Solver.cc index f4489c4be..b7fb1603d 100644 --- a/src/prop/minisat/core/Solver.cc +++ b/src/prop/minisat/core/Solver.cc @@ -31,7 +31,6 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #include "prop/minisat/minisat.h" #include "prop/minisat/mtl/Sort.h" #include "prop/theory_proxy.h" -#include "smt_util/command.h" using namespace CVC4::prop; @@ -479,15 +478,18 @@ void Solver::cancelUntil(int level) { for (int l = trail_lim.size() - level; l > 0; --l) { context->pop(); if(Dump.isOn("state")) { - Dump("state") << PopCommand(); + proxy->dumpStatePop(); } } for (int c = trail.size()-1; c >= trail_lim[level]; c--){ Var x = var(trail[c]); assigns [x] = l_Undef; vardata[x].trail_index = -1; - if ((phase_saving > 1 || (phase_saving == 1) && c > trail_lim.last()) && (polarity[x] & 0x2) == 0) + if ((phase_saving > 1 || + ((phase_saving == 1) && c > trail_lim.last()) + ) && ((polarity[x] & 0x2) == 0)) { polarity[x] = sign(trail[c]); + } insertVarOrder(x); } qhead = trail_lim[level]; diff --git a/src/prop/minisat/core/Solver.h b/src/prop/minisat/core/Solver.h index a239eba72..777fb1093 100644 --- a/src/prop/minisat/core/Solver.h +++ b/src/prop/minisat/core/Solver.h @@ -32,7 +32,6 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #include "prop/minisat/mtl/Heap.h" #include "prop/minisat/mtl/Vec.h" #include "prop/minisat/utils/Options.h" -#include "smt_util/command.h" #include "theory/theory.h" |