diff options
author | Kshitij Bansal <kshitij@cs.nyu.edu> | 2012-04-23 17:56:19 +0000 |
---|---|---|
committer | Kshitij Bansal <kshitij@cs.nyu.edu> | 2012-04-23 17:56:19 +0000 |
commit | 5676b8bddcf001ba567ebb6d8e7b42dbd13ac9f3 (patch) | |
tree | a3fe0f00ae5d5cd087b23c885c8b170ceb07b919 /src/prop/theory_proxy.h | |
parent | 04e81f6d12cad8f2519aa6c94adee52aadd71ec3 (diff) |
Merge from decision branch -- partially working justification heuristic
Overview of changes
* command line option --decision={internal,justification}
* justification heuristic handles all operators except ITEs
revelant stats: decision::jh::*
* if decisionEngine has solved the problem PropEngine returns
unknown and smtEngine queries DE to get the answer
relevant stat: smt::resultSource
* there are known bugs
Full list of commits being merged
r3330 use CD data structures in JH
r3329 add command-line option --decision=MODE
r3328 timer stat, other fixes
r3326 more trace
r3325 enable implies, iff, xor (no further regression losses)
r3324 feed decision engine lemmas, changes to quitting mechanism
r3322 In progress
r3321 more fixes...
r3318 bugfix1 (69 more to go)
r3317 Handle other boolean operators in JH (except ITE)
r3316 mechanism for DE to stopSearch
r3315 merge from trunk + JH translation continuation
r3275 change option to enable JH by default[A
Diffstat (limited to 'src/prop/theory_proxy.h')
-rw-r--r-- | src/prop/theory_proxy.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/prop/theory_proxy.h b/src/prop/theory_proxy.h index ceb328d90..f3fe634e2 100644 --- a/src/prop/theory_proxy.h +++ b/src/prop/theory_proxy.h @@ -85,7 +85,7 @@ public: void enqueueTheoryLiteral(const SatLiteral& l); - SatLiteral getNextDecisionRequest(); + SatLiteral getNextDecisionRequest(bool& stopSearch); bool theoryNeedCheck() const; @@ -112,6 +112,8 @@ public: void checkTime(); + bool isDecisionEngineDone(); + };/* class SatSolver */ /* Functions that delegate to the concrete SAT solver. */ |