Major restructuring of the code.

6 files changed, 15 insertions, 15 deletions

diff --git a/src/map/mapper/mapper.c b/src/map/mapper/mapper.c
index f13a7641..87a0d4b8 100644
--- a/src/map/mapper/mapper.c
+++ b/src/map/mapper/mapper.c
@@ -16,9 +16,9 @@
 
 ***********************************************************************/
 
-#include "abc.h"
-#include "mainInt.h"
-#include "mio.h"
+#include "src/base/abc/abc.h"
+#include "src/base/main/mainInt.h"
+#include "src/map/mio/mio.h"
 #include "mapperInt.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/map/mapper/mapper.h b/src/map/mapper/mapper.h
index aaad08ee..3fd5fd9e 100644
--- a/src/map/mapper/mapper.h
+++ b/src/map/mapper/mapper.h
@@ -16,8 +16,8 @@
 
 ***********************************************************************/
 
-#ifndef __MAPPER_H__
-#define __MAPPER_H__
+#ifndef ABC__map__mapper__mapper_h
+#define ABC__map__mapper__mapper_h
 
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/map/mapper/mapperCreate.c b/src/map/mapper/mapperCreate.c
index af1a858f..73ccdb19 100644
--- a/src/map/mapper/mapperCreate.c
+++ b/src/map/mapper/mapperCreate.c
@@ -390,7 +390,7 @@ Map_Node_t * Map_NodeCreate( Map_Man_t * p, Map_Node_t * p1, Map_Node_t * p2 )
 void Map_TableCreate( Map_Man_t * pMan )
 {
     assert( pMan->pBins == NULL );
-    pMan->nBins = Cudd_Prime(5000);
+    pMan->nBins = Abc_PrimeCudd(5000);
     pMan->pBins = ABC_ALLOC( Map_Node_t *, pMan->nBins );
     memset( pMan->pBins, 0, sizeof(Map_Node_t *) * pMan->nBins );
     pMan->nNodes = 0;
@@ -474,7 +474,7 @@ void Map_TableResize( Map_Man_t * pMan )
 
 clk = clock();
     // get the new table size
-    nBinsNew = Cudd_Prime(2 * pMan->nBins); 
+    nBinsNew = Abc_PrimeCudd(2 * pMan->nBins); 
     // allocate a new array
     pBinsNew = ABC_ALLOC( Map_Node_t *, nBinsNew );
     memset( pBinsNew, 0, sizeof(Map_Node_t *) * nBinsNew );
diff --git a/src/map/mapper/mapperCut.c b/src/map/mapper/mapperCut.c
index e0afa792..29861531 100644
--- a/src/map/mapper/mapperCut.c
+++ b/src/map/mapper/mapperCut.c
@@ -814,7 +814,7 @@ Map_CutTable_t * Map_CutTableStart( Map_Man_t * pMan )
     // allocate the table
     p = ABC_ALLOC( Map_CutTable_t, 1 );
     memset( p, 0, sizeof(Map_CutTable_t) );
-    p->nBins = Cudd_Prime( 10 * MAP_CUTS_MAX_COMPUTE );
+    p->nBins = Abc_PrimeCudd( 10 * MAP_CUTS_MAX_COMPUTE );
     p->pBins = ABC_ALLOC( Map_Cut_t *, p->nBins );
     memset( p->pBins, 0, sizeof(Map_Cut_t *) * p->nBins );
     p->pCuts = ABC_ALLOC( int, 2 * MAP_CUTS_MAX_COMPUTE );
diff --git a/src/map/mapper/mapperInt.h b/src/map/mapper/mapperInt.h
index ac8110fc..08a27e68 100644
--- a/src/map/mapper/mapperInt.h
+++ b/src/map/mapper/mapperInt.h
@@ -16,8 +16,8 @@
 
 ***********************************************************************/
 
-#ifndef __MAPPER_INT_H__
-#define __MAPPER_INT_H__
+#ifndef ABC__map__mapper__mapperInt_h
+#define ABC__map__mapper__mapperInt_h
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -28,10 +28,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <float.h>
-#include "main.h"
-#include "mio.h"
+#include "src/base/main/main.h"
+#include "src/map/mio/mio.h"
 #include "mapper.h"
-#include "cuddInt.h"
+#include "src/misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_HEADER_START
 
diff --git a/src/map/mapper/mapperTable.c b/src/map/mapper/mapperTable.c
index 2120b5ce..7e12d8dc 100644
--- a/src/map/mapper/mapperTable.c
+++ b/src/map/mapper/mapperTable.c
@@ -53,7 +53,7 @@ Map_HashTable_t * Map_SuperTableCreate( Map_SuperLib_t * pLib )
     memset( p, 0, sizeof(Map_HashTable_t) );
     p->mmMan = pLib->mmEntries;
     // allocate and clean the bins
-    p->nBins = Cudd_Prime(20000);
+    p->nBins = Abc_PrimeCudd(20000);
     p->pBins = ABC_ALLOC( Map_HashEntry_t *, p->nBins );
     memset( p->pBins, 0, sizeof(Map_HashEntry_t *) * p->nBins );
     return p;
@@ -237,7 +237,7 @@ void Map_SuperTableResize( Map_HashTable_t * p )
     int nBinsNew, Counter, i;
     unsigned Key;
     // get the new table size
-    nBinsNew = Cudd_Prime(2 * p->nBins); 
+    nBinsNew = Abc_PrimeCudd(2 * p->nBins); 
     // allocate a new array
     pBinsNew = ABC_ALLOC( Map_HashEntry_t *, nBinsNew );
     memset( pBinsNew, 0, sizeof(Map_HashEntry_t *) * nBinsNew );