summaryrefslogtreecommitdiffstats
path: root/src/misc/vec
diff options
context:
space:
mode:
Diffstat (limited to 'src/misc/vec')
-rw-r--r--src/misc/vec/vecPtr.h8
-rw-r--r--src/misc/vec/vecWec.h5
-rw-r--r--src/misc/vec/vecWrd.h7
3 files changed, 20 insertions, 0 deletions
diff --git a/src/misc/vec/vecPtr.h b/src/misc/vec/vecPtr.h
index 4b76b69f..ed2a481e 100644
--- a/src/misc/vec/vecPtr.h
+++ b/src/misc/vec/vecPtr.h
@@ -736,6 +736,14 @@ static inline int Vec_PtrFind( Vec_Ptr_t * p, void * Entry )
return i;
return -1;
}
+static inline int Vec_PtrFindStr( Vec_Ptr_t * p, char * Entry )
+{
+ int i;
+ for ( i = 0; i < p->nSize; i++ )
+ if ( p->pArray[i] && !strcmp((char *)p->pArray[i], Entry) )
+ return i;
+ return -1;
+}
/**Function*************************************************************
diff --git a/src/misc/vec/vecWec.h b/src/misc/vec/vecWec.h
index 88ee3dd7..fdbded9c 100644
--- a/src/misc/vec/vecWec.h
+++ b/src/misc/vec/vecWec.h
@@ -68,6 +68,8 @@ struct Vec_Wec_t_
for ( i = LevelStart-1; (i >= LevelStop) && (((vVec) = Vec_WecEntry(vGlob, i)), 1); i-- )
#define Vec_WecForEachLevelTwo( vGlob1, vGlob2, vVec1, vVec2, i ) \
for ( i = 0; (i < Vec_WecSize(vGlob1)) && (((vVec1) = Vec_WecEntry(vGlob1, i)), 1) && (((vVec2) = Vec_WecEntry(vGlob2, i)), 1); i++ )
+#define Vec_WecForEachLevelDouble( vGlob, vVec1, vVec2, i ) \
+ for ( i = 0; (i < Vec_WecSize(vGlob)) && (((vVec1) = Vec_WecEntry(vGlob, i)), 1) && (((vVec2) = Vec_WecEntry(vGlob, i+1)), 1); i += 2 )
////////////////////////////////////////////////////////////////////////
/// FUNCTION DEFINITIONS ///
@@ -247,6 +249,9 @@ static inline int Vec_WecSizeUsedLimits( Vec_Wec_t * p, int iStart, int iStop )
***********************************************************************/
static inline void Vec_WecShrink( Vec_Wec_t * p, int nSizeNew )
{
+ Vec_Int_t * vVec; int i;
+ Vec_WecForEachLevelStart( p, vVec, i, nSizeNew )
+ Vec_IntShrink( vVec, 0 );
assert( p->nSize >= nSizeNew );
p->nSize = nSizeNew;
}
diff --git a/src/misc/vec/vecWrd.h b/src/misc/vec/vecWrd.h
index 45df1c97..e123c054 100644
--- a/src/misc/vec/vecWrd.h
+++ b/src/misc/vec/vecWrd.h
@@ -160,6 +160,13 @@ static inline Vec_Wrd_t * Vec_WrdStartNatural( int nSize )
p->pArray[i] = i;
return p;
}
+static inline Vec_Wrd_t * Vec_WrdStartRandom( int nSize )
+{
+ Vec_Wrd_t * vSims = Vec_WrdStart( nSize ); int i;
+ for ( i = 0; i < nSize; i++ )
+ vSims->pArray[i] = Abc_RandomW(0);
+ return vSims;
+}
/**Function*************************************************************