diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-12-09 14:46:16 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-12-09 14:46:16 -0800 |
| commit | 58d4012a558cbf5f6786dc9fdcadc3f1538bdbe2 (patch) | |
| tree | 871796cca031fc63f082a66277cd9c2de1e71e5b /src/proof/abs | |
| parent | 9f396a0d7e652c420f4af74e4c8db06068bea862 (diff) | |
| download | abc-58d4012a558cbf5f6786dc9fdcadc3f1538bdbe2.tar.gz abc-58d4012a558cbf5f6786dc9fdcadc3f1538bdbe2.tar.bz2 abc-58d4012a558cbf5f6786dc9fdcadc3f1538bdbe2.zip | |
Enabling multi-output solving in 'pdr'.
Diffstat (limited to 'src/proof/abs')
| -rw-r--r-- | src/proof/abs/absOldRef.c | 10 | ||||
| -rw-r--r-- | src/proof/abs/absPth.c | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/proof/abs/absOldRef.c b/src/proof/abs/absOldRef.c index eb9b84fa..0b99ab40 100644 --- a/src/proof/abs/absOldRef.c +++ b/src/proof/abs/absOldRef.c @@ -134,7 +134,6 @@ Aig_Man_t * Saig_ManCexRefine( Aig_Man_t * p, Aig_Man_t * pAbs, Vec_Int_t * vFlo pSecPar->fVerbose = fVerbose; RetValue = Fra_FraigSec( pAbs, pSecPar, NULL ); */ - Abc_Cex_t * pCex = NULL; Aig_Man_t * pAbsOrpos = Saig_ManDupOrpos( pAbs ); Pdr_Par_t Pars, * pPars = &Pars; Pdr_ManSetDefaultParams( pPars ); @@ -142,11 +141,12 @@ Aig_Man_t * Saig_ManCexRefine( Aig_Man_t * p, Aig_Man_t * pAbs, Vec_Int_t * vFlo pPars->fVerbose = fVerbose; if ( pPars->fVerbose ) printf( "Running property directed reachability...\n" ); - RetValue = Pdr_ManSolve( pAbsOrpos, pPars, &pCex ); - if ( pCex ) - pCex->iPo = Saig_ManFindFailedPoCex( pAbs, pCex ); + RetValue = Pdr_ManSolve( pAbsOrpos, pPars ); + if ( pAbsOrpos->pSeqModel ) + pAbsOrpos->pSeqModel->iPo = Saig_ManFindFailedPoCex( pAbs, pAbsOrpos->pSeqModel ); + pAbs->pSeqModel = pAbsOrpos->pSeqModel; + pAbsOrpos->pSeqModel = NULL; Aig_ManStop( pAbsOrpos ); - pAbs->pSeqModel = pCex; if ( RetValue ) *piRetValue = 1; diff --git a/src/proof/abs/absPth.c b/src/proof/abs/absPth.c index 3c24d83e..ef38369c 100644 --- a/src/proof/abs/absPth.c +++ b/src/proof/abs/absPth.c @@ -107,8 +107,7 @@ void * Abs_ProverThread( void * pArg ) pPars->fSilent = 1; pPars->RunId = pThData->RunId; pPars->pFuncStop = Abs_CallBackToStop; - RetValue = Pdr_ManSolve( pThData->pAig, pPars, NULL ); -// RetValue = Pdr_ManSolve_test( pAig, pPars, NULL ); + RetValue = Pdr_ManSolve( pThData->pAig, pPars ); // update the result if ( RetValue == 1 ) { |