diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2014-06-02 10:01:07 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2014-06-02 10:01:07 -0700 |
| commit | 802377ed4e76de8074ec072506b01f9eadf7ee1f (patch) | |
| tree | b081c5210cb6cf8996c856e75f89cc966590b92e /src/proof | |
| parent | 67050333b25c6e10a31fcd11138f9ab3ec26cff5 (diff) | |
| download | abc-802377ed4e76de8074ec072506b01f9eadf7ee1f.tar.gz abc-802377ed4e76de8074ec072506b01f9eadf7ee1f.tar.bz2 abc-802377ed4e76de8074ec072506b01f9eadf7ee1f.zip | |
Adding CEC command &splitprove.
Diffstat (limited to 'src/proof')
| -rw-r--r-- | src/proof/cec/cecSplit.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/proof/cec/cecSplit.c b/src/proof/cec/cecSplit.c index 0f3f84c2..6046df37 100644 --- a/src/proof/cec/cecSplit.c +++ b/src/proof/cec/cecSplit.c @@ -207,7 +207,7 @@ static inline sat_solver * Cec_GiaDeriveSolver( Gia_Man_t * p, int nTimeOut ) Cnf_DataFree( pCnf ); return pSat; } -static inline int Cnf_GiaSolveOne( Gia_Man_t * p, int nTimeOut, int fVerbose ) +static inline int Cnf_GiaSolveOne( Gia_Man_t * p, int nTimeOut, int nSize, int fVerbose ) { static int Counter = 0; abctime clk = Abc_Clock(); @@ -216,6 +216,7 @@ static inline int Cnf_GiaSolveOne( Gia_Man_t * p, int nTimeOut, int fVerbose ) if ( fVerbose ) { printf( "Iter%6d : ", Counter++ ); + printf( "Size =%7d ", nSize ); printf( "Input = %3d ", Gia_ManPiNum(p) ); printf( "Var =%10d ", sat_solver_nvars(pSat) ); printf( "Clause =%10d ", sat_solver_nclauses(pSat) ); @@ -252,9 +253,9 @@ static inline int Cnf_GiaSolveOne( Gia_Man_t * p, int nTimeOut, int fVerbose ) } */ } -static inline int Cnf_GiaCheckOne( Vec_Ptr_t * vStack, Gia_Man_t * p, int nTimeOut, int fVerbose ) +static inline int Cnf_GiaCheckOne( Vec_Ptr_t * vStack, Gia_Man_t * p, int nTimeOut, int nSize, int fVerbose ) { - int status = Cnf_GiaSolveOne( p, nTimeOut, fVerbose ); + int status = Cnf_GiaSolveOne( p, nTimeOut, nSize, fVerbose ); if ( status == -1 ) { Vec_PtrPush( vStack, p ); @@ -304,7 +305,7 @@ int Cec_GiaSplitTest( Gia_Man_t * p, int nTimeOut, int fVerbose ) } // start with the current problem vStack = Vec_PtrAlloc( 1000 ); - if ( !Cnf_GiaCheckOne(vStack, pNew, nTimeOut, fVerbose) ) + if ( !Cnf_GiaCheckOne(vStack, pNew, nTimeOut, Vec_PtrSize(vStack), fVerbose) ) RetValue = 0; else { @@ -313,7 +314,7 @@ int Cec_GiaSplitTest( Gia_Man_t * p, int nTimeOut, int fVerbose ) pNew = (Gia_Man_t *)Vec_PtrPop( vStack ); // cofactor pPart0 = Gia_ManDupDfsRehash( pNew, 1, 0 ); - if ( !Cnf_GiaCheckOne(vStack, pPart0, nTimeOut, fVerbose) ) + if ( !Cnf_GiaCheckOne(vStack, pPart0, nTimeOut, Vec_PtrSize(vStack), fVerbose) ) { Gia_ManStop( pNew ); RetValue = 0; @@ -322,13 +323,13 @@ int Cec_GiaSplitTest( Gia_Man_t * p, int nTimeOut, int fVerbose ) // cofactor pPart1 = Gia_ManDupDfsRehash( pNew, 1, 1 ); Gia_ManStop( pNew ); - if ( !Cnf_GiaCheckOne(vStack, pPart1, nTimeOut, fVerbose) ) + if ( !Cnf_GiaCheckOne(vStack, pPart1, nTimeOut, Vec_PtrSize(vStack), fVerbose) ) { RetValue = 0; break; } - if ( Vec_PtrSize(vStack) > 2 ) - break; +// if ( Vec_PtrSize(vStack) > 2 ) +// break; } if ( Vec_PtrSize(vStack) == 0 ) RetValue = 1; |