Removed useless typecasts related to changes in Vec_VecEntry().

5 files changed, 24 insertions, 24 deletions

diff --git a/src/aig/saig/saigAbsCba.c b/src/aig/saig/saigAbsCba.c
index e317f80d..9d470164 100644
--- a/src/aig/saig/saigAbsCba.c
+++ b/src/aig/saig/saigAbsCba.c
@@ -336,10 +336,10 @@ Aig_Man_t * Saig_ManCbaUnrollWithCex( Aig_Man_t * pAig, Abc_Cex_t * pCex, int nI
     {
         // collect nodes starting from the roots
         Aig_ManIncrementTravId( pAig );
-        vRoots = (Vec_Int_t *)Vec_VecEntry( vFrameCos, f );
+        vRoots = Vec_VecEntryInt( vFrameCos, f );
         Aig_ManForEachNodeVec( pAig, vRoots, pObj, i )
             Saig_ManCbaUnrollCollect_rec( pAig, pObj, 
-                (Vec_Int_t *)Vec_VecEntry(vFrameObjs, f),
+                Vec_VecEntryInt(vFrameObjs, f),
                 (Vec_Int_t *)(f ? Vec_VecEntry(vFrameCos, f-1) : NULL) );
     }
 
@@ -354,7 +354,7 @@ Aig_Man_t * Saig_ManCbaUnrollWithCex( Aig_Man_t * pAig, Abc_Cex_t * pCex, int nI
     for ( f = 0; f <= pCex->iFrame; f++ )
     {
         // construct
-        vObjs = (Vec_Int_t *)Vec_VecEntry( vFrameObjs, f );
+        vObjs = Vec_VecEntryInt( vFrameObjs, f );
         Aig_ManForEachNodeVec( pAig, vObjs, pObj, i )
         {
             if ( Aig_ObjIsNode(pObj) )
@@ -381,7 +381,7 @@ Aig_Man_t * Saig_ManCbaUnrollWithCex( Aig_Man_t * pAig, Abc_Cex_t * pCex, int nI
         if ( f == pCex->iFrame )
             break;
         // transfer
-        vRoots = (Vec_Int_t *)Vec_VecEntry( vFrameCos, f );
+        vRoots = Vec_VecEntryInt( vFrameCos, f );
         Aig_ManForEachNodeVec( pAig, vRoots, pObj, i )
         {
             Saig_ObjLiToLo( pAig, pObj )->pData = pObj->pData;
@@ -480,7 +480,7 @@ void Saig_ManCbaShrink( Saig_ManCba_t * p )
     // print statistics
     Vec_VecForEachLevelInt( p->vReg2Frame, vLevel, k )
     {
-        vLevel2 = (Vec_Int_t *)Vec_VecEntry( p->vReg2Value, k );
+        vLevel2 = Vec_VecEntryInt( p->vReg2Value, k );
         printf( "Level = %4d   StateBits = %4d (%6.2f %%)  CareBits = %4d (%6.2f %%)\n", k, 
             Vec_IntSize(vLevel)/2, 100.0 * (Vec_IntSize(vLevel)/2) / Aig_ManRegNum(p->pAig),
             Vec_IntSize(vLevel2),  100.0 * Vec_IntSize(vLevel2) / Aig_ManRegNum(p->pAig) );
diff --git a/src/aig/saig/saigAbsPba.c b/src/aig/saig/saigAbsPba.c
index 32b6a148..f2a595f7 100644
--- a/src/aig/saig/saigAbsPba.c
+++ b/src/aig/saig/saigAbsPba.c
@@ -86,14 +86,14 @@ Aig_Man_t * Saig_ManUnrollForPba( Aig_Man_t * pAig, int nFrames )
     for ( f = nFrames-1; f >= 0; f-- )
     {
         // add POs of this frame
-        vRoots = (Vec_Int_t *)Vec_VecEntry( vFrameCos, f );
+        vRoots = Vec_VecEntryInt( vFrameCos, f );
         Saig_ManForEachPo( pAig, pObj, i )
             Vec_IntPush( vRoots, Aig_ObjId(pObj) );
         // collect nodes starting from the roots
         Aig_ManIncrementTravId( pAig );
         Aig_ManForEachNodeVec( pAig, vRoots, pObj, i )
             Saig_ManUnrollForPba_rec( pAig, pObj, 
-                (Vec_Int_t *)Vec_VecEntry( vFrameObjs, f ),
+                Vec_VecEntryInt( vFrameObjs, f ),
                 (Vec_Int_t *)(f ? Vec_VecEntry(vFrameCos, f-1) : NULL) );
     }
     // derive unrolled timeframes
@@ -111,7 +111,7 @@ Aig_Man_t * Saig_ManUnrollForPba( Aig_Man_t * pAig, int nFrames )
     for ( f = 0; f < nFrames; f++ )
     {
         // construct
-        vObjs = (Vec_Int_t *)Vec_VecEntry( vFrameObjs, f );
+        vObjs = Vec_VecEntryInt( vFrameObjs, f );
         Aig_ManForEachNodeVec( pAig, vObjs, pObj, i )
         {
             if ( Aig_ObjIsNode(pObj) )
@@ -131,7 +131,7 @@ Aig_Man_t * Saig_ManUnrollForPba( Aig_Man_t * pAig, int nFrames )
         // transfer
         if ( f == nFrames - 1 )
             break;
-        vRoots = (Vec_Int_t *)Vec_VecEntry( vFrameCos, f );
+        vRoots = Vec_VecEntryInt( vFrameCos, f );
         Aig_ManForEachNodeVec( pAig, vRoots, pObj, i )
         {
             if ( Saig_ObjIsLi(pAig, pObj) )
diff --git a/src/aig/saig/saigCexMin.c b/src/aig/saig/saigCexMin.c
index a2ad3e59..ac397297 100644
--- a/src/aig/saig/saigCexMin.c
+++ b/src/aig/saig/saigCexMin.c
@@ -184,7 +184,7 @@ void Saig_ManCollectFrameTerms( Aig_Man_t * pAig, Abc_Cex_t * pCex, Vec_Vec_t *
         Aig_ManIncrementTravId( pAig );
         Vec_VecForEachEntryIntLevel( vFrameLis, Entry, i, f )
             Saig_ManCollectFrameTerms_rec( pAig, Aig_ManObj(pAig, Entry),
-                (Vec_Int_t *)Vec_VecEntry( vFramePis, f ),
+                Vec_VecEntryInt( vFramePis, f ),
                 (Vec_Int_t *)(f ? Vec_VecEntry( vFrameLis, f-1 ) : NULL) );
     }
 }
@@ -302,7 +302,7 @@ Abc_Cex_t * Saig_ManCexMinPerform( Aig_Man_t * pAig, Abc_Cex_t * pCex )
         Aig_ManIncrementTravId( pAig );
         Vec_VecForEachEntryIntLevel( vFrameLis, Entry, i, f )
             Saig_ManCexMinFindReason_rec( pAig, Aig_ManObj(pAig, Entry), vPrios, 
-                (Vec_Int_t *)Vec_VecEntry( vReasonPis, f ),
+                Vec_VecEntryInt( vReasonPis, f ),
                 (Vec_Int_t *)(f ? Vec_VecEntry( vReasonLis, f-1 ) : NULL) );
     }
 
diff --git a/src/aig/saig/saigConstr2.c b/src/aig/saig/saigConstr2.c
index a5a575fd..6665d9f1 100644
--- a/src/aig/saig/saigConstr2.c
+++ b/src/aig/saig/saigConstr2.c
@@ -784,7 +784,7 @@ Vec_Vec_t * Saig_ManDetectConstrFunc( Aig_Man_t * p, int nFrames, int nConfs, in
                     pObjNew = Aig_NotCond(pObj, !Aig_IsComplement(pRepr));
 
                     for ( j = 0; j < k; j++ )
-                        if ( Vec_PtrFind( (Vec_Ptr_t *)Vec_VecEntry(vCands, j), pObjNew ) >= 0 )
+                        if ( Vec_PtrFind( Vec_VecEntry(vCands, j), pObjNew ) >= 0 )
                             break;
                     if ( j == k )
                         Vec_VecPush( vCands, k, pObjNew );
@@ -795,7 +795,7 @@ Vec_Vec_t * Saig_ManDetectConstrFunc( Aig_Man_t * p, int nFrames, int nConfs, in
                     pObjNew = Aig_NotCond(pObj,  Aig_IsComplement(pRepr));
 
                     for ( j = 0; j < k; j++ )
-                        if ( Vec_PtrFind( (Vec_Ptr_t *)Vec_VecEntry(vCands, j), pObjNew ) >= 0  )
+                        if ( Vec_PtrFind( Vec_VecEntry(vCands, j), pObjNew ) >= 0  )
                             break;
                     if ( j == k )
                         Vec_VecPush( vCands, k, pObjNew );
diff --git a/src/aig/saig/saigRefSat.c b/src/aig/saig/saigRefSat.c
index 27c243b5..d117c643 100644
--- a/src/aig/saig/saigRefSat.c
+++ b/src/aig/saig/saigRefSat.c
@@ -286,10 +286,10 @@ Aig_Man_t * Saig_ManUnrollWithCex( Aig_Man_t * pAig, Abc_Cex_t * pCex, int nInpu
     {
         // collect nodes starting from the roots
         Aig_ManIncrementTravId( pAig );
-        vRoots = (Vec_Int_t *)Vec_VecEntry( vFrameCos, f );
+        vRoots = Vec_VecEntryInt( vFrameCos, f );
         Aig_ManForEachNodeVec( pAig, vRoots, pObj, i )
             Saig_ManUnrollCollect_rec( pAig, pObj, 
-                (Vec_Int_t *)Vec_VecEntry(vFrameObjs, f),
+                Vec_VecEntryInt(vFrameObjs, f),
                 (Vec_Int_t *)(f ? Vec_VecEntry(vFrameCos, f-1) : NULL) );
     }
 
@@ -304,7 +304,7 @@ Aig_Man_t * Saig_ManUnrollWithCex( Aig_Man_t * pAig, Abc_Cex_t * pCex, int nInpu
     for ( f = 0; f <= pCex->iFrame; f++ )
     {
         // construct
-        vObjs = (Vec_Int_t *)Vec_VecEntry( vFrameObjs, f );
+        vObjs = Vec_VecEntryInt( vFrameObjs, f );
         Aig_ManForEachNodeVec( pAig, vObjs, pObj, i )
         {
             if ( Aig_ObjIsNode(pObj) )
@@ -331,7 +331,7 @@ Aig_Man_t * Saig_ManUnrollWithCex( Aig_Man_t * pAig, Abc_Cex_t * pCex, int nInpu
         if ( f == pCex->iFrame )
             break;
         // transfer
-        vRoots = (Vec_Int_t *)Vec_VecEntry( vFrameCos, f );
+        vRoots = Vec_VecEntryInt( vFrameCos, f );
         Aig_ManForEachNodeVec( pAig, vRoots, pObj, i )
             Saig_ObjLiToLo( pAig, pObj )->pData = pObj->pData;
     }
@@ -574,7 +574,7 @@ Abc_Cex_t * Saig_RefManRunSat( Saig_RefMan_t * p, int fNewOrder )
             Vec_IntPush( vAssumps, Entry );
 
         for ( i = 0; i < Vec_VecSize(vLits); i++ )
-            printf( "%d ", Vec_IntSize( (Vec_Int_t *)Vec_VecEntry(vLits, i) ) );
+            printf( "%d ", Vec_IntSize( Vec_VecEntryInt(vLits, i) ) );
         printf( "\n" );
 
         if ( p->fVerbose )
@@ -624,7 +624,7 @@ clk = clock();
         Vec_IntPush( vAssumps, Entry );
 
 //    for ( i = 0; i < Vec_VecSize(vLits); i++ )
-//        printf( "%d ", Vec_IntSize( (Vec_Int_t *)Vec_VecEntry(vLits, i) ) );
+//        printf( "%d ", Vec_IntSize( Vec_VecEntryInt(vLits, i) ) );
 //    printf( "\n" );
 
     if ( p->fVerbose )
@@ -655,12 +655,12 @@ clk = clock();
             continue;
 
         // UNSAT - remove literals
-        Vec_IntClear( (Vec_Int_t *)Vec_VecEntry(vLits, f) );
+        Vec_IntClear( Vec_VecEntryInt(vLits, f) );
         Counter--;
     }
 
     for ( i = 0; i < Vec_VecSize(vLits); i++ )
-        printf( "%d ", Vec_IntSize( (Vec_Int_t *)Vec_VecEntry(vLits, i) ) );
+        printf( "%d ", Vec_IntSize( Vec_VecEntryInt(vLits, i) ) );
     printf( "\n" );
 
     if ( p->fVerbose )
@@ -787,7 +787,7 @@ Vec_Int_t * Saig_RefManRefineWithSat( Saig_RefMan_t * p, Vec_Int_t * vAigPis )
     // derive literals
     vLits = Saig_RefManOrderLiterals( p, vVar2PiId, vAssumps );
     for ( i = 0; i < Vec_VecSize(vLits); i++ )
-        printf( "%d ", Vec_IntSize( (Vec_Int_t *)Vec_VecEntry(vLits, i) ) );
+        printf( "%d ", Vec_IntSize( Vec_VecEntryInt(vLits, i) ) );
     printf( "\n" );
 
     // create different sets of assumptions
@@ -808,12 +808,12 @@ Vec_Int_t * Saig_RefManRefineWithSat( Saig_RefMan_t * p, Vec_Int_t * vAigPis )
             continue;
 
         // UNSAT - remove literals
-        Vec_IntClear( (Vec_Int_t *)Vec_VecEntry(vLits, f) );
+        Vec_IntClear( Vec_VecEntryInt(vLits, f) );
         Counter--;
     }
 
     for ( i = 0; i < Vec_VecSize(vLits); i++ )
-        printf( "%d ", Vec_IntSize( (Vec_Int_t *)Vec_VecEntry(vLits, i) ) );
+        printf( "%d ", Vec_IntSize( Vec_VecEntryInt(vLits, i) ) );
     printf( "\n" );
 
     // create assumptions