From 8014f25f6db719fa62336f997963532a14c568f6 Mon Sep 17 00:00:00 2001
From: Alan Mishchenko <alanmi@berkeley.edu>
Date: Sat, 21 Jan 2012 04:30:10 -0800
Subject: Major restructuring of the code.

---
 src/bdd/cas/cas.h     |  4 ++--
 src/bdd/cas/casCore.c | 10 +++++-----
 src/bdd/cas/casDec.c  |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/bdd/cas')

diff --git a/src/bdd/cas/cas.h b/src/bdd/cas/cas.h
index 33958325..9ef6f1fa 100644
--- a/src/bdd/cas/cas.h
+++ b/src/bdd/cas/cas.h
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
  
-#ifndef __CAS_H__
-#define __CAS_H__
+#ifndef ABC__bdd__cas__cas_h
+#define ABC__bdd__cas__cas_h
 
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/bdd/cas/casCore.c b/src/bdd/cas/casCore.c
index 5511b8e7..b73b5b3f 100644
--- a/src/bdd/cas/casCore.c
+++ b/src/bdd/cas/casCore.c
@@ -23,9 +23,9 @@
 #include <string.h>
 #include <time.h>
 
-#include "main.h"
-#include "cmd.h"
-#include "extra.h"
+#include "src/base/main/main.h"
+#include "src/base/cmd/cmd.h"
+#include "src/misc/extra/extraBdd.h"
 #include "cas.h"
 
 ABC_NAMESPACE_IMPL_START
@@ -112,7 +112,7 @@ int Abc_CascadeExperiment( char * pFileGeneric, DdManager * dd, DdNode ** pOutpu
 
 
     // create the variables to encode the outputs
-    nVarsEnc = Extra_Base2Log( nOuts );
+    nVarsEnc = Abc_Base2Log( nOuts );
     for ( i = 0; i < nVarsEnc; i++ )
         pbVarsEnc[i] = Cudd_bddNewVarAtLevel( dd, i );
 
@@ -704,7 +704,7 @@ DdNode * GetSingleOutputFunctionRemappedNewDD( DdManager * dd, DdNode ** pOutput
     }
     
     // select the encoding variables to follow immediately after the original variables
-    nVarsEnc = Extra_Base2Log(nOuts);
+    nVarsEnc = Abc_Base2Log(nOuts);
 /*
     for ( v = 0; v < nVarsEnc; v++ )
         if ( nVarsMax + v < dd->size )
diff --git a/src/bdd/cas/casDec.c b/src/bdd/cas/casDec.c
index 111f559e..ea132540 100644
--- a/src/bdd/cas/casDec.c
+++ b/src/bdd/cas/casDec.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include "extra.h"
+#include "src/misc/extra/extraBdd.h"
 #include "cas.h"
 
 ABC_NAMESPACE_IMPL_START
@@ -175,7 +175,7 @@ int CreateDecomposedNetwork( DdManager * dd, DdNode * aFunc, char ** pNames, int
             p->nIns   = s_LutSize;
             p->nInsP  = PrevMulti;
             p->nCols  = Profile[nNames-(nVarsRem-(s_LutSize-PrevMulti))];
-            p->nMulti = Extra_Base2Log(p->nCols);
+            p->nMulti = Abc_Base2Log(p->nCols);
             p->Level  = nNames-nVarsRem;
 
             nVarsRem  = nVarsRem-(s_LutSize-PrevMulti);
-- 
cgit v1.2.3