diff options
Diffstat (limited to 'src/sat/asat/solver.h')
| -rw-r--r-- | src/sat/asat/solver.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/sat/asat/solver.h b/src/sat/asat/solver.h index 9618603c..d798a7a9 100644 --- a/src/sat/asat/solver.h +++ b/src/sat/asat/solver.h @@ -27,6 +27,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #endif #include "solver_vec.h" +#include "asatmem.h" //================================================================================================= // Simple types: @@ -67,7 +68,7 @@ extern void solver_delete(solver* s); extern bool solver_addclause(solver* s, lit* begin, lit* end); extern bool solver_simplify(solver* s); -extern int solver_solve(solver* s, lit* begin, lit* end, int nSeconds); +extern int solver_solve(solver* s, lit* begin, lit* end, int nConfLimit, int nImpLimit ); extern int * solver_get_model( solver * p, int * pVars, int nVars ); extern int solver_nvars(solver* s); @@ -132,6 +133,12 @@ struct solver_t double progress_estimate; int verbosity; // Verbosity level. 0=silent, 1=some progress report, 2=everything + int nConfLimit; // external limit on the number of conflicts + int nImpLimit; // external limit on the number of implications + + // the memory manager + Asat_MmStep_t * pMem; + stats solver_stats; }; |