diff options
| author | Dejan Jovanović <dejan.jovanovic@gmail.com> | 2010-11-09 21:57:06 +0000 |
|---|---|---|
| committer | Dejan Jovanović <dejan.jovanovic@gmail.com> | 2010-11-09 21:57:06 +0000 |
| commit | df5f7fe03fda041429548bcb39abb8916ca2e291 (patch) | |
| tree | 46b08f3e35ee9c3d4c551d82f3e7e36582383f39 /src/prop/minisat/simp | |
| parent | 1f07775e9205b3f9e172a1ad218a9015b7265b58 (diff) | |
Lemmas on demand work, push-pop, some cleanup.
Diffstat (limited to 'src/prop/minisat/simp')
| -rw-r--r-- | src/prop/minisat/simp/SimpSolver.cc | 8 | ||||
| -rw-r--r-- | src/prop/minisat/simp/SimpSolver.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/prop/minisat/simp/SimpSolver.cc b/src/prop/minisat/simp/SimpSolver.cc index 32ac223d6..8bcd9fe76 100644 --- a/src/prop/minisat/simp/SimpSolver.cc +++ b/src/prop/minisat/simp/SimpSolver.cc @@ -44,15 +44,15 @@ static DoubleOption opt_simp_garbage_frac(_cat, "simp-gc-frac", "The fraction of // Constructor/Destructor: -SimpSolver::SimpSolver(CVC4::prop::SatSolver* proxy, CVC4::context::Context* context) : - Solver(proxy, context) +SimpSolver::SimpSolver(CVC4::prop::SatSolver* proxy, CVC4::context::Context* context, bool enableIncremental) : + Solver(proxy, context, enableIncremental) , grow (opt_grow) , clause_lim (opt_clause_lim) , subsumption_lim (opt_subsumption_lim) , simp_garbage_frac (opt_simp_garbage_frac) , use_asymm (opt_use_asymm) , use_rcheck (opt_use_rcheck) - , use_elim (opt_use_elim) + , use_elim (!enableIncremental) , merges (0) , asymm_lits (0) , eliminated_vars (0) @@ -65,7 +65,7 @@ SimpSolver::SimpSolver(CVC4::prop::SatSolver* proxy, CVC4::context::Context* con { vec<Lit> dummy(1,lit_Undef); ca.extra_clause_field = true; // NOTE: must happen before allocating the dummy clause below. - bwdsub_tmpunit = ca.alloc(dummy); + bwdsub_tmpunit = ca.alloc(0, dummy); remove_satisfied = false; } diff --git a/src/prop/minisat/simp/SimpSolver.h b/src/prop/minisat/simp/SimpSolver.h index 977da46e5..a7359e28e 100644 --- a/src/prop/minisat/simp/SimpSolver.h +++ b/src/prop/minisat/simp/SimpSolver.h @@ -41,7 +41,7 @@ class SimpSolver : public Solver { public: // Constructor/Destructor: // - SimpSolver(CVC4::prop::SatSolver* proxy, CVC4::context::Context* context); + SimpSolver(CVC4::prop::SatSolver* proxy, CVC4::context::Context* context, bool enableIncremental = false); CVC4_PUBLIC ~SimpSolver(); // Problem specification: @@ -52,7 +52,7 @@ class SimpSolver : public Solver { bool addClause (Lit p, ClauseType type); // Add a unit clause to the solver. bool addClause (Lit p, Lit q, ClauseType type); // Add a binary clause to the solver. bool addClause (Lit p, Lit q, Lit r, ClauseType type); // Add a ternary clause to the solver. - bool addClause_( vec<Lit>& ps, ClauseType type); + bool addClause_(vec<Lit>& ps, ClauseType type); bool substitute(Var v, Lit x); // Replace all occurences of v with x (may cause a contradiction). // Variable mode: |