diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-11-10 20:45:16 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-11-10 20:45:16 -0800 |
| commit | 1bef28e6c66e80b7ed4a53464044c3e0736a8ede (patch) | |
| tree | 0c87c7f8ea7b7a188ba7cf962292b8ced01788b8 /src/opt | |
| parent | ee789ba902b6f2c443717bdcb82506ecb6aed3b8 (diff) | |
| download | abc-1bef28e6c66e80b7ed4a53464044c3e0736a8ede.tar.gz abc-1bef28e6c66e80b7ed4a53464044c3e0736a8ede.tar.bz2 abc-1bef28e6c66e80b7ed4a53464044c3e0736a8ede.zip | |
Improved DSD.
Diffstat (limited to 'src/opt')
| -rw-r--r-- | src/opt/dau/dauDsd.c | 1 | ||||
| -rw-r--r-- | src/opt/dau/dauMerge.c | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/opt/dau/dauDsd.c b/src/opt/dau/dauDsd.c index fbba16db..9863f0be 100644 --- a/src/opt/dau/dauDsd.c +++ b/src/opt/dau/dauDsd.c @@ -1498,6 +1498,7 @@ void Dau_DsdTest44() // Dau_DsdNormalize( pStr2 ); // Dau_DsdExtract( pStr, 2, 0 ); t = 0; + nNonDec = 0; } void Dau_DsdTest33() diff --git a/src/opt/dau/dauMerge.c b/src/opt/dau/dauMerge.c index 8ab39568..f5117e5b 100644 --- a/src/opt/dau/dauMerge.c +++ b/src/opt/dau/dauMerge.c @@ -586,7 +586,7 @@ void Dau_DsdRemoveBraces( char * pDsd, int * pMatches ) } -clock_t s_TimeComp[3] = {0}; +clock_t s_TimeComp[4] = {0}; /**Function************************************************************* @@ -602,7 +602,7 @@ clock_t s_TimeComp[3] = {0}; char * Dau_DsdMerge( char * pDsd0i, int * pPerm0, char * pDsd1i, int * pPerm1, int fCompl0, int fCompl1 ) { int fVerbose = 0; - int fCheck = 1; + int fCheck = 0; static int Counter = 0; static char pRes[DAU_MAX_STR]; char pDsd0[DAU_MAX_STR]; @@ -658,7 +658,6 @@ printf( "%s\n", pDsd0 ); if ( fVerbose ) printf( "%s\n", pDsd1 ); -//s_TimeComp[2] += clock() - clk; if ( fCheck ) t0 = Dau_Dsd6ToTruth( pDsd0 ); @@ -683,9 +682,10 @@ printf( "Normalized:\n" ); if ( fVerbose ) printf( "%s\n", pRes ); - s_TimeComp[2] += clock() - clk; + s_TimeComp[0] += clock() - clk; return pRes; } +s_TimeComp[3] += clock() - clk; // create variable mapping nVarsTotal = Dau_DsdMergeCreateMaps( pVarPres, nVarsShared, pOld2New, pNew2Old ); // perform variable replacement @@ -766,9 +766,9 @@ printf( "%s\n", pRes ); printf( "Dau_DsdMerge(): Verification failed!\n" ); if ( Status == 0 ) - s_TimeComp[0] += clock() - clk; - else s_TimeComp[1] += clock() - clk; + else + s_TimeComp[2] += clock() - clk; return pRes; } |