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/fxu | |
| 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/fxu')
| -rw-r--r-- | src/opt/fxu/fxu.h | 6 | ||||
| -rw-r--r-- | src/opt/fxu/fxuInt.h | 7 | ||||
| -rw-r--r-- | src/opt/fxu/fxuMatrix.c | 4 | ||||
| -rw-r--r-- | src/opt/fxu/fxuReduce.c | 2 | ||||
| -rw-r--r-- | src/opt/fxu/fxuSingle.c | 2 |
5 files changed, 9 insertions, 12 deletions
diff --git a/src/opt/fxu/fxu.h b/src/opt/fxu/fxu.h index d42bf873..28856c28 100644 --- a/src/opt/fxu/fxu.h +++ b/src/opt/fxu/fxu.h @@ -16,15 +16,15 @@ ***********************************************************************/ -#ifndef __FXU_H__ -#define __FXU_H__ +#ifndef ABC__opt__fxu__fxu_h +#define ABC__opt__fxu__fxu_h //////////////////////////////////////////////////////////////////////// /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "vec.h" +#include "src/misc/vec/vec.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/opt/fxu/fxuInt.h b/src/opt/fxu/fxuInt.h index 402b7cdd..1ca081c9 100644 --- a/src/opt/fxu/fxuInt.h +++ b/src/opt/fxu/fxuInt.h @@ -16,16 +16,15 @@ ***********************************************************************/ -#ifndef __FXU_INT_H__ -#define __FXU_INT_H__ +#ifndef ABC__opt__fxu__fxuInt_h +#define ABC__opt__fxu__fxuInt_h //////////////////////////////////////////////////////////////////////// /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "abc.h" -#include "extra.h" +#include "src/base/abc/abc.h" ABC_NAMESPACE_HEADER_START diff --git a/src/opt/fxu/fxuMatrix.c b/src/opt/fxu/fxuMatrix.c index a53de0a3..d032f7cd 100644 --- a/src/opt/fxu/fxuMatrix.c +++ b/src/opt/fxu/fxuMatrix.c @@ -25,8 +25,6 @@ ABC_NAMESPACE_IMPL_START /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// -extern unsigned int Cudd_Prime( unsigned int p ); - //////////////////////////////////////////////////////////////////////// /// FUNCTION DEFINITIONS /// //////////////////////////////////////////////////////////////////////// @@ -47,7 +45,7 @@ Fxu_Matrix * Fxu_MatrixAllocate() Fxu_Matrix * p; p = ABC_ALLOC( Fxu_Matrix, 1 ); memset( p, 0, sizeof(Fxu_Matrix) ); - p->nTableSize = Cudd_Prime(10000); + p->nTableSize = Abc_PrimeCudd(10000); p->pTable = ABC_ALLOC( Fxu_ListDouble, p->nTableSize ); memset( p->pTable, 0, sizeof(Fxu_ListDouble) * p->nTableSize ); #ifndef USE_SYSTEM_MEMORY_MANAGEMENT diff --git a/src/opt/fxu/fxuReduce.c b/src/opt/fxu/fxuReduce.c index b0e3e4a7..6d76576a 100644 --- a/src/opt/fxu/fxuReduce.c +++ b/src/opt/fxu/fxuReduce.c @@ -16,7 +16,7 @@ ***********************************************************************/ -#include "abc.h" +#include "src/base/abc/abc.h" #include "fxuInt.h" #include "fxu.h" diff --git a/src/opt/fxu/fxuSingle.c b/src/opt/fxu/fxuSingle.c index b1cc2e63..e4fd0c5c 100644 --- a/src/opt/fxu/fxuSingle.c +++ b/src/opt/fxu/fxuSingle.c @@ -17,7 +17,7 @@ ***********************************************************************/ #include "fxuInt.h" -#include "vec.h" +#include "src/misc/vec/vec.h" ABC_NAMESPACE_IMPL_START |