Addition, subtraction, and multiplication work now

Division isn't working yet, there are too many options, I'll figure out
something eventually :-P

1 files changed, 26 insertions, 3 deletions

diff --git a/src/packedintarray.cpp b/src/packedintarray.cpp
index 817a7ab..7654356 100644
--- a/src/packedintarray.cpp
+++ b/src/packedintarray.cpp
@@ -41,11 +41,28 @@ PackedIntArray::PackedIntArray( PackedIntArray::Unit iBitWidth, int iCount ):
         uMask |= (1<<j);

 }

 

+PackedIntArray::PackedIntArray( const PackedIntArray &rSrc ) :

+    iBitWidth( rSrc.iBitWidth ),

+    aData( NULL ),

+    iCapacity( rSrc.iCapacity ),

+    iCount( rSrc.iCount ),

+    uMask( rSrc.uMask )

+{

+    int iSize = StoreCount(iCapacity);

+    aData = new Store[iSize];

+    memcpy( aData, rSrc.aData, iSize*sizeof(Store) );

+}

+

 PackedIntArray::~PackedIntArray()

 {

     delete[] aData;

 }

 

+void PackedIntArray::clear()

+{

+    iCount = 0;

+}

+

 void PackedIntArray::append( PackedIntArray::Unit i )

 {

     iCount++;

@@ -53,6 +70,12 @@ void PackedIntArray::append( PackedIntArray::Unit i )
     set( iCount-1, i );

 }

 

+void PackedIntArray::remove()

+{

+    if( iCount > 0 )

+        iCount--;

+}

+

 PackedIntArray::Unit PackedIntArray::get( int idx ) const

 {

     int iStore = idx*iBitWidth/StoreBits;

@@ -121,12 +144,12 @@ void PackedIntArray::checkCapacity()
 {

     if( iCount > iCapacity )

     {

-        Bu::println("!!! Resizing !!!");

+//        Bu::println("!!! Resizing !!!");

         Store *aOldData = aData;

         int iNewSize = StoreCount(iCapacity*2);

         int iSize = StoreCount(iCapacity);

-        Bu::println("  %1 => %2 (%3 bit words)").arg( iSize ).arg( iNewSize )

-            .arg( StoreBits );

+//        Bu::println("  %1 => %2 (%3 bit words)").arg( iSize ).arg( iNewSize )

+//            .arg( StoreBits );

         aData = new Store[iNewSize];

         memset( aData, 0, iNewSize*sizeof(Store) );

         memcpy( aData, aOldData, iSize*sizeof(Store) );