diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-07-07 10:44:34 -0700 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-07-07 10:44:34 -0700 |
commit | 8b881d235a90e67282fa2e91bbfec8c4e6685878 (patch) | |
tree | 1ab26419ca1ec1bd8639f9b12df6a4f5eb996012 /src/proof | |
parent | 31d85e732b2648049171abfb906216dfe31449f3 (diff) | |
download | abc-8b881d235a90e67282fa2e91bbfec8c4e6685878.tar.gz abc-8b881d235a90e67282fa2e91bbfec8c4e6685878.tar.bz2 abc-8b881d235a90e67282fa2e91bbfec8c4e6685878.zip |
Making 'pdr', &gla, &vta print correctly in batch mode.
Diffstat (limited to 'src/proof')
-rw-r--r-- | src/proof/pdr/pdrInv.c | 4 | ||||
-rw-r--r-- | src/proof/ssw/sswRarity.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/proof/pdr/pdrInv.c b/src/proof/pdr/pdrInv.c index c4a85875..f9b4a55d 100644 --- a/src/proof/pdr/pdrInv.c +++ b/src/proof/pdr/pdrInv.c @@ -50,6 +50,8 @@ void Pdr_ManPrintProgress( Pdr_Man_t * p, int fClose, clock_t Time ) int i, ThisSize, Length, LengthStart; if ( Vec_PtrSize(p->vSolvers) < 2 ) return; + if ( Abc_FrameIsBatchMode() && !fClose ) + return; // count the total length of the printout Length = 0; Vec_VecForEachLevel( p->vClauses, vVec, i ) @@ -78,7 +80,7 @@ void Pdr_ManPrintProgress( Pdr_Man_t * p, int fClose, clock_t Time ) for ( i = ThisSize; i < 70; i++ ) Abc_Print( 1, " " ); Abc_Print( 1, "%6d", p->nQueMax ); - Abc_Print( 1, " %8.2f sec", (float)(Time)/(float)(CLOCKS_PER_SEC) ); + Abc_Print( 1, "%10.2f sec", 1.0*Time/CLOCKS_PER_SEC ); Abc_Print( 1, "%s", fClose ? "\n":"\r" ); if ( fClose ) p->nQueMax = 0; diff --git a/src/proof/ssw/sswRarity.c b/src/proof/ssw/sswRarity.c index 445dda84..032bc5ba 100644 --- a/src/proof/ssw/sswRarity.c +++ b/src/proof/ssw/sswRarity.c @@ -20,6 +20,7 @@ #include "sswInt.h" #include "src/aig/gia/giaAig.h" +#include "src/base/main/main.h" ABC_NAMESPACE_IMPL_START @@ -1074,7 +1075,7 @@ int Ssw_RarSignalFilter( Aig_Man_t * pAig, int nFrames, int nWords, int nBinSize if ( fMiter && Ssw_RarManCheckNonConstOutputs(p) ) { if ( !fVerbose ) - printf( "\r" ); + printf( "%s", Abc_FrameIsBatchMode() ? "\n" : "\r" ); // printf( "Simulation asserted a PO in frame f: %d <= f < %d.\n", r * nFrames, (r+1) * nFrames ); Ssw_RarManPrepareRandom( nRandSeed ); Abc_CexFree( pAig->pSeqModel ); @@ -1108,7 +1109,7 @@ finish: if ( r == nRounds && f == nFrames ) { if ( !fVerbose ) - printf( "\r" ); + printf( "%s", Abc_FrameIsBatchMode() ? "\n" : "\r" ); printf( "Simulation did not assert POs in the first %d frames. ", nRounds * nFrames ); Abc_PrintTime( 1, "Time", clock() - clkTotal ); } |