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/map/cov | |
| parent | c44cc5de9429e6b4f1c05045fcf43c9cb96437b5 (diff) | |
| download | abc-8014f25f6db719fa62336f997963532a14c568f6.tar.gz abc-8014f25f6db719fa62336f997963532a14c568f6.tar.bz2 abc-8014f25f6db719fa62336f997963532a14c568f6.zip | |
Major restructuring of the code.
Diffstat (limited to 'src/map/cov')
| -rw-r--r-- | src/map/cov/cov.h | 7 | ||||
| -rw-r--r-- | src/map/cov/covCore.c | 6 | ||||
| -rw-r--r-- | src/map/cov/covInt.h | 7 |
3 files changed, 9 insertions, 11 deletions
diff --git a/src/map/cov/cov.h b/src/map/cov/cov.h index 80ef1925..135fee8c 100644 --- a/src/map/cov/cov.h +++ b/src/map/cov/cov.h @@ -18,11 +18,10 @@ ***********************************************************************/ -#ifndef __COV_H__ -#define __COV_H__ +#ifndef ABC__map__cov__cov_h +#define ABC__map__cov__cov_h -#include "abc.h" -#include "extra.h" +#include "src/base/abc/abc.h" #include "covInt.h" diff --git a/src/map/cov/covCore.c b/src/map/cov/covCore.c index a53f6b49..b128ed65 100644 --- a/src/map/cov/covCore.c +++ b/src/map/cov/covCore.c @@ -447,7 +447,7 @@ int Abc_NodeCovPropagate( Cov_Man_t * p, Abc_Obj_t * pObj ) // count statistics p->nSupps++; - p->nSuppsMax = ABC_MAX( p->nSuppsMax, p->nSupps ); + p->nSuppsMax = Abc_MaxInt( p->nSuppsMax, p->nSupps ); return 1; } @@ -732,7 +732,7 @@ int Abc_NodeCovPropagateEsop( Cov_Man_t * p, Abc_Obj_t * pObj, Abc_Obj_t * pObj0 // count statistics p->nSupps++; - p->nSuppsMax = ABC_MAX( p->nSuppsMax, p->nSupps ); + p->nSuppsMax = Abc_MaxInt( p->nSuppsMax, p->nSupps ); // set the covers assert( Abc_ObjGetSupp(pObj) == NULL ); @@ -835,7 +835,7 @@ int Abc_NodeCovPropagateSop( Cov_Man_t * p, Abc_Obj_t * pObj, Abc_Obj_t * pObj0, // count statistics p->nSupps++; - p->nSuppsMax = ABC_MAX( p->nSuppsMax, p->nSupps ); + p->nSuppsMax = Abc_MaxInt( p->nSuppsMax, p->nSupps ); // set the covers assert( Abc_ObjGetSupp(pObj) == NULL ); diff --git a/src/map/cov/covInt.h b/src/map/cov/covInt.h index 73c6bc20..5a75a8f3 100644 --- a/src/map/cov/covInt.h +++ b/src/map/cov/covInt.h @@ -18,11 +18,10 @@ ***********************************************************************/ -#ifndef __COV_INT_H__ -#define __COV_INT_H__ +#ifndef ABC__map__cov__covInt_h +#define ABC__map__cov__covInt_h -#include "abc.h" -#include "extra.h" +#include "src/base/abc/abc.h" ABC_NAMESPACE_HEADER_START |