From b288bac6b3567c0eccde1cb3ed1b6f7eff1d6408 Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Mon, 22 Jun 2015 23:05:02 -0700 Subject: Version abc90807 committer: Baruch Sterin --- src/opt/mfs/mfsCore.c | 4 ++-- src/opt/mfs/mfsResub.c | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src/opt/mfs') diff --git a/src/opt/mfs/mfsCore.c b/src/opt/mfs/mfsCore.c index 78d45b14..8f40d2f7 100644 --- a/src/opt/mfs/mfsCore.c +++ b/src/opt/mfs/mfsCore.c @@ -266,7 +266,7 @@ clk = clock(); return 1; } clk = clock(); - Abc_NtkMfsConstructGia( p ); +// Abc_NtkMfsConstructGia( p ); p->timeGia += clock() - clk; // solve the SAT problem if ( p->pPars->fPower ) @@ -280,7 +280,7 @@ p->timeGia += clock() - clk; Abc_NtkMfsResubNode2( p, pNode ); } p->timeSat += clock() - clk; - Abc_NtkMfsDeconstructGia( p ); +// Abc_NtkMfsDeconstructGia( p ); return 1; } diff --git a/src/opt/mfs/mfsResub.c b/src/opt/mfs/mfsResub.c index 8cd70dbf..b28e782a 100644 --- a/src/opt/mfs/mfsResub.c +++ b/src/opt/mfs/mfsResub.c @@ -99,16 +99,17 @@ int Abc_NtkMfsTryResubOnce( Mfs_Man_t * p, int * pCands, int nCands ) { unsigned * pData; int RetValue, iVar, i; - int clk = clock(), RetValue2 = Abc_NtkMfsTryResubOnceGia( p, pCands, nCands ); -p->timeGia += clock() - clk; +// int clk = clock(), RetValue2 = Abc_NtkMfsTryResubOnceGia( p, pCands, nCands ); +//p->timeGia += clock() - clk; p->nSatCalls++; RetValue = sat_solver_solve( p->pSat, pCands, pCands + nCands, (ABC_INT64_T)p->pPars->nBTLimit, (ABC_INT64_T)0, (ABC_INT64_T)0, (ABC_INT64_T)0 ); // assert( RetValue == l_False || RetValue == l_True ); - if ( RetValue != l_Undef && RetValue2 != -1 ) - { - assert( (RetValue == l_False) == (RetValue2 == 1) ); - } + +// if ( RetValue != l_Undef && RetValue2 != -1 ) +// { +// assert( (RetValue == l_False) == (RetValue2 == 1) ); +// } if ( RetValue == l_False ) return 1; -- cgit v1.2.3