diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-01-21 04:30:10 -0800 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-01-21 04:30:10 -0800 |
commit | 8014f25f6db719fa62336f997963532a14c568f6 (patch) | |
tree | c691ee91a3a2d452a2bd24ac89a8c717beaa7af7 /src/opt/rwr/rwrUtil.c | |
parent | c44cc5de9429e6b4f1c05045fcf43c9cb96437b5 (diff) | |
download | abc-8014f25f6db719fa62336f997963532a14c568f6.tar.gz abc-8014f25f6db719fa62336f997963532a14c568f6.tar.bz2 abc-8014f25f6db719fa62336f997963532a14c568f6.zip |
Major restructuring of the code.
Diffstat (limited to 'src/opt/rwr/rwrUtil.c')
-rw-r--r-- | src/opt/rwr/rwrUtil.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/opt/rwr/rwrUtil.c b/src/opt/rwr/rwrUtil.c index 7613691a..1b2e8760 100644 --- a/src/opt/rwr/rwrUtil.c +++ b/src/opt/rwr/rwrUtil.c @@ -18,7 +18,6 @@ ***********************************************************************/ -#include "extra.h" #include "rwr.h" ABC_NAMESPACE_IMPL_START @@ -491,7 +490,7 @@ void Rwr_ManLoadFromArray( Rwr_Man_t * p, int fVerbose ) p0 = (Rwr_Node_t *)p->vForest->pArray[Entry0 >> 1]; p1 = (Rwr_Node_t *)p->vForest->pArray[Entry1 >> 1]; // compute the level and volume of the new nodes - Level = 1 + ABC_MAX( p0->Level, p1->Level ); + Level = 1 + Abc_MaxInt( p0->Level, p1->Level ); Volume = 1 + Rwr_ManNodeVolume( p, p0, p1 ); // set the complemented attributes p0 = Rwr_NotCond( p0, (Entry0 & 1) ); @@ -586,7 +585,7 @@ void Rwr_ManLoadFromFile( Rwr_Man_t * p, char * pFileName ) p0 = (Rwr_Node_t *)p->vForest->pArray[pBuffer[2*i + 0] >> 1]; p1 = (Rwr_Node_t *)p->vForest->pArray[pBuffer[2*i + 1] >> 1]; // compute the level and volume of the new nodes - Level = 1 + ABC_MAX( p0->Level, p1->Level ); + Level = 1 + Abc_MaxInt( p0->Level, p1->Level ); Volume = 1 + Rwr_ManNodeVolume( p, p0, p1 ); // set the complemented attributes p0 = Rwr_NotCond( p0, (pBuffer[2*i + 0] & 1) ); |