diff options
| author | Morgan Deters <mdeters@gmail.com> | 2012-03-01 14:48:04 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2012-03-01 14:48:04 +0000 |
| commit | 45a138c326da72890bf889a3670aad503ef4aa1e (patch) | |
| tree | fa0c9a8497d0b33f78a9f19212152a61392825cc /src/prop/sat_module.h | |
| parent | 8c0b2d6db32103268f84d89c0d0545c7eb504069 (diff) | |
Partial merge from kind-backend branch, including Minisat and CNF work to
support incrementality.
Some clean-up work will likely follow, but the CNF/Minisat stuff should be
left pretty much untouched.
Expected performance change negligible; slightly better on memory:
http://church.cims.nyu.edu/regress-results/compare_jobs.php?job_id=3705&reference_id=3697&mode=&category=&p=5
Note that there are crashes, but that these are exhibited in the nightly
regression run too!
Diffstat (limited to 'src/prop/sat_module.h')
| -rw-r--r-- | src/prop/sat_module.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/prop/sat_module.h b/src/prop/sat_module.h index 320dfe09b..9c49c7d67 100644 --- a/src/prop/sat_module.h +++ b/src/prop/sat_module.h @@ -152,6 +152,8 @@ public: virtual void pop() = 0; + virtual bool properExplanation(SatLiteral lit, SatLiteral expl) const = 0; + }; // toodo add ifdef @@ -179,11 +181,11 @@ public: SatLiteralValue value(SatLiteral l); SatLiteralValue modelValue(SatLiteral l); - void unregisterVar(SatLiteral lit); void renewVar(SatLiteral lit, int level = -1); int getAssertionLevel() const; + // helper methods for converting from the internal Minisat representation static SatVariable toSatVariable(BVMinisat::Var var); @@ -254,6 +256,8 @@ public: SatLiteralValue modelValue(SatLiteral l); + bool properExplanation(SatLiteral lit, SatLiteral expl) const; + /** Incremental interface */ int getAssertionLevel() const; |