Improved DSD.

abclib.dsp

@@ -1997,6 +1997,10 @@ SOURCE=.\src\opt\dau\dauEnum.c
 
 SOURCE=.\src\opt\dau\dauInt.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\src\opt\dau\dauMerge.c
+# End Source File
 # End Group
 # End Group
 # Begin Group "map"

src/base/abci/abcDec.c

@@ -541,7 +541,7 @@ void Abc_TruthDecPerform( Abc_TtStore_t * p, int DecType, int fVerbose )
     }
     else if ( DecType == 4 )
     {
-        extern void Dau_DsdTestOne( word t, int i );
+//        extern void Dau_DsdTestOne( word t, int i );
         if ( p->nVars != 6 )
         {
             printf( "Currently only works for 6 variables.\n" );
@@ -554,7 +554,7 @@ void Abc_TruthDecPerform( Abc_TtStore_t * p, int DecType, int fVerbose )
         {
             if ( fVerbose )
                 printf( "%7d :      ", i );
-            Dau_DsdTestOne( *p->pFuncs[i], i );
+//            Dau_DsdTestOne( *p->pFuncs[i], i );
         }
     }
     else assert( 0 );

src/opt/dau/dau.h

@@ -37,9 +37,11 @@
 ///                         PARAMETERS                               ///
 ////////////////////////////////////////////////////////////////////////
 
-
 ABC_NAMESPACE_HEADER_START
 
+#define DAU_MAX_VAR    16 // should be 6 or more
+#define DAU_MAX_STR   256
+#define DAU_MAX_WORD  (1<<(DAU_MAX_VAR-6))
 
 ////////////////////////////////////////////////////////////////////////
 ///                         BASIC TYPES                              ///
@@ -56,9 +58,14 @@ ABC_NAMESPACE_HEADER_START
 /*=== dauCanon.c ==========================================================*/
 extern unsigned      Abc_TtCanonicize( word * pTruth, int nVars, char * pCanonPerm );
 /*=== dauDsd.c  ==========================================================*/
-extern char *        Dau_DsdDecompose( word * pTruth, int nVarsInit, int * pnSizeNonDec );
+extern int           Dau_DsdDecompose( word * pTruth, int nVarsInit, int fSplitPrime, char * pRes );
 extern word *        Dau_DsdToTruth( char * p, int nVars );
+extern word          Dau_Dsd6ToTruth( char * p );
+extern void          Dau_DsdNormalize( char * p );
 
+/*=== dauMerge.c  ==========================================================*/
+extern void          Dau_DsdRemoveBraces( char * pDsd, int * pMatches );
+extern char *        Dau_DsdMerge( char * pDsd0i, int * pPerm0, char * pDsd1i, int * pPerm1, int fCompl0, int fCompl1 );
 
 ABC_NAMESPACE_HEADER_END
 

src/opt/dau/module.make

@@ -2,4 +2,5 @@ SRC +=    src/opt/dau/dau.c \
     src/opt/dau/dauCanon.c \
     src/opt/dau/dauCore.c \
     src/opt/dau/dauDsd.c \
-    src/opt/dau/dauEnum.c
+    src/opt/dau/dauEnum.c \
+    src/opt/dau/dauMerge.c