diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2016-01-12 11:55:50 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2016-01-12 11:55:50 -0800 |
| commit | de695c9d4c5fbc0e48e30d8aeefd8fe1f9a51507 (patch) | |
| tree | b016675f49a0b6f4b03eb77b34aa52c9fb3cc751 /src/base/abci | |
| parent | 7984628d7fca465052ba71f330ded0e89969d05f (diff) | |
| download | abc-de695c9d4c5fbc0e48e30d8aeefd8fe1f9a51507.tar.gz abc-de695c9d4c5fbc0e48e30d8aeefd8fe1f9a51507.tar.bz2 abc-de695c9d4c5fbc0e48e30d8aeefd8fe1f9a51507.zip | |
Better print-out of SOPs. Changing default of 'fx'. Updating 'satclp' to fine prine SOPs.
Diffstat (limited to 'src/base/abci')
| -rw-r--r-- | src/base/abci/abcCollapse.c | 3 | ||||
| -rw-r--r-- | src/base/abci/abcFxu.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/base/abci/abcCollapse.c b/src/base/abci/abcCollapse.c index 26574dee..6a132518 100644 --- a/src/base/abci/abcCollapse.c +++ b/src/base/abci/abcCollapse.c @@ -922,12 +922,13 @@ Abc_Ntk_t * Abc_NtkFromSopsInt( Abc_Ntk_t * pNtk, int nCubeLim, int nBTLimit, in vSupp = Vec_WecEntry( vSupps, i ); Vec_IntForEachEntry( vSupp, iCi, k ) Abc_ObjAddFanin( pNodeNew, Abc_NtkCi(pNtkNew, iCi) ); - pNodeNew->pData = Vec_PtrEntry( vSops, i ); + pNodeNew->pData = Abc_SopRegister( (Mem_Flex_t *)pNtkNew->pManFunc, Vec_PtrEntry( vSops, i ) ); assert( pNodeNew->pData != (void *)(ABC_PTRINT_T)1 ); Abc_ObjAddFanin( pNode->pCopy, pNodeNew ); } Vec_WecFree( vSupps ); Vec_PtrFree( vSops ); + Abc_NtkSortSops( pNtkNew ); return pNtkNew; } Abc_Ntk_t * Abc_NtkCollapseSat( Abc_Ntk_t * pNtk, int nCubeLim, int nBTLimit, int nCostMax, int fCanon, int fReverse, int fCnfShared, int fVerbose ) diff --git a/src/base/abci/abcFxu.c b/src/base/abci/abcFxu.c index d2221f4e..8da306bf 100644 --- a/src/base/abci/abcFxu.c +++ b/src/base/abci/abcFxu.c @@ -56,7 +56,7 @@ void Abc_NtkSetDefaultFxParams( Fxu_Data_t * p ) p->nPairsMax = 30000; p->nNodesExt =1000000; p->WeightMin = 0; - p->LitCountMax= 0; + p->LitCountMax= 4; p->fOnlyS = 0; p->fOnlyD = 0; p->fUse0 = 0; |