Commit 653dc8cf by Alan Mishchenko

Added bridge integration for multi-output 'pdr -a'.

parent 3b1cf097
...@@ -23754,7 +23754,7 @@ int Abc_CommandPdr( Abc_Frame_t * pAbc, int argc, char ** argv ) ...@@ -23754,7 +23754,7 @@ int Abc_CommandPdr( Abc_Frame_t * pAbc, int argc, char ** argv )
return 0; return 0;
} }
// run the procedure // run the procedure
pPars->fUseBridge = pAbc->fBatchMode; pPars->fUseBridge = pAbc->fBridgeMode;
pAbc->Status = Abc_NtkDarPdr( pNtk, pPars ); pAbc->Status = Abc_NtkDarPdr( pNtk, pPars );
pAbc->nFrames = pNtk->vSeqModelVec ? -1 : pPars->iFrame; pAbc->nFrames = pNtk->vSeqModelVec ? -1 : pPars->iFrame;
Abc_FrameReplacePoStatuses( pAbc, &pPars->vOutMap ); Abc_FrameReplacePoStatuses( pAbc, &pPars->vOutMap );
...@@ -200,12 +200,11 @@ void Gia_ManFromBridgeHolds( FILE * pFile, int iPoProved ) ...@@ -200,12 +200,11 @@ void Gia_ManFromBridgeHolds( FILE * pFile, int iPoProved )
fputc( (char)BRIDGE_VALUE_1, pFile ); // true fputc( (char)BRIDGE_VALUE_1, pFile ); // true
fputc( (char)1, pFile ); // size of vector (Armin's encoding) fputc( (char)1, pFile ); // size of vector (Armin's encoding)
// fputc( (char)0, pFile ); // number of the property (Armin's encoding)
Gia_AigerWriteUnsignedFile( pFile, iPoProved ); // number of the property (Armin's encoding) Gia_AigerWriteUnsignedFile( pFile, iPoProved ); // number of the property (Armin's encoding)
fputc( (char)0, pFile ); // no invariant fputc( (char)0, pFile ); // no invariant
fflush(pFile); fflush(pFile);
} }
void Gia_ManFromBridgeUnknown( FILE * pFile, int iPoProved ) void Gia_ManFromBridgeUnknown( FILE * pFile, int iPoUnknown )
{ {
fprintf( pFile, "%.6d", 101 /*message type = Result*/); fprintf( pFile, "%.6d", 101 /*message type = Result*/);
fprintf( pFile, " " ); fprintf( pFile, " " );
...@@ -214,8 +213,7 @@ void Gia_ManFromBridgeUnknown( FILE * pFile, int iPoProved ) ...@@ -214,8 +213,7 @@ void Gia_ManFromBridgeUnknown( FILE * pFile, int iPoProved )
fputc( (char)BRIDGE_VALUE_X, pFile ); // undef fputc( (char)BRIDGE_VALUE_X, pFile ); // undef
fputc( (char)1, pFile ); // size of vector (Armin's encoding) fputc( (char)1, pFile ); // size of vector (Armin's encoding)
// fputc( (char)0, pFile ); // number of the property (Armin's encoding) Gia_AigerWriteUnsignedFile( pFile, iPoUnknown ); // number of the property (Armin's encoding)
Gia_AigerWriteUnsignedFile( pFile, iPoProved ); // number of the property (Armin's encoding)
fflush(pFile); fflush(pFile);
} }
void Gia_ManFromBridgeCex( FILE * pFile, Abc_Cex_t * pCex ) void Gia_ManFromBridgeCex( FILE * pFile, Abc_Cex_t * pCex )
...@@ -224,7 +222,6 @@ void Gia_ManFromBridgeCex( FILE * pFile, Abc_Cex_t * pCex ) ...@@ -224,7 +222,6 @@ void Gia_ManFromBridgeCex( FILE * pFile, Abc_Cex_t * pCex )
Vec_Str_t * vStr = Vec_StrAlloc( 1000 ); Vec_Str_t * vStr = Vec_StrAlloc( 1000 );
Vec_StrPush( vStr, (char)BRIDGE_VALUE_0 ); // false Vec_StrPush( vStr, (char)BRIDGE_VALUE_0 ); // false
Vec_StrPush( vStr, (char)1 ); // size of vector (Armin's encoding) Vec_StrPush( vStr, (char)1 ); // size of vector (Armin's encoding)
// Vec_StrPush( vStr, (char)0 ); // number of the property (Armin's encoding)
Gia_AigerWriteUnsigned( vStr, pCex->iPo ); // number of the property (Armin's encoding) Gia_AigerWriteUnsigned( vStr, pCex->iPo ); // number of the property (Armin's encoding)
Vec_StrPush( vStr, (char)1 ); // size of vector (Armin's encoding) Vec_StrPush( vStr, (char)1 ); // size of vector (Armin's encoding)
Gia_AigerWriteUnsigned( vStr, pCex->iFrame ); // depth Gia_AigerWriteUnsigned( vStr, pCex->iFrame ); // depth
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment