diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2011-10-19 16:03:15 +0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2011-10-19 16:03:15 +0700 |
| commit | 19ce8396f03df14028219b9d4efd93a852f30219 (patch) | |
| tree | ea9de12b0d6556954f5fc08a3b1c94c31f458b50 /src/aig | |
| parent | 397bebf8a55da132304a941968b3c32df8939e6f (diff) | |
| download | abc-19ce8396f03df14028219b9d4efd93a852f30219.tar.gz abc-19ce8396f03df14028219b9d4efd93a852f30219.tar.bz2 abc-19ce8396f03df14028219b9d4efd93a852f30219.zip | |
New abstraction code.
Diffstat (limited to 'src/aig')
| -rw-r--r-- | src/aig/gia/giaAbs.c | 6 | ||||
| -rw-r--r-- | src/aig/saig/saigAbsGla.c | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/aig/gia/giaAbs.c b/src/aig/gia/giaAbs.c index e30493a7..ba50b238 100644 --- a/src/aig/gia/giaAbs.c +++ b/src/aig/gia/giaAbs.c @@ -377,9 +377,9 @@ int Gia_ManPbaPerform( Gia_Man_t * pGia, int nStart, int nFrames, int nConfLimit SeeAlso [] ***********************************************************************/ -int Gia_ManGlaCbaPerform( Gia_Man_t * pGia, void * pPars, int fUseCnf ) +int Gia_ManGlaCbaPerform( Gia_Man_t * pGia, void * pPars, int fNaiveCnf ) { - extern Vec_Int_t * Aig_GlaManTest( Aig_Man_t * pAig, int nFramesMax, int nConfLimit, int TimeLimit, int fUseCnf, int fVerbose ); + extern Vec_Int_t * Aig_GlaManTest( Aig_Man_t * pAig, int nFramesMax, int nConfLimit, int TimeLimit, int fNaiveCnf, int fVerbose ); Saig_ParBmc_t * p = (Saig_ParBmc_t *)pPars; Vec_Int_t * vGateClasses; Aig_Man_t * pAig; @@ -393,7 +393,7 @@ int Gia_ManGlaCbaPerform( Gia_Man_t * pGia, void * pPars, int fUseCnf ) */ // perform abstraction pAig = Gia_ManToAigSimple( pGia ); - vGateClasses = Aig_GlaManTest( pAig, p->nFramesMax, p->nConfLimit, p->nTimeOut, fUseCnf, p->fVerbose ); + vGateClasses = Aig_GlaManTest( pAig, p->nFramesMax, p->nConfLimit, p->nTimeOut, fNaiveCnf, p->fVerbose ); Aig_ManStop( pAig ); // update the map diff --git a/src/aig/saig/saigAbsGla.c b/src/aig/saig/saigAbsGla.c index 1de6221c..681b10c3 100644 --- a/src/aig/saig/saigAbsGla.c +++ b/src/aig/saig/saigAbsGla.c @@ -454,7 +454,7 @@ int Aig_GlaObjAddToSolver( Aig_GlaMan_t * p, Aig_Obj_t * pObj, int k ) SeeAlso [] ***********************************************************************/ -Aig_GlaMan_t * Aig_GlaManStart( Aig_Man_t * pAig, int fUseCnf ) +Aig_GlaMan_t * Aig_GlaManStart( Aig_Man_t * pAig, int fNaiveCnf ) { Aig_GlaMan_t * p; int i; @@ -482,7 +482,7 @@ Aig_GlaMan_t * Aig_GlaManStart( Aig_Man_t * pAig, int fUseCnf ) Vec_IntPush( p->vVar2Inf, -1 ); // CNF computation - if ( fUseCnf ) + if ( !fNaiveCnf ) { p->vLeaves = Vec_PtrAlloc( 100 ); p->vVolume = Vec_PtrAlloc( 100 ); @@ -650,7 +650,7 @@ void Aig_GlaExtendIncluded( Aig_GlaMan_t * p ) SeeAlso [] ***********************************************************************/ -Vec_Int_t * Aig_GlaManTest( Aig_Man_t * pAig, int nFramesMax, int nConfLimit, int TimeLimit, int fUseCnf, int fVerbose ) +Vec_Int_t * Aig_GlaManTest( Aig_Man_t * pAig, int nFramesMax, int nConfLimit, int TimeLimit, int fNaiveCnf, int fVerbose ) { int nStart = 0; Vec_Int_t * vResult = NULL; @@ -672,7 +672,7 @@ Vec_Int_t * Aig_GlaManTest( Aig_Man_t * pAig, int nFramesMax, int nConfLimit, in } // start the solver - p = Aig_GlaManStart( pAig, fUseCnf ); + p = Aig_GlaManStart( pAig, fNaiveCnf ); p->nFramesMax = nFramesMax; p->nConfLimit = nConfLimit; p->fVerbose = fVerbose; @@ -774,7 +774,8 @@ Vec_Int_t * Aig_GlaManTest( Aig_Man_t * pAig, int nFramesMax, int nConfLimit, in ABC_PRTP( "Total ", p->timeTotal, p->timeTotal ); } // prepare return value - Aig_GlaExtendIncluded( p ); + if ( !fNaiveCnf ) + Aig_GlaExtendIncluded( p ); vResult = p->vIncluded; p->vIncluded = NULL; Aig_GlaManStop( p ); return vResult; |