diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2013-05-05 09:04:14 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2013-05-05 09:04:14 -0700 |
| commit | eacfad762271794965d428cacd1ce56fbc575f93 (patch) | |
| tree | d4f004b991b412bce177d4637a8322bd26a1f9cd /src/base/abci | |
| parent | 7d3301584a82b06e9c6a887e02554bc6a14bec5e (diff) | |
| download | abc-eacfad762271794965d428cacd1ce56fbc575f93.tar.gz abc-eacfad762271794965d428cacd1ce56fbc575f93.tar.bz2 abc-eacfad762271794965d428cacd1ce56fbc575f93.zip | |
Changing the queue to work in the same the array of costs is realloced.
Diffstat (limited to 'src/base/abci')
| -rw-r--r-- | src/base/abci/abcFx.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/base/abci/abcFx.c b/src/base/abci/abcFx.c index 77a606f1..b337c6ca 100644 --- a/src/base/abci/abcFx.c +++ b/src/base/abci/abcFx.c @@ -636,10 +636,7 @@ int Fx_ManCubeSingleCubeDivisors( Fx_Man_t * p, Vec_Int_t * vPivot, int fRemove, { if ( Vec_FltSize(p->vWeights) == iDiv ) { - float * pArray = Vec_FltArray(p->vWeights); Vec_FltPush(p->vWeights, -2); - if ( p->vPrio && pArray != Vec_FltArray(p->vWeights) ) - Vec_QueSetCosts( p->vPrio, Vec_FltArray(p->vWeights) ); p->nDivsS++; } assert( iDiv < Vec_FltSize(p->vWeights) ); @@ -692,12 +689,7 @@ void Fx_ManCubeDoubleCubeDivisors( Fx_Man_t * p, int iFirst, Vec_Int_t * vPivot, if ( !fRemove ) { if ( iDiv == Vec_FltSize(p->vWeights) ) - { - float * pArray = Vec_FltArray(p->vWeights); Vec_FltPush(p->vWeights, -Vec_IntSize(p->vFree)); - if ( p->vPrio && pArray != Vec_FltArray(p->vWeights) ) - Vec_QueSetCosts( p->vPrio, Vec_FltArray(p->vWeights) ); - } assert( iDiv < Vec_FltSize(p->vWeights) ); Vec_FltAddToEntry( p->vWeights, iDiv, Base + Vec_IntSize(p->vFree) - 1 ); p->nPairsD++; @@ -735,7 +727,7 @@ void Fx_ManCreateDivisors( Fx_Man_t * p ) Fx_ManCubeDoubleCubeDivisors( p, i+1, vCube, 0, 0 ); // add - no update // create queue with all divisors p->vPrio = Vec_QueAlloc( Vec_FltSize(p->vWeights) ); - Vec_QueSetCosts( p->vPrio, Vec_FltArray(p->vWeights) ); + Vec_QueSetCosts( p->vPrio, Vec_FltArrayP(p->vWeights) ); Vec_FltForEachEntry( p->vWeights, Weight, i ) if ( Weight > 0.0 ) Vec_QuePush( p->vPrio, i ); |