diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2016-08-10 14:18:39 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2016-08-10 14:18:39 -0700 |
| commit | 21435aa6e317481f23b510a011e102bd148c7deb (patch) | |
| tree | c7d3cfdefc4c9e325eae782c883acd31e7575f57 /src | |
| parent | 693b587c5cfa624e6cae086ab7ae47ab9f72d082 (diff) | |
| download | abc-21435aa6e317481f23b510a011e102bd148c7deb.tar.gz abc-21435aa6e317481f23b510a011e102bd148c7deb.tar.bz2 abc-21435aa6e317481f23b510a011e102bd148c7deb.zip | |
Bug fix in 'edge -m'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/aig/gia/giaSatLE.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/aig/gia/giaSatLE.c b/src/aig/gia/giaSatLE.c index d541804a..e6049322 100644 --- a/src/aig/gia/giaSatLE.c +++ b/src/aig/gia/giaSatLE.c @@ -867,25 +867,31 @@ int Sle_ManAddEdgeConstraints( Sle_Man_t * p, int nEdges ) ***********************************************************************/ void Sle_ManDeriveResult( Sle_Man_t * p, Vec_Int_t * vEdge2, Vec_Int_t * vMapping ) { + Vec_Int_t * vMapTemp; int iObj; // create mapping Vec_IntFill( vMapping, Gia_ManObjNum(p->pGia), 0 ); Gia_ManForEachAndId( p->pGia, iObj ) { int i, iCut, iCutVar0 = Vec_IntEntry( p->vCutFirst, iObj ); - int * pCut, * pList = Sle_ManList( p, iObj ); + int * pCut, * pCutThis = NULL, * pList = Sle_ManList( p, iObj ); if ( !sat_solver_var_value(p->pSat, iObj) ) continue; Sle_ForEachCut( pList, pCut, iCut ) if ( sat_solver_var_value(p->pSat, iCutVar0 + iCut) ) - break; - assert( iCut < Sle_ListCutNum(pList) ); + { + assert( pCutThis == NULL ); + pCutThis = pCut; + } + assert( pCutThis != NULL ); Vec_IntWriteEntry( vMapping, iObj, Vec_IntSize(vMapping) ); - Vec_IntPush( vMapping, Sle_CutSize(pCut) ); - for ( i = 0; i < Sle_CutSize(pCut); i++ ) - Vec_IntPush( vMapping, Sle_CutLeaves(pCut)[i] ); + Vec_IntPush( vMapping, Sle_CutSize(pCutThis) ); + for ( i = 0; i < Sle_CutSize(pCutThis); i++ ) + Vec_IntPush( vMapping, Sle_CutLeaves(pCutThis)[i] ); Vec_IntPush( vMapping, iObj ); } + vMapTemp = p->pGia->vMapping; + p->pGia->vMapping = vMapping; // collect edges Vec_IntClear( vEdge2 ); Gia_ManForEachAndId( p->pGia, iObj ) @@ -918,6 +924,7 @@ void Sle_ManDeriveResult( Sle_Man_t * p, Vec_Int_t * vEdge2, Vec_Int_t * vMappin Vec_IntPushTwo( vEdge2, iFanin, iObj ); } } + p->pGia->vMapping = vMapTemp; } /**Function************************************************************* |