1 files changed, 43 insertions, 3 deletions

diff --git a/src/opt/lpk/lpkAbcUtil.c b/src/opt/lpk/lpkAbcUtil.c
index 681ec092..3f917ce2 100644
--- a/src/opt/lpk/lpkAbcUtil.c
+++ b/src/opt/lpk/lpkAbcUtil.c
@@ -123,7 +123,7 @@ Lpk_Fun_t * Lpk_FunDup( Lpk_Fun_t * p, unsigned * pTruth )
     memcpy( pNew->pFanins, p->pFanins, 16 );
     memcpy( pNew->pDelays, p->pDelays, 16 );
     Vec_PtrPush( p->vNodes, pNew );
-    return p;
+    return pNew;
 }
 
 /**Function*************************************************************
@@ -137,12 +137,15 @@ Lpk_Fun_t * Lpk_FunDup( Lpk_Fun_t * p, unsigned * pTruth )
   SeeAlso     []
 
 ***********************************************************************/
-void Lpk_FunSuppMinimize( Lpk_Fun_t * p )
+int Lpk_FunSuppMinimize( Lpk_Fun_t * p )
 {
     int i, k, nVarsNew;
     // compress the truth table
     if ( p->uSupp == Kit_BitMask(p->nVars) )
-        return;
+        return 0;
+    // invalidate support info
+    p->fSupports = 0;
+//Extra_PrintBinary( stdout, &p->uSupp, p->nVars ); printf( "\n" );
     // minimize support
     nVarsNew = Kit_WordCountOnes(p->uSupp);
     Kit_TruthShrink( Lpk_FunTruth(p, 1), Lpk_FunTruth(p, 0), nVarsNew, p->nVars, p->uSupp, 1 );
@@ -151,11 +154,48 @@ void Lpk_FunSuppMinimize( Lpk_Fun_t * p )
     {
         p->pFanins[k] = p->pFanins[i];
         p->pDelays[k] = p->pDelays[i];
+/*
+        if ( p->fSupports )
+        {
+            p->puSupps[2*k+0] = p->puSupps[2*i+0];
+            p->puSupps[2*k+1] = p->puSupps[2*i+1];
+        }
+*/
         k++;
     }
     assert( k == nVarsNew );
     p->nVars = k;
     p->uSupp = Kit_BitMask(p->nVars);
+    return 1;
+}
+
+/**Function*************************************************************
+
+  Synopsis    [Computes cofactors w.r.t. each variable.]
+
+  Description []
+               
+  SideEffects []
+
+  SeeAlso     []
+
+***********************************************************************/
+void Lpk_FunComputeCofSupps( Lpk_Fun_t * p )
+{
+    unsigned * pTruth  = Lpk_FunTruth( p, 0 );
+    unsigned * pTruth0 = Lpk_FunTruth( p, 1 );
+    unsigned * pTruth1 = Lpk_FunTruth( p, 2 );
+    int Var;
+    assert( p->fSupports == 0 );
+//    Lpk_SuppForEachVar( p->uSupp, Var )
+    for ( Var = 0; Var < (int)p->nVars; Var++ )
+    {
+        Kit_TruthCofactor0New( pTruth0, pTruth, p->nVars, Var );
+        Kit_TruthCofactor1New( pTruth1, pTruth, p->nVars, Var );
+        p->puSupps[2*Var+0] = Kit_TruthSupport( pTruth0, p->nVars );
+        p->puSupps[2*Var+1] = Kit_TruthSupport( pTruth1, p->nVars );
+    }
+    p->fSupports = 1;
 }
 
 /**Function*************************************************************