Commit daeffe79 by Alan Mishchenko

Making report about the number of correcty covered frames consistent across the engines.

parent fed18333
...@@ -833,7 +833,7 @@ int Saig_BmcPerform( Aig_Man_t * pAig, int nStart, int nFramesMax, int nNodesMax ...@@ -833,7 +833,7 @@ int Saig_BmcPerform( Aig_Man_t * pAig, int nStart, int nFramesMax, int nNodesMax
p->iOutputFail, p->pAig->pName, p->iFrameFail ); p->iOutputFail, p->pAig->pName, p->iFrameFail );
Status = 0; Status = 0;
if ( piFrames ) if ( piFrames )
*piFrames = p->iFrameFail; *piFrames = p->iFrameFail - 1;
} }
else // if ( RetValue == l_False || RetValue == l_Undef ) else // if ( RetValue == l_False || RetValue == l_Undef )
{ {
...@@ -842,9 +842,9 @@ int Saig_BmcPerform( Aig_Man_t * pAig, int nStart, int nFramesMax, int nNodesMax ...@@ -842,9 +842,9 @@ int Saig_BmcPerform( Aig_Man_t * pAig, int nStart, int nFramesMax, int nNodesMax
if ( piFrames ) if ( piFrames )
{ {
if ( p->iOutputLast > 0 ) if ( p->iOutputLast > 0 )
*piFrames = p->iFramePrev - 1; *piFrames = p->iFramePrev - 2;
else else
*piFrames = p->iFramePrev; *piFrames = p->iFramePrev - 1;
} }
} }
if ( !fSilent ) if ( !fSilent )
......
...@@ -1551,7 +1551,7 @@ clkOther += clock() - clk2; ...@@ -1551,7 +1551,7 @@ clkOther += clock() - clk2;
if ( nJumpFrame && pPars->nStart == 0 ) if ( nJumpFrame && pPars->nStart == 0 )
pPars->iFrame = nJumpFrame - pPars->nFramesJump; pPars->iFrame = nJumpFrame - pPars->nFramesJump;
else if ( RetValue == -1 && pPars->nStart == 0 ) else if ( RetValue == -1 && pPars->nStart == 0 )
pPars->iFrame = f; pPars->iFrame = f-1;
//ABC_PRT( "CNF generation runtime", clkOther ); //ABC_PRT( "CNF generation runtime", clkOther );
if ( pPars->fVerbose ) if ( pPars->fVerbose )
{ {
......
...@@ -97,7 +97,7 @@ int Inter_ManPerformInterpolation( Aig_Man_t * pAig, Inter_ManParams_t * pPars, ...@@ -97,7 +97,7 @@ int Inter_ManPerformInterpolation( Aig_Man_t * pAig, Inter_ManParams_t * pPars,
if ( Inter_ManCheckInitialState(pAig) ) if ( Inter_ManCheckInitialState(pAig) )
{ {
*piFrame = 0; *piFrame = -1;
printf( "Property trivially fails in the initial state.\n" ); printf( "Property trivially fails in the initial state.\n" );
return 0; return 0;
} }
...@@ -223,7 +223,7 @@ p->timeEqu += clock() - clk; ...@@ -223,7 +223,7 @@ p->timeEqu += clock() - clk;
ABC_PRT( "Time", clock() - clk ); ABC_PRT( "Time", clock() - clk );
} }
// remember the number of timeframes completed // remember the number of timeframes completed
pPars->iFrameMax = i + 1 + p->nFrames; pPars->iFrameMax = i - 1 + p->nFrames;
if ( RetValue == 0 ) // found a (spurious?) counter-example if ( RetValue == 0 ) // found a (spurious?) counter-example
{ {
if ( i == 0 ) // real counterexample if ( i == 0 ) // real counterexample
......
...@@ -709,6 +709,7 @@ int Pdr_ManSolve_( Aig_Man_t * pAig, Pdr_Par_t * pPars, Vec_Int_t ** pvPrioInit, ...@@ -709,6 +709,7 @@ int Pdr_ManSolve_( Aig_Man_t * pAig, Pdr_Par_t * pPars, Vec_Int_t ** pvPrioInit,
p->vPrio = NULL; p->vPrio = NULL;
} }
Pdr_ManStop( p ); Pdr_ManStop( p );
pPars->iFrame--;
return RetValue; return RetValue;
} }
......
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