From ef20b0c5336e28a3e09db9f0accfc072db1559cc Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Fri, 4 Apr 2008 08:01:00 -0700 Subject: Version abc80404 --- src/aig/ntl/ntlExtract.c | 2 +- src/aig/ntl/ntlReadBlif.c | 4 ++-- src/aig/ntl/ntlTime.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/aig/ntl') diff --git a/src/aig/ntl/ntlExtract.c b/src/aig/ntl/ntlExtract.c index 55356654..cd21c95f 100644 --- a/src/aig/ntl/ntlExtract.c +++ b/src/aig/ntl/ntlExtract.c @@ -387,7 +387,7 @@ int Ntl_ManExtract_rec( Ntl_Man_t * p, Ntl_Net_t * pNet ) // add box inputs/outputs to COs/CIs if ( Ntl_ObjIsBox(pObj) ) { - int LevelCur, LevelMax = -TIME_ETERNITY; + int LevelCur, LevelMax = -TIM_ETERNITY; Vec_IntPush( p->vBox1Cos, Aig_ManPoNum(p->pAig) ); Ntl_ObjForEachFanin( pObj, pNetFanin, i ) { diff --git a/src/aig/ntl/ntlReadBlif.c b/src/aig/ntl/ntlReadBlif.c index 81ea2a2c..2cf3caaa 100644 --- a/src/aig/ntl/ntlReadBlif.c +++ b/src/aig/ntl/ntlReadBlif.c @@ -974,9 +974,9 @@ static int Ioa_ReadParseLineTimes( Ioa_ReadMod_t * p, char * pLine, int fOutput // find the delay number pTokenNum = Vec_PtrEntryLast(vTokens); if ( !strcmp( pTokenNum, "-inf" ) ) - Delay = -TIME_ETERNITY; + Delay = -TIM_ETERNITY; else if ( !strcmp( pTokenNum, "inf" ) ) - Delay = TIME_ETERNITY; + Delay = TIM_ETERNITY; else Delay = atof( pTokenNum ); if ( Delay == 0.0 && pTokenNum[0] != '0' ) diff --git a/src/aig/ntl/ntlTime.c b/src/aig/ntl/ntlTime.c index cf2ec0f1..94691ab8 100644 --- a/src/aig/ntl/ntlTime.c +++ b/src/aig/ntl/ntlTime.c @@ -90,11 +90,11 @@ Tim_Man_t * Ntl_ManCreateTiming( Ntl_Man_t * p ) // unpack the data in the arrival times if ( pRoot->vArrivals ) Vec_IntForEachEntry( pRoot->vArrivals, Entry, i ) - Tim_ManInitPiArrival( pMan, Entry, Aig_Int2Float(Vec_IntEntry(pRoot->vArrivals,++i)) ); + Tim_ManInitCiArrival( pMan, Entry, Aig_Int2Float(Vec_IntEntry(pRoot->vArrivals,++i)) ); // unpack the data in the required times if ( pRoot->vRequireds ) Vec_IntForEachEntry( pRoot->vRequireds, Entry, i ) - Tim_ManInitPoRequired( pMan, Entry, Aig_Int2Float(Vec_IntEntry(pRoot->vRequireds,++i)) ); + Tim_ManInitCoRequired( pMan, Entry, Aig_Int2Float(Vec_IntEntry(pRoot->vRequireds,++i)) ); // derive timing tables vDelayTables = Vec_PtrAlloc( Vec_PtrSize(p->vModels) ); Ntl_ManForEachModel( p, pModel, i ) -- cgit v1.2.3