diff options
Diffstat (limited to 'src/sat/asat')
| -rw-r--r-- | src/sat/asat/solver.c | 7 | ||||
| -rw-r--r-- | src/sat/asat/solver.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/sat/asat/solver.c b/src/sat/asat/solver.c index 34b4d233..6f8fe037 100644 --- a/src/sat/asat/solver.c +++ b/src/sat/asat/solver.c @@ -853,9 +853,16 @@ static lbool solver_search(solver* s, int nof_conflicts, int nof_learnts) // reset the activities if ( s->factors ) + { + s->var_inc = 1.0; for ( i = 0; i < s->size; i++ ) + { s->activity[i] = (double)s->factors[i]; +// if ( s->orderpos[i] != -1 ) +// order_update(s, i ); + } // s->activity[i] = 1.0; + } for (;;){ clause* confl = solver_propagate(s); diff --git a/src/sat/asat/solver.h b/src/sat/asat/solver.h index 7a5e5be6..bd6e8569 100644 --- a/src/sat/asat/solver.h +++ b/src/sat/asat/solver.h @@ -76,7 +76,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, sint64 nConfLimit, sint64 nInsLimit ); +extern int solver_solve(solver* s, lit* begin, lit* end, sint64 nConfLimit, sint64 nInsLimit); extern int * solver_get_model( solver * p, int * pVars, int nVars ); extern int solver_nvars(solver* s); |