diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/base/abci/abc.c | 4 | ||||
| -rw-r--r-- | src/misc/vec/vecWrd.h | 11 | ||||
| -rw-r--r-- | src/proof/cec/cecSweep.c | 4 |
3 files changed, 15 insertions, 4 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index dff328eb..c3ccc04b 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -10603,7 +10603,7 @@ int Abc_CommandTest( Abc_Frame_t * pAbc, int argc, char ** argv ) // Nf_ManPrepareLibraryTest(); // return 0; } -/* + if ( pNtk ) { // extern Abc_Ntk_t * Abc_NtkBarBufsOnOffTest( Abc_Ntk_t * pNtk ); @@ -10622,7 +10622,7 @@ int Abc_CommandTest( Abc_Frame_t * pAbc, int argc, char ** argv ) } Abc_FrameReplaceCurrentNetwork( pAbc, pNtkRes ); } -*/ + return 0; usage: Abc_Print( -2, "usage: test [-CKDNM] [-aovwh] <file_name>\n" ); diff --git a/src/misc/vec/vecWrd.h b/src/misc/vec/vecWrd.h index c765dd8d..5688d7b2 100644 --- a/src/misc/vec/vecWrd.h +++ b/src/misc/vec/vecWrd.h @@ -1084,6 +1084,17 @@ static inline void Vec_WrdUniqify( Vec_Wrd_t * p ) p->pArray[k++] = p->pArray[i]; p->nSize = k; } +static inline int Vec_WrdUniqueCount( Vec_Wrd_t * vData, int nWordSize, Vec_Int_t ** pvMap ) +{ + int Result; + Vec_Int_t * vDataInt = (Vec_Int_t *)vData; + vDataInt->nSize *= 2; + vDataInt->nCap *= 2; + Result = Vec_IntUniqueCount( vDataInt, 2 * nWordSize, pvMap ); + vDataInt->nSize /= 2; + vDataInt->nCap /= 2; + return Result; +} static inline Vec_Wrd_t * Vec_WrdUniqifyHash( Vec_Wrd_t * vData, int nWordSize ) { Vec_Int_t * vResInt; diff --git a/src/proof/cec/cecSweep.c b/src/proof/cec/cecSweep.c index 977ff3a8..55f2219f 100644 --- a/src/proof/cec/cecSweep.c +++ b/src/proof/cec/cecSweep.c @@ -84,8 +84,8 @@ Gia_Man_t * Cec_ManFraSpecReduction( Cec_ManFra_t * p ) if ( Abc_LitRegular(iNode) == Abc_LitRegular(iRepr) ) continue; if ( p->pPars->nLevelMax && - (Gia_ObjLevel(p->pAig, pObj) > p->pPars->nLevelMax || - Gia_ObjLevel(p->pAig, pRepr) > p->pPars->nLevelMax) ) + (Gia_ObjLevelId(p->pAig, i) > p->pPars->nLevelMax || + Gia_ObjLevelId(p->pAig, Abc_Lit2Var(iRepr)) > p->pPars->nLevelMax) ) continue; if ( p->pPars->fDualOut ) { |