Commit e3e62366 by Alan Mishchenko

This code was accidentally deleted from the SAT solver (effectively disabling restarts!)

parent 1c245b4a
...@@ -1660,6 +1660,13 @@ static lbool sat_solver_search(sat_solver* s, ABC_INT64_T nof_conflicts) ...@@ -1660,6 +1660,13 @@ static lbool sat_solver_search(sat_solver* s, ABC_INT64_T nof_conflicts)
int next; int next;
// Reached bound on number of conflicts: // 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) || if ( (s->nConfLimit && s->stats.conflicts > s->nConfLimit) ||
(s->nInsLimit && s->stats.propagations > s->nInsLimit) ) (s->nInsLimit && s->stats.propagations > s->nInsLimit) )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment