Commit 1d89ae52 by Alan Mishchenko

Correcting &gla to update status as 'sat' after CEX is found.

parent 6df122bd
...@@ -1964,10 +1964,7 @@ int Gia_GlaPerform( Gia_Man_t * pAig, Gia_ParVta_t * pPars, int fStartVta ) ...@@ -1964,10 +1964,7 @@ int Gia_GlaPerform( Gia_Man_t * pAig, Gia_ParVta_t * pPars, int fStartVta )
p->timeCex += clock() - clk2; p->timeCex += clock() - clk2;
if ( pCex != NULL ) if ( pCex != NULL )
{
RetValue = 0;
goto finish; goto finish;
}
// print the result (do not count it towards change) // print the result (do not count it towards change)
if ( p->pPars->fVerbose ) if ( p->pPars->fVerbose )
Gla_ManAbsPrintFrame( p, -1, f+1, sat_solver2_nconflicts(p->pSat)-nConflsBeg, i, clock() - clk ); Gla_ManAbsPrintFrame( p, -1, f+1, sat_solver2_nconflicts(p->pSat)-nConflsBeg, i, clock() - clk );
...@@ -2011,7 +2008,6 @@ int Gia_GlaPerform( Gia_Man_t * pAig, Gia_ParVta_t * pPars, int fStartVta ) ...@@ -2011,7 +2008,6 @@ int Gia_GlaPerform( Gia_Man_t * pAig, Gia_ParVta_t * pPars, int fStartVta )
// make sure, there was no initial abstraction (otherwise, it was invalid) // make sure, there was no initial abstraction (otherwise, it was invalid)
assert( pAig->vObjClasses == NULL && f < p->pPars->nFramesStart ); assert( pAig->vObjClasses == NULL && f < p->pPars->nFramesStart );
// pCex = Vga_ManDeriveCex( p ); // pCex = Vga_ManDeriveCex( p );
RetValue = 0;
break; break;
} }
} }
...@@ -2084,6 +2080,7 @@ finish: ...@@ -2084,6 +2080,7 @@ finish:
Abc_Print( 1, "Counter-example detected in frame %d. ", f ); Abc_Print( 1, "Counter-example detected in frame %d. ", f );
p->pPars->iFrame = pCex->iFrame - 1; p->pPars->iFrame = pCex->iFrame - 1;
Vec_IntFreeP( &pAig->vGateClasses ); Vec_IntFreeP( &pAig->vGateClasses );
RetValue = 0;
} }
Abc_PrintTime( 1, "Time", clock() - clk ); Abc_PrintTime( 1, "Time", clock() - clk );
if ( p->pPars->fVerbose ) if ( p->pPars->fVerbose )
......
...@@ -1621,10 +1621,7 @@ int Gia_VtaPerformInt( Gia_Man_t * pAig, Gia_ParVta_t * pPars ) ...@@ -1621,10 +1621,7 @@ int Gia_VtaPerformInt( Gia_Man_t * pAig, Gia_ParVta_t * pPars )
pCex = Vta_ManRefineAbstraction( p, f ); pCex = Vta_ManRefineAbstraction( p, f );
p->timeCex += clock() - clk2; p->timeCex += clock() - clk2;
if ( pCex != NULL ) if ( pCex != NULL )
{
RetValue = 0;
goto finish; goto finish;
}
// print the result (do not count it towards change) // print the result (do not count it towards change)
Vta_ManAbsPrintFrame( p, NULL, f+1, sat_solver2_nconflicts(p->pSat)-nConflsBeg, i, clock() - clk, p->pPars->fVerbose ); Vta_ManAbsPrintFrame( p, NULL, f+1, sat_solver2_nconflicts(p->pSat)-nConflsBeg, i, clock() - clk, p->pPars->fVerbose );
} }
...@@ -1653,7 +1650,6 @@ int Gia_VtaPerformInt( Gia_Man_t * pAig, Gia_ParVta_t * pPars ) ...@@ -1653,7 +1650,6 @@ int Gia_VtaPerformInt( Gia_Man_t * pAig, Gia_ParVta_t * pPars )
// make sure, there was no initial abstraction (otherwise, it was invalid) // make sure, there was no initial abstraction (otherwise, it was invalid)
assert( pAig->vObjClasses == NULL && f < p->pPars->nFramesStart ); assert( pAig->vObjClasses == NULL && f < p->pPars->nFramesStart );
pCex = Vga_ManDeriveCex( p ); pCex = Vga_ManDeriveCex( p );
RetValue = 0;
break; break;
} }
// add the core // add the core
...@@ -1738,6 +1734,7 @@ finish: ...@@ -1738,6 +1734,7 @@ finish:
Abc_Print( 1, "Counter-example detected in frame %d. ", f ); Abc_Print( 1, "Counter-example detected in frame %d. ", f );
p->pPars->iFrame = pCex->iFrame - 1; p->pPars->iFrame = pCex->iFrame - 1;
Vec_IntFreeP( &pAig->vObjClasses ); Vec_IntFreeP( &pAig->vObjClasses );
RetValue = 0;
} }
Abc_PrintTime( 1, "Time", clock() - clk ); Abc_PrintTime( 1, "Time", clock() - clk );
......
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