Fixed several important problems in choice computation (command 'dch').

abclib.dsp

@@ -3475,10 +3475,6 @@ SOURCE=.\src\aig\gia\giaFront.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\aig\gia\giaGiarf.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\src\aig\gia\giaGlitch.c
 # End Source File
 # Begin Source File
@@ -3487,10 +3483,6 @@ SOURCE=.\src\aig\gia\giaHash.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\aig\gia\giaHcd.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\src\aig\gia\giaIf.c
 # End Source File
 # Begin Source File

src/aig/gia/gia.h

@@ -703,6 +703,7 @@ extern int                 Gia_ManCounterExampleValueLookup( Gia_Man_t * pGia, i
 /*=== giaChoice.c ============================================================*/
 extern void                Gia_ManVerifyChoices( Gia_Man_t * p );
 extern void                Gia_ManReverseClasses( Gia_Man_t * p, int fNowIncreasing );
+extern int                 Gia_ManHasChoices( Gia_Man_t * p );
 /*=== giaCsatOld.c ============================================================*/
 extern Vec_Int_t *         Cbs_ManSolveMiter( Gia_Man_t * pGia, int nConfs, Vec_Str_t ** pvStatus, int fVerbose );
 /*=== giaCsat.c ============================================================*/
@@ -914,7 +915,6 @@ extern int                 Gia_ObjIsMuxType( Gia_Obj_t * pNode );
 extern int                 Gia_ObjRecognizeExor( Gia_Obj_t * pObj, Gia_Obj_t ** ppFan0, Gia_Obj_t ** ppFan1 );
 extern Gia_Obj_t *         Gia_ObjRecognizeMux( Gia_Obj_t * pNode, Gia_Obj_t ** ppNodeT, Gia_Obj_t ** ppNodeE );
 extern int                 Gia_NodeMffcSize( Gia_Man_t * p, Gia_Obj_t * pNode );
-extern int                 Gia_ManHasChoices( Gia_Man_t * p );
 extern int                 Gia_ManHasDangling( Gia_Man_t * p );
 extern int                 Gia_ManMarkDangling( Gia_Man_t * p );
 extern Vec_Int_t *         Gia_ManGetDangling( Gia_Man_t * p );

src/aig/gia/giaUtil.c

@@ -890,97 +890,6 @@ int Gia_NodeMffcSize( Gia_Man_t * p, Gia_Obj_t * pNode )
 
 /**Function*************************************************************
 
-  Synopsis    [Returns 1 if AIG has choices.]
-
-  Description []
-               
-  SideEffects []
-
-  SeeAlso     []
-
-***********************************************************************/
-int Gia_ManHasChoices( Gia_Man_t * p )
-{
-    Gia_Obj_t * pObj;
-    int i, Counter1 = 0, Counter2 = 0;
-    int nFailNoRepr = 0;
-    int nFailHaveRepr = 0;
-    int nChoiceNodes = 0;
-    int nChoices = 0;
-    if ( p->pReprs == NULL || p->pNexts == NULL )
-        return 0;
-    // check if there are any representatives
-    Gia_ManForEachObj( p, pObj, i )
-    {
-        if ( Gia_ObjReprObj( p, Gia_ObjId(p, pObj) ) )
-        {
-//            printf( "%d ", i );
-            Counter1++;
-        }
-//        if ( Gia_ObjNext( p, Gia_ObjId(p, pObj) ) )
-//            Counter2++;
-    }
-//    printf( "\n" );
-    Gia_ManForEachObj( p, pObj, i )
-    {
-//        if ( Gia_ObjReprObj( p, Gia_ObjId(p, pObj) ) )
-//            Counter1++;
-        if ( Gia_ObjNext( p, Gia_ObjId(p, pObj) ) )
-        {
-//            printf( "%d ", i );
-            Counter2++;
-        }
-    }
-//    printf( "\n" );
-    if ( Counter1 == 0 )
-    {
-        printf( "Warning: AIG has repr data-strucure but not reprs.\n" );
-        return 0;
-    }
-    printf( "%d nodes have reprs.\n", Counter1 );
-    printf( "%d nodes have nexts.\n", Counter2 );
-    // check if there are any internal nodes without fanout
-    // make sure all nodes without fanout have representatives
-    // make sure all nodes with fanout have no representatives
-    ABC_FREE( p->pRefs );
-    Gia_ManCreateRefs( p );
-    Gia_ManForEachAnd( p, pObj, i )
-    {
-        if ( Gia_ObjRefs(p, pObj) == 0 )
-        {
-            if ( Gia_ObjReprObj( p, Gia_ObjId(p, pObj) ) == NULL )
-                nFailNoRepr++;
-            else
-                nChoices++;
-        }
-        else
-        {
-            if ( Gia_ObjReprObj( p, Gia_ObjId(p, pObj) ) != NULL )
-                nFailHaveRepr++;
-            if ( Gia_ObjNextObj( p, Gia_ObjId(p, pObj) ) != NULL )
-                nChoiceNodes++;
-        }
-        if ( Gia_ObjReprObj( p, i ) )
-            assert( Gia_ObjRepr(p, i) < i );
-    }
-    if ( nChoices == 0 )
-        return 0;
-    if ( nFailNoRepr )
-    {
-        printf( "Gia_ManHasChoices(): Error: %d internal nodes have no fanout and no repr.\n", nFailNoRepr );
-//        return 0;
-    }
-    if ( nFailHaveRepr )
-    {
-        printf( "Gia_ManHasChoices(): Error: %d internal nodes have both fanout and repr.\n", nFailHaveRepr );
-//        return 0;
-    }
-//    printf( "Gia_ManHasChoices(): AIG has %d choice nodes with %d choices.\n", nChoiceNodes, nChoices );
-    return 1;
-}
-
-/**Function*************************************************************
-
   Synopsis    [Returns 1 if AIG has dangling nodes.]
 
   Description []

src/proof/dch/dchCore.c

@@ -106,19 +106,13 @@ p->timeSimInit = clock() - clk;
     // free memory ahead of time
 p->timeTotal = clock() - clkTotal;
     Dch_ManStop( p );
-    // try something different
-    {
-//    extern void Gia_ManNormalizeChoicesTest( Aig_Man_t * pAig );
-//    Gia_ManNormalizeChoicesTest( pAig );
-    }
-
     // create choices
     ABC_FREE( pAig->pTable );
     pResult = Dch_DeriveChoiceAig( pAig, pPars->fSkipRedSupp );
     // count the number of representatives
     if ( pPars->fVerbose ) 
         Abc_Print( 1, "STATS:  Reprs = %6d.  Equivs = %6d.  Choices = %6d.\n", 
-               Dch_DeriveChoiceCountReprs( pAig ),
+               Dch_DeriveChoiceCountReprs( pResult ),
                Dch_DeriveChoiceCountEquivs( pResult ),
                Aig_ManChoiceNum( pResult ) );
     return pResult;