From 2ba12a76ff7992b5d1221d5926605d928691c053 Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Mon, 16 Sep 2013 22:50:39 -0700 Subject: Adding new switch to &if to relax the delay. --- src/map/if/ifUtil.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'src/map/if/ifUtil.c') diff --git a/src/map/if/ifUtil.c b/src/map/if/ifUtil.c index efc6fba3..eca5fbc6 100644 --- a/src/map/if/ifUtil.c +++ b/src/map/if/ifUtil.c @@ -182,13 +182,11 @@ void If_ManComputeRequired( If_Man_t * p ) { // get the global required times p->RequiredGlo = If_ManDelayMax( p, 0 ); -/* - //////////////////////////////////////// - // redefine the delay target (positive number means percentage) - if ( p->pPars->DelayTarget > 0 ) - p->pPars->DelayTarget = p->RequiredGlo * (100.0 + p->pPars->DelayTarget) / 100.0; - //////////////////////////////////////// -*/ + + // find new delay target + if ( p->pPars->nRelaxRatio && p->pPars->DelayTargetNew == 0 ) + p->pPars->DelayTargetNew = p->RequiredGlo * (100.0 + p->pPars->nRelaxRatio) / 100.0; + // update the required times according to the target if ( p->pPars->DelayTarget != -1 ) { @@ -210,6 +208,8 @@ void If_ManComputeRequired( If_Man_t * p ) p->RequiredGlo = p->pPars->DelayTarget; } } + else if ( p->pPars->DelayTargetNew > 0 ) // relax the required times + p->RequiredGlo = p->pPars->DelayTargetNew; // do not propagate required times if area minimization is requested if ( p->pPars->fAreaOnly ) return; @@ -239,6 +239,11 @@ void If_ManComputeRequired( If_Man_t * p ) { // get the global required times p->RequiredGlo = If_ManDelayMax( p, 0 ); + + // find new delay target + if ( p->pPars->nRelaxRatio && p->pPars->DelayTargetNew == 0 ) + p->pPars->DelayTargetNew = p->RequiredGlo * (100.0 + p->pPars->nRelaxRatio) / 100.0; + // update the required times according to the target if ( p->pPars->DelayTarget != -1 ) { @@ -260,6 +265,9 @@ void If_ManComputeRequired( If_Man_t * p ) p->RequiredGlo = p->pPars->DelayTarget; } } + else if ( p->pPars->DelayTargetNew > 0 ) // relax the required times + p->RequiredGlo = p->pPars->DelayTargetNew; + // do not propagate required times if area minimization is requested if ( p->pPars->fAreaOnly ) return; -- cgit v1.2.3