1 files changed, 32 insertions, 10 deletions

diff --git a/src/phenotypebinary.cpp b/src/phenotypebinary.cpp
index 9d9e26c..8ecd394 100644
--- a/src/phenotypebinary.cpp
+++ b/src/phenotypebinary.cpp
@@ -155,6 +155,38 @@ Bu::String Genetic::PhenotypeBinary::toString()
         return sRet;
 }
 
+void Genetic::PhenotypeBinary::write( Bu::Stream &rStream )
+{
+        uint32_t uSize = htobe32( iSize );
+        rStream.write( &uSize, 4 );
+        uSize = (iSize/8) + ((iSize%8)?1:0);
+        for( int j = 0; j < uSize; j++ )
+        {
+                rStream.write(
+                        &((char *)&aGenes[j/sizeof(uint_fast32_t)])[j%sizeof(uint_fast32_t)],
+                        1
+                        );
+        }
+}
+
+void Genetic::PhenotypeBinary::read( Bu::Stream &rStream )
+{
+        uint32_t uSize;
+        rStream.read( &uSize, 4 );
+        iSize = be32toh( uSize );
+        iWords = wordsForBits(iSize);
+        delete[] aGenes;
+        aGenes = new uint_fast32_t[iWords];
+        uSize = (iSize/8) + ((iSize%8)?1:0);
+        for( int j = 0; j < uSize; j++ )
+        {
+                rStream.read(
+                        &((char *)&aGenes[j/sizeof(uint_fast32_t)])[j%sizeof(uint_fast32_t)],
+                        1
+                        );
+        }
+}
+
 void Genetic::PhenotypeBinary::extractBits( uint32_t &rTarget, int iStart,
                 int iBits )
 {
@@ -189,13 +221,3 @@ void Genetic::PhenotypeBinary::extractBits( uint64_t &rTarget, int iStart,
         }
 }
 
-void Genetic::PhenotypeBinary::write( Bu::Stream &rStream )
-{
-        rStream.write( aGenes, sizeof(uint_fast32_t)*iWords );
-}
-
-void Genetic::PhenotypeBinary::read( Bu::Stream &rStream )
-{
-        rStream.read( aGenes, sizeof(uint_fast32_t)*iWords );
-}
-