diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2013-02-26 17:10:37 -0500 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2013-02-26 17:10:37 -0500 |
| commit | 12253f47cee3bf04909363cc78aeaecb94b0556f (patch) | |
| tree | 2cd20b5d5170461629df6c1ab18e21ad26073efe /src/aig | |
| parent | c98119594e4137dee341d171a5ad3b3d647a279e (diff) | |
| download | abc-12253f47cee3bf04909363cc78aeaecb94b0556f.tar.gz abc-12253f47cee3bf04909363cc78aeaecb94b0556f.tar.bz2 abc-12253f47cee3bf04909363cc78aeaecb94b0556f.zip | |
User-controlable SAT sweeper.
Diffstat (limited to 'src/aig')
| -rw-r--r-- | src/aig/gia/giaSweeper.c | 8 | ||||
| -rw-r--r-- | src/aig/gia/giaUtil.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/aig/gia/giaSweeper.c b/src/aig/gia/giaSweeper.c index 2b27cdeb..7835432f 100644 --- a/src/aig/gia/giaSweeper.c +++ b/src/aig/gia/giaSweeper.c @@ -184,9 +184,9 @@ double Gia_SweeperMemUsage( Gia_Man_t * pGia ) void Gia_SweeperPrintStats( Gia_Man_t * pGia ) { Swp_Man_t * p = (Swp_Man_t *)pGia->pData; - double nMemSwp = Gia_SweeperMemUsage(pGia)/(1<<20); - double nMemGia = (double)Gia_ManObjNum(pGia)*(sizeof(Gia_Obj_t) + sizeof(int))/(1<<20); - double nMemSat = sat_solver_memory(p->pSat)/(1<<20); + double nMemSwp = Gia_SweeperMemUsage(pGia); + double nMemGia = (double)Gia_ManObjNum(pGia)*(sizeof(Gia_Obj_t) + sizeof(int)); + double nMemSat = sat_solver_memory(p->pSat); double nMemTot = nMemSwp + nMemGia + nMemSat; printf( "SAT sweeper statistics:\n" ); printf( "Memory usage:\n" ); @@ -205,7 +205,7 @@ void Gia_SweeperPrintStats( Gia_Man_t * pGia ) printf( "GIA: " ); Gia_ManPrintStats( pGia, 0, 0, 0 ); printf( "SAT calls = %d. Sat = %d. Unsat = %d. Undecided = %d. Proofs = %d.\n", - p->nSatCalls, p->nSatCallsSat, p->nSatCallsSat, p->nSatCallsUndec, p->nSatProofs ); + p->nSatCalls, p->nSatCallsSat, p->nSatCallsUnsat, p->nSatCallsUndec, p->nSatProofs ); Sat_SolverPrintStats( stdout, p->pSat ); } diff --git a/src/aig/gia/giaUtil.c b/src/aig/gia/giaUtil.c index a7f594e4..5adf9ebd 100644 --- a/src/aig/gia/giaUtil.c +++ b/src/aig/gia/giaUtil.c @@ -461,15 +461,15 @@ int Gia_ManLevelNum( Gia_Man_t * p ) Gia_ManCleanLevels( p, Gia_ManObjNum(p) ); p->nLevels = 0; Gia_ManForEachObj( p, pObj, i ) + { if ( Gia_ObjIsAnd(pObj) ) Gia_ObjSetAndLevel( p, pObj ); else if ( Gia_ObjIsCo(pObj) ) - { Gia_ObjSetCoLevel( p, pObj ); - p->nLevels = Abc_MaxInt( p->nLevels, Gia_ObjLevel(p, pObj) ); - } else Gia_ObjSetLevel( p, pObj, 0 ); + p->nLevels = Abc_MaxInt( p->nLevels, Gia_ObjLevel(p, pObj) ); + } return p->nLevels; } |