diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2008-03-15 08:01:00 -0700 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2008-03-15 08:01:00 -0700 |
commit | 9b059e3085eaa55817684926b3c508ba7fe0075f (patch) | |
tree | 9683e4b1a56dd022adf07547f43707eb9f4da9db /src/aig | |
parent | ff6f0943362c30176fd1f961bcbd19e188cee520 (diff) | |
download | abc-9b059e3085eaa55817684926b3c508ba7fe0075f.tar.gz abc-9b059e3085eaa55817684926b3c508ba7fe0075f.tar.bz2 abc-9b059e3085eaa55817684926b3c508ba7fe0075f.zip |
Version abc80315
Diffstat (limited to 'src/aig')
-rw-r--r-- | src/aig/aig/aigInter.c | 8 | ||||
-rw-r--r-- | src/aig/bdc/bdcCore.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/aig/aig/aigInter.c b/src/aig/aig/aigInter.c index d6b724c7..b58b758d 100644 --- a/src/aig/aig/aigInter.c +++ b/src/aig/aig/aigInter.c @@ -143,7 +143,7 @@ void Aig_ManInterFast( Aig_Man_t * pManOn, Aig_Man_t * pManOff, int fVerbose ) SeeAlso [] ***********************************************************************/ -Aig_Man_t * Aig_ManInter( Aig_Man_t * pManOn, Aig_Man_t * pManOff, int fVerbose ) +Aig_Man_t * Aig_ManInter( Aig_Man_t * pManOn, Aig_Man_t * pManOff, int fRelation, int fVerbose ) { void * pSatCnf = NULL; Inta_Man_t * pManInter; @@ -187,9 +187,10 @@ clk = clock(); sat_solver_store_mark_clauses_a( pSat ); // update the last clause + if ( fRelation ) { extern int sat_solver_store_change_last( sat_solver * pSat ); -// iLast = sat_solver_store_change_last( pSat ); + iLast = sat_solver_store_change_last( pSat ); } // add clauses of B @@ -207,7 +208,8 @@ clk = clock(); // add PI clauses // collect the common variables vVarsAB = Vec_IntAlloc( Aig_ManPiNum(pManOn) ); -// Vec_IntPush( vVarsAB, iLast ); + if ( fRelation ) + Vec_IntPush( vVarsAB, iLast ); Aig_ManForEachPi( pManOn, pObj, i ) { diff --git a/src/aig/bdc/bdcCore.c b/src/aig/bdc/bdcCore.c index 13275377..67b6bcdc 100644 --- a/src/aig/bdc/bdcCore.c +++ b/src/aig/bdc/bdcCore.c @@ -44,7 +44,7 @@ Bdc_Man_t * Bdc_ManAlloc( Bdc_Par_t * pPars ) Bdc_Man_t * p; p = ALLOC( Bdc_Man_t, 1 ); memset( p, 0, sizeof(Bdc_Man_t) ); - assert( pPars->nVarsMax > 3 && pPars->nVarsMax < 16 ); + assert( pPars->nVarsMax > 2 && pPars->nVarsMax < 16 ); p->pPars = pPars; p->nWords = Kit_TruthWordNum( pPars->nVarsMax ); p->nDivsLimit = 200; |