Commit 27208922 by Alan Mishchenko

Removing hard-coded limit on the number of solving iterations in command 'qbf'.

parent e64cad10
...@@ -11564,9 +11564,9 @@ int Abc_CommandQbf( Abc_Frame_t * pAbc, int argc, char ** argv ) ...@@ -11564,9 +11564,9 @@ int Abc_CommandQbf( Abc_Frame_t * pAbc, int argc, char ** argv )
extern void Abc_NtkQbf( Abc_Ntk_t * pNtk, int nPars, int nIters, int fVerbose ); extern void Abc_NtkQbf( Abc_Ntk_t * pNtk, int nPars, int nIters, int fVerbose );
// set defaults // set defaults
nPars = -1; nPars = -1;
nIters = -1; nIters = 500;
fVerbose = 1; fVerbose = 1;
Extra_UtilGetoptReset(); Extra_UtilGetoptReset();
while ( ( c = Extra_UtilGetopt( argc, argv, "PIvh" ) ) != EOF ) while ( ( c = Extra_UtilGetopt( argc, argv, "PIvh" ) ) != EOF )
{ {
......
...@@ -65,7 +65,7 @@ void Abc_NtkQbf( Abc_Ntk_t * pNtk, int nPars, int nItersMax, int fVerbose ) ...@@ -65,7 +65,7 @@ void Abc_NtkQbf( Abc_Ntk_t * pNtk, int nPars, int nItersMax, int fVerbose )
Abc_Ntk_t * pNtkVer, * pNtkSyn, * pNtkSyn2, * pNtkTemp; Abc_Ntk_t * pNtkVer, * pNtkSyn, * pNtkSyn2, * pNtkTemp;
Vec_Int_t * vPiValues; Vec_Int_t * vPiValues;
clock_t clkTotal = clock(), clkS, clkV; clock_t clkTotal = clock(), clkS, clkV;
int nIters, nIterMax = 500, nInputs, RetValue, fFound = 0; int nIters, nInputs, RetValue, fFound = 0;
assert( Abc_NtkIsStrash(pNtk) ); assert( Abc_NtkIsStrash(pNtk) );
assert( Abc_NtkIsComb(pNtk) ); assert( Abc_NtkIsComb(pNtk) );
...@@ -96,7 +96,7 @@ void Abc_NtkQbf( Abc_Ntk_t * pNtk, int nPars, int nItersMax, int fVerbose ) ...@@ -96,7 +96,7 @@ void Abc_NtkQbf( Abc_Ntk_t * pNtk, int nPars, int nItersMax, int fVerbose )
} }
// iteratively solve // iteratively solve
for ( nIters = 0; nIters < nIterMax; nIters++ ) for ( nIters = 0; nIters < nItersMax; nIters++ )
{ {
// solve the synthesis instance // solve the synthesis instance
clkS = clock(); clkS = clock();
...@@ -170,7 +170,7 @@ clkV = clock() - clkV; ...@@ -170,7 +170,7 @@ clkV = clock() - clkV;
printf( "\n" ); printf( "\n" );
printf( "Solved after %d interations. ", nIters ); printf( "Solved after %d interations. ", nIters );
} }
else if ( nIters == nIterMax ) else if ( nIters == nItersMax )
printf( "Unsolved after %d interations. ", nIters ); printf( "Unsolved after %d interations. ", nIters );
else if ( nIters == nItersMax ) else if ( nIters == nItersMax )
printf( "Quit after %d interatios. ", nItersMax ); printf( "Quit after %d interatios. ", nItersMax );
......
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