diff options
author | Dejan Jovanović <dejan.jovanovic@gmail.com> | 2011-08-17 15:20:19 +0000 |
---|---|---|
committer | Dejan Jovanović <dejan.jovanovic@gmail.com> | 2011-08-17 15:20:19 +0000 |
commit | 32e1d3558f17d12f2631175776209a5f8cabbdd9 (patch) | |
tree | ebc20658d5375b17f13b5c83d3dc7ee078029f96 /src/prop/sat.h | |
parent | 41dc1b3685b9258660dab571f8f8b56deb0fb095 (diff) |
new implementation of lemmas on demand
comparison <http://goedel.cims.nyu.edu/regress-results/compare_jobs.php?job_id=2673&&p=5&reference_id=2637>
Diffstat (limited to 'src/prop/sat.h')
-rw-r--r-- | src/prop/sat.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/prop/sat.h b/src/prop/sat.h index c00115cd8..2521f3ee7 100644 --- a/src/prop/sat.h +++ b/src/prop/sat.h @@ -101,7 +101,7 @@ public: /** Virtual destructor to make g++ happy */ virtual ~SatInputInterface() { } /** Assert a clause in the solver. */ - virtual void addClause(SatClause& clause, bool lemma) = 0; + virtual void addClause(SatClause& clause, bool removable) = 0; /** Create a new boolean variable in the solver. */ virtual SatVariable newVar(bool theoryAtom = false) = 0; /** Get the current decision level of the solver */ @@ -212,11 +212,11 @@ public: bool solve(); - void addClause(SatClause& clause, bool lemma); + void addClause(SatClause& clause, bool removable); SatVariable newVar(bool theoryAtom = false); - void theoryCheck(theory::Theory::Effort effort, SatClause& conflict); + void theoryCheck(theory::Theory::Effort effort); void explainPropagation(SatLiteral l, SatClause& explanation); @@ -290,8 +290,8 @@ inline bool SatSolver::solve() { return d_minisat->solve(); } -inline void SatSolver::addClause(SatClause& clause, bool lemma) { - d_minisat->addClause(clause, lemma ? Minisat::Solver::CLAUSE_LEMMA : Minisat::Solver::CLAUSE_PROBLEM); +inline void SatSolver::addClause(SatClause& clause, bool removable) { + d_minisat->addClause(clause, removable); } inline SatVariable SatSolver::newVar(bool theoryAtom) { |