luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Saving variable activity during rollback.

This commit is contained in:
Alan Mishchenko 2012-07-30 11:47:24 -07:00
parent ed564664f1
commit a22db31d6d
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sat/bsat/satSolver2.c
View File

@ -1168,6 +1168,7 @@ void sat_solver2_setnvars(sat_solver2* s,int n)
s->activity = ABC_REALLOC(double, s->activity, s->cap); s->activity = ABC_REALLOC(double, s->activity, s->cap);
#else #else
s->activity = ABC_REALLOC(unsigned, s->activity, s->cap); s->activity = ABC_REALLOC(unsigned, s->activity, s->cap);
s->activity2 = ABC_REALLOC(unsigned, s->activity2,s->cap);
#endif #endif
s->model = ABC_REALLOC(int, s->model, s->cap); s->model = ABC_REALLOC(int, s->model, s->cap);
memset( s->wlists + 2*old_cap, 0, 2*(s->cap-old_cap)*sizeof(vecp) ); memset( s->wlists + 2*old_cap, 0, 2*(s->cap-old_cap)*sizeof(vecp) );
@ -1253,6 +1254,7 @@ void sat_solver2_delete(sat_solver2* s)
ABC_FREE(s->reasons ); ABC_FREE(s->reasons );
ABC_FREE(s->units ); ABC_FREE(s->units );
ABC_FREE(s->activity ); ABC_FREE(s->activity );
ABC_FREE(s->activity2);
ABC_FREE(s->model ); ABC_FREE(s->model );
} }
ABC_FREE(s); ABC_FREE(s);
@ -1559,6 +1561,8 @@ void sat_solver2_rollback( sat_solver2* s )
// update order // update order
if ( s->iVarPivot < s->size ) if ( s->iVarPivot < s->size )
{ {
if ( s->activity2 )
memcpy( s->activity, s->activity2, sizeof(unsigned) * s->iVarPivot );
veci_resize(&s->order, 0); veci_resize(&s->order, 0);
for ( i = 0; i < s->iVarPivot; i++ ) for ( i = 0; i < s->iVarPivot; i++ )
{ {
@ -1665,6 +1669,8 @@ double sat_solver2_memory( sat_solver2* s, int fAll )
Mem += s->cap * sizeof(double); // ABC_FREE(s->activity ); Mem += s->cap * sizeof(double); // ABC_FREE(s->activity );
#else #else
Mem += s->cap * sizeof(unsigned); // ABC_FREE(s->activity ); Mem += s->cap * sizeof(unsigned); // ABC_FREE(s->activity );
if ( s->activity2 )
Mem += s->cap * sizeof(unsigned); // ABC_FREE(s->activity2);
#endif #endif
Mem += s->cap * sizeof(lit); // ABC_FREE(s->trail ); Mem += s->cap * sizeof(lit); // ABC_FREE(s->trail );
Mem += s->cap * sizeof(int); // ABC_FREE(s->orderpos ); Mem += s->cap * sizeof(int); // ABC_FREE(s->orderpos );

5
src/sat/bsat/satSolver2.h
View File

@ -99,7 +99,8 @@ struct sat_solver2_t
#else #else
int var_inc; // Amount to bump next variable with. int var_inc; // Amount to bump next variable with.
int cla_inc; // Amount to bump next clause with. int cla_inc; // Amount to bump next clause with.
unsigned* activity; // A heuristic measurement of the activity of a variable. unsigned* activity; // A heuristic measurement of the activity of a variable
unsigned* activity2; // backup variable activity
#endif #endif
int nUnits; // the total number of unit clauses int nUnits; // the total number of unit clauses
@ -240,6 +241,8 @@ static inline void sat_solver2_bookmark(sat_solver2* s)
if ( s->pPrf1 ) if ( s->pPrf1 )
s->hProofPivot = Vec_SetHandCurrent(s->pPrf1); s->hProofPivot = Vec_SetHandCurrent(s->pPrf1);
Sat_MemBookMark( &s->Mem ); Sat_MemBookMark( &s->Mem );
if ( s->activity2 )
memcpy( s->activity2, s->activity, sizeof(unsigned) * s->iVarPivot );
} }
static inline int sat_solver2_add_const( sat_solver2 * pSat, int iVar, int fCompl, int fMark, int Id ) static inline int sat_solver2_add_const( sat_solver2 * pSat, int iVar, int fCompl, int fMark, int Id )