From 8014f25f6db719fa62336f997963532a14c568f6 Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Sat, 21 Jan 2012 04:30:10 -0800 Subject: Major restructuring of the code. --- src/aig/ivy/attr.h | 6 +++--- src/aig/ivy/ivy.h | 8 ++++---- src/aig/ivy/ivyFraig.c | 10 ++++++---- src/aig/ivy/ivyRwr.c | 4 ++-- src/aig/ivy/ivySeq.c | 4 ++-- src/aig/ivy/ivyTable.c | 37 +------------------------------------ 6 files changed, 18 insertions(+), 51 deletions(-) (limited to 'src/aig/ivy') diff --git a/src/aig/ivy/attr.h b/src/aig/ivy/attr.h index b65906cf..07586832 100644 --- a/src/aig/ivy/attr.h +++ b/src/aig/ivy/attr.h @@ -18,15 +18,15 @@ ***********************************************************************/ -#ifndef __ATTR_H__ -#define __ATTR_H__ +#ifndef ABC__aig__ivy__attr_h +#define ABC__aig__ivy__attr_h //////////////////////////////////////////////////////////////////////// /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "extra.h" +#include "misc/extra/extra.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/aig/ivy/ivy.h b/src/aig/ivy/ivy.h index 870c0906..8d062134 100644 --- a/src/aig/ivy/ivy.h +++ b/src/aig/ivy/ivy.h @@ -18,8 +18,8 @@ ***********************************************************************/ -#ifndef __IVY_H__ -#define __IVY_H__ +#ifndef ABC__aig__ivy__ivy_h +#define ABC__aig__ivy__ivy_h //////////////////////////////////////////////////////////////////////// @@ -27,8 +27,8 @@ //////////////////////////////////////////////////////////////////////// #include -#include "extra.h" -#include "vec.h" +#include "src/misc/extra/extra.h" +#include "src/misc/vec/vec.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/aig/ivy/ivyFraig.c b/src/aig/ivy/ivyFraig.c index 7cf97132..2bc6f0de 100644 --- a/src/aig/ivy/ivyFraig.c +++ b/src/aig/ivy/ivyFraig.c @@ -18,8 +18,10 @@ ***********************************************************************/ -#include "satSolver.h" -#include "extra.h" +#include + +#include "src/sat/bsat/satSolver.h" +#include "src/misc/extra/extra.h" #include "ivy.h" ABC_NAMESPACE_IMPL_START @@ -2649,7 +2651,7 @@ p->timeTrav += clock() - clk; ABC_NAMESPACE_IMPL_END -#include "cuddInt.h" +#include "src/bdd/cudd/cuddInt.h" ABC_NAMESPACE_IMPL_START @@ -2807,7 +2809,7 @@ int Ivy_FraigNodesAreEquivBdd( Ivy_Obj_t * pObj1, Ivy_Obj_t * pObj2 ) ABC_NAMESPACE_IMPL_END -#include "aig.h" +#include "src/aig/aig/aig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/ivy/ivyRwr.c b/src/aig/ivy/ivyRwr.c index 4e79e87f..39131210 100644 --- a/src/aig/ivy/ivyRwr.c +++ b/src/aig/ivy/ivyRwr.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "ivy.h" -#include "deco.h" -#include "rwt.h" +#include "src/bool/deco/deco.h" +#include "src/opt/rwt/rwt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/ivy/ivySeq.c b/src/aig/ivy/ivySeq.c index 7f9674ac..283bf9fe 100644 --- a/src/aig/ivy/ivySeq.c +++ b/src/aig/ivy/ivySeq.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "ivy.h" -#include "deco.h" -#include "rwt.h" +#include "src/bool/deco/deco.h" +#include "src/opt/rwt/rwt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/ivy/ivyTable.c b/src/aig/ivy/ivyTable.c index 0fe5c7ba..d2c1ab9a 100644 --- a/src/aig/ivy/ivyTable.c +++ b/src/aig/ivy/ivyTable.c @@ -212,7 +212,7 @@ clk = clock(); pTableOld = p->pTable; nTableSizeOld = p->nTableSize; // get the new table - p->nTableSize = Cudd_PrimeAig( 5 * Ivy_ManHashObjNum(p) ); + p->nTableSize = Abc_PrimeCudd( 5 * Ivy_ManHashObjNum(p) ); p->pTable = ABC_ALLOC( int, p->nTableSize ); memset( p->pTable, 0, sizeof(int) * p->nTableSize ); // rehash the entries from the old table @@ -261,41 +261,6 @@ void Ivy_TableProfile( Ivy_Man_t * p ) } } -/**Function******************************************************************** - - Synopsis [Returns the next prime >= p.] - - Description [Copied from CUDD, for stand-aloneness.] - - SideEffects [None] - - SeeAlso [] - -******************************************************************************/ -unsigned int Cudd_PrimeAig( unsigned int p) -{ - int i,pn; - - p--; - do { - p++; - if (p&1) { - pn = 1; - i = 3; - while ((unsigned) (i * i) <= p) { - if (p % i == 0) { - pn = 0; - break; - } - i += 2; - } - } else { - pn = 0; - } - } while (!pn); - return(p); - -} /* end of Cudd_Prime */ //////////////////////////////////////////////////////////////////////// /// END OF FILE /// -- cgit v1.2.3