diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-09-23 18:34:10 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-09-23 18:34:10 -0700 |
| commit | 40d9b5853b2849c3bf7e2157a4b4c6b798b043d5 (patch) | |
| tree | 7c49799a451a3148a757efb35762ffa7c7aa2d01 /src/aig/gia | |
| parent | f7caf84f21ff02b12e41be6b7e1fdfeeab3a560f (diff) | |
| download | abc-40d9b5853b2849c3bf7e2157a4b4c6b798b043d5.tar.gz abc-40d9b5853b2849c3bf7e2157a4b4c6b798b043d5.tar.bz2 abc-40d9b5853b2849c3bf7e2157a4b4c6b798b043d5.zip | |
Testing GIA with time manager.
Diffstat (limited to 'src/aig/gia')
| -rw-r--r-- | src/aig/gia/gia.h | 1 | ||||
| -rw-r--r-- | src/aig/gia/giaAiger.c | 2 | ||||
| -rw-r--r-- | src/aig/gia/giaEquiv.c | 28 |
3 files changed, 10 insertions, 21 deletions
diff --git a/src/aig/gia/gia.h b/src/aig/gia/gia.h index c17fae5f..ef87c5d5 100644 --- a/src/aig/gia/gia.h +++ b/src/aig/gia/gia.h @@ -281,6 +281,7 @@ static inline int Gia_ManAndNum( Gia_Man_t * p ) { return p->nObjs static inline int Gia_ManCandNum( Gia_Man_t * p ) { return Gia_ManCiNum(p) + Gia_ManAndNum(p); } static inline int Gia_ManConstrNum( Gia_Man_t * p ) { return p->nConstrs; } static inline void Gia_ManFlipVerbose( Gia_Man_t * p ) { p->fVerbose ^= 1; } +static inline int Gia_ManWithChoices( Gia_Man_t * p ) { return p->pReprs != NULL; } static inline Gia_Obj_t * Gia_ManConst0( Gia_Man_t * p ) { return p->pObjs; } static inline Gia_Obj_t * Gia_ManConst1( Gia_Man_t * p ) { return Gia_Not(Gia_ManConst0(p)); } diff --git a/src/aig/gia/giaAiger.c b/src/aig/gia/giaAiger.c index 0873602d..7940c790 100644 --- a/src/aig/gia/giaAiger.c +++ b/src/aig/gia/giaAiger.c @@ -1266,7 +1266,7 @@ unsigned char * Gia_WriteEquivClasses( Gia_Man_t * p, int * pEquivSize ) Gia_ClassForEachObj( p, iRepr, iNode ) nItems++; } - pBuffer = ABC_ALLOC( unsigned char, sizeof(int) * (nItems + 1) ); + pBuffer = ABC_ALLOC( unsigned char, sizeof(int) * (nItems + 10) ); // write constant class iPos = Gia_WriteAigerEncode( pBuffer, 4, Abc_Var2Lit(0, 1) ); //printf( "\nRepr = %d ", 0 ); diff --git a/src/aig/gia/giaEquiv.c b/src/aig/gia/giaEquiv.c index 9ccb91fe..b9557600 100644 --- a/src/aig/gia/giaEquiv.c +++ b/src/aig/gia/giaEquiv.c @@ -366,7 +366,7 @@ void Gia_ManReverseClasses( Gia_Man_t * p, int fNowIncreasing ) Gia_ManForEachClass( p, iRepr ) { Vec_IntPush( vCollected, iRepr ); - +/* // check classes if ( !fNowIncreasing ) { @@ -384,20 +384,8 @@ void Gia_ManReverseClasses( Gia_Man_t * p, int fNowIncreasing ) iPrev = iNode; } } +*/ } - - iRepr = 129720; - printf( "Class %d : ", iRepr ); - Gia_ClassForEachObj( p, iRepr, iNode ) - printf( " %d", iNode ); - printf( "\n" ); - - iRepr = 129737; - printf( "Class %d : ", iRepr ); - Gia_ClassForEachObj( p, iRepr, iNode ) - printf( " %d", iNode ); - printf( "\n" ); - // correct each class vClass = Vec_IntAlloc( 100 ); Vec_IntForEachEntry( vCollected, iRepr, i ) @@ -408,14 +396,14 @@ void Gia_ManReverseClasses( Gia_Man_t * p, int fNowIncreasing ) { if ( fNowIncreasing ) assert( iRepr < iNode ); - else - assert( iRepr > iNode ); +// else +// assert( iRepr > iNode ); Vec_IntPush( vClass, iNode ); } -// if ( !fNowIncreasing ) -// Vec_IntSort( vClass, 1 ); - if ( iRepr == 129720 || iRepr == 129737 ) - Vec_IntPrint( vClass ); + if ( !fNowIncreasing ) + Vec_IntSort( vClass, 1 ); +// if ( iRepr == 129720 || iRepr == 129737 ) +// Vec_IntPrint( vClass ); // reverse the class iPrev = 0; iRepr = Vec_IntEntryLast( vClass ); |