From e3e62366638f0395c12b0d1e9b7fcb60fc1908eb Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Sat, 30 Apr 2016 10:42:10 -0700 Subject: This code was accidentally deleted from the SAT solver (effectively disabling restarts!) --- src/sat/bsat/satSolver.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/sat') diff --git a/src/sat/bsat/satSolver.c b/src/sat/bsat/satSolver.c index 815626ad..e8e13ee7 100644 --- a/src/sat/bsat/satSolver.c +++ b/src/sat/bsat/satSolver.c @@ -1659,6 +1659,13 @@ static lbool sat_solver_search(sat_solver* s, ABC_INT64_T nof_conflicts) // NO CONFLICT int next; + // Reached bound on number of conflicts: + if ((nof_conflicts >= 0 && conflictC >= nof_conflicts) || (s->nRuntimeLimit && (s->stats.conflicts & 63) == 0 && Abc_Clock() > s->nRuntimeLimit)){ + s->progress_estimate = sat_solver_progress(s); + sat_solver_canceluntil(s,s->root_level); + veci_delete(&learnt_clause); + return l_Undef; } + // Reached bound on number of conflicts: if ( (s->nConfLimit && s->stats.conflicts > s->nConfLimit) || (s->nInsLimit && s->stats.propagations > s->nInsLimit) ) -- cgit v1.2.3