diff options
Diffstat (limited to 'Hilbert/BigBitVec.hpp')
| -rw-r--r-- | Hilbert/BigBitVec.hpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/Hilbert/BigBitVec.hpp b/Hilbert/BigBitVec.hpp index 24f84a2..8f7c485 100644 --- a/Hilbert/BigBitVec.hpp +++ b/Hilbert/BigBitVec.hpp @@ -118,7 +118,7 @@ public: // Returns the current size in bits. int - getSize() const + size() const { return m_iRacks*FBV_BITS; } @@ -155,7 +155,7 @@ public: // zero the new values /*for ( ; i < iRacks; i++ ) - pcRacks[i].zero();*/ + pcRacks[i].reset();*/ if ( iRacks > i ) memset( static_cast<void*>(pcRacks + i), 0, sizeof(CFixBitVec)*(iRacks-i) ); @@ -173,12 +173,12 @@ public: // zeros the bit-vector. CBigBitVec & - zero() + reset() { /*int i; for ( i = 0; i < m_iRacks; i++ ) - m_pcRacks[i].zero();*/ + m_pcRacks[i].reset();*/ memset( static_cast<void*>(m_pcRacks), 0, sizeof(CFixBitVec)*m_iRacks ); @@ -193,7 +193,7 @@ public: int iBits ) { - assert( iBits >= 0 && iBits <= getSize() ); + assert( iBits >= 0 && iBits <= size() ); int r, b, i; BBV_MODSPLIT(r,b,iBits); @@ -204,7 +204,7 @@ public: m_pcRacks[r].truncate(b); for ( i = r+1; i < m_iRacks; i++ ) - m_pcRacks[i].zero(); + m_pcRacks[i].reset(); return (*this); } @@ -231,7 +231,7 @@ public: for ( i = 0; i < cBBV.m_iRacks; i++ ) m_pcRacks[i] = cBBV.m_pcRacks[i]; for ( ; i < m_iRacks; i++ ) - m_pcRacks[i].zero();*/ + m_pcRacks[i].reset();*/ if (m_pcRacks) { if (cBBV.m_pcRacks) { memcpy( static_cast<void*>(m_pcRacks), @@ -267,7 +267,7 @@ public: m_pcRacks[0] = cFBV; /*int i; for ( i = 1; i < m_iRacks; i++ ) - m_pcRacks[i].zero();*/ + m_pcRacks[i].reset();*/ memset( static_cast<void*>(m_pcRacks+1), 0, sizeof(CFixBitVec)*(m_iRacks-1) ); return (*this); @@ -280,7 +280,7 @@ public: m_pcRacks[0] = j; /*int i; for ( i = 1; i < m_iRacks; i++ ) - m_pcRacks[i].zero();*/ + m_pcRacks[i].reset();*/ memset( static_cast<void*>(m_pcRacks+1), 0, sizeof(CFixBitVec)*(m_iRacks-1) ); return (*this); @@ -288,42 +288,42 @@ public: // Returns the value of the nth bit. bool - getBit( + test( int iIndex ) const { - assert( iIndex >= 0 && iIndex < getSize() ); + assert( iIndex >= 0 && iIndex < size() ); int r, b; BBV_MODSPLIT(r,b,iIndex); - return m_pcRacks[r].getBit(b); + return m_pcRacks[r].test(b); } // Sets the value of the nth bit. CBigBitVec & - setBit( + set( int iIndex, - bool bBit + bool bBit = true ) { - assert( iIndex >= 0 && iIndex < getSize() ); + assert( iIndex >= 0 && iIndex < size() ); int r, b; BBV_MODSPLIT(r,b,iIndex); - m_pcRacks[r].setBit(b,bBit); + m_pcRacks[r].set(b,bBit); return (*this); } // Toggles the value of the nth bit. CBigBitVec & - toggleBit( + toggle( int iIndex ) { - assert( iIndex >= 0 && iIndex < getSize() ); + assert( iIndex >= 0 && iIndex < size() ); int r, b; BBV_MODSPLIT(r,b,iIndex); - m_pcRacks[r].toggleBit(b); + m_pcRacks[r].toggle(b); return (*this); } @@ -538,7 +538,7 @@ public: // All racks? if ( r >= m_iRacks ) { - zero(); + reset(); return (*this); } @@ -548,7 +548,7 @@ public: for ( i = m_iRacks-1; i >= r; i-- ) m_pcRacks[i] = m_pcRacks[i-r]; for ( ; i >= 0; i-- ) - m_pcRacks[i].zero(); + m_pcRacks[i].reset(); } // Do bit shifts. @@ -597,7 +597,7 @@ public: // All racks? if ( r >= m_iRacks ) { - zero(); + reset(); return (*this); } @@ -607,7 +607,7 @@ public: for ( i = 0; i < m_iRacks-r; i++ ) m_pcRacks[i] = m_pcRacks[i+r]; for ( ; i < m_iRacks; i++ ) - m_pcRacks[i].zero(); + m_pcRacks[i].reset(); } // Do bit shifts. @@ -649,7 +649,7 @@ public: // Fill in the width, if necessary. if ( iWidth <= 0 ) - iWidth = getSize(); + iWidth = size(); // Modulo the number of bits. //FBVMOD(iBits,iWidth); @@ -694,7 +694,7 @@ public: // Fill in the width, if necessary. if ( iWidth <= 0 ) - iWidth = getSize(); + iWidth = size(); // Modulo the number of bits. //FBVMOD(iBits,iWidth); @@ -730,11 +730,11 @@ public: // Returns true if the rack is zero valued. bool - isZero() const + none() const { int i; for ( i = 0; i < m_iRacks; i++ ) - if ( !m_pcRacks[i].isZero() ) return false; + if ( !m_pcRacks[i].none() ) return false; return true; } @@ -835,7 +835,7 @@ public: for ( i = m_iRacks-1; i >= 0; i-- ) { m_pcRacks[i].grayCodeInv(); - if ( s ) m_pcRacks[i].complement(); + if ( s ) m_pcRacks[i].flip(); s = m_pcRacks[i].rack() & 1; } return (*this); @@ -844,11 +844,11 @@ public: // Complement CBigBitVec & - complement() + flip() { int i; for ( i = 0; i < m_iRacks; i++ ) - m_pcRacks[i].complement(); + m_pcRacks[i].flip(); return (*this); } |