diff options
| author | Kshitij Bansal <kshitij@cs.nyu.edu> | 2012-05-09 05:45:36 +0000 |
|---|---|---|
| committer | Kshitij Bansal <kshitij@cs.nyu.edu> | 2012-05-09 05:45:36 +0000 |
| commit | 6243fba11e0189891acf21de3c6daa072b038e13 (patch) | |
| tree | 8265abfa3e583831a972acdf97989930ae9c3592 /src/prop | |
| parent | 9f74cfbd847663f80c362cf06bda7e749f0f694b (diff) | |
Merge from decision branch (ITE support)
Major changes from last merge
* ITEs supported
* Don't share theory lemmas to DE, only assertions
Should probably be noted that 'make regress' doesn't quite
pass with --decision=justification. Throws off search in couple
of arith benchmarks.
No serious performance changes expected. Keep an eye.
Diffstat (limited to 'src/prop')
| -rw-r--r-- | src/prop/minisat/core/Solver.cc | 2 | ||||
| -rw-r--r-- | src/prop/prop_engine.cpp | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/prop/minisat/core/Solver.cc b/src/prop/minisat/core/Solver.cc index ea6cafdcd..5e1b032a3 100644 --- a/src/prop/minisat/core/Solver.cc +++ b/src/prop/minisat/core/Solver.cc @@ -1099,6 +1099,8 @@ lbool Solver::search(int nof_conflicts) if (next == lit_Undef) { // We need to do a full theory check to confirm + Debug("minisat::search") << "Doing a full theoy check..." + << std::endl; check_type = CHECK_FINAL; continue; } diff --git a/src/prop/prop_engine.cpp b/src/prop/prop_engine.cpp index 03746c9b2..5b71e5ec5 100644 --- a/src/prop/prop_engine.cpp +++ b/src/prop/prop_engine.cpp @@ -109,13 +109,13 @@ void PropEngine::assertLemma(TNode node, bool negated, bool removable) { } /* Tell decision engine */ - if(negated) { - NodeBuilder<> nb(kind::NOT); - nb << node; - d_decisionEngine->addAssertion(nb.constructNode()); - } else { - d_decisionEngine->addAssertion(node); - } + // if(negated) { + // NodeBuilder<> nb(kind::NOT); + // nb << node; + // d_decisionEngine->addAssertion(nb.constructNode()); + // } else { + // d_decisionEngine->addAssertion(node); + // } //TODO This comment is now false // Assert as removable |