2,3d1
< //
< ////////////////////////////////////
6d3
< //#include <fstream>
11d7
< #include "Serializer.h"
18,20d13
< ////////////////////////////////////
< // Construction/Destruction
< ////////////////////////////////////
22,31d14
< Transfer::Transfer(TRANSFER* pTRANSFERStruct, GROUP* pGroup)
<     : m_pStruct(pTRANSFERStruct), m_pGroup(pGroup)
< {
< }
< 
< Transfer::~Transfer()
< {
<     // do nothing yet, but may need to clean up m_pStruct
< }
< 
37c20
<         // write TRANSFER start_period
---
>         // write TransferStruct start_period
40c23
<         // write TRANSFER end_period
---
>         // write TransferStruct end_period
43c26,27
<         size_t labelLength = 0;
---
>         // write TransferStruct m_zoneID
>         binaryArchive.write( &(m_pStruct->m_zoneID), sizeof(m_pStruct->m_zoneID) ); // data, size
45,48c29,30
<         // write TRANSFER to_zone label length & text
<         labelLength = strlen( m_pStruct->to_zone ) + 1; // write with terminating null
<         binaryArchive.write( &labelLength, sizeof(labelLength) ); // data, size
<         binaryArchive.write( m_pStruct->to_zone, labelLength ); // data, size
---
>         // write TransferStruct m_auLabelIndex
>         binaryArchive.write( &(m_pStruct->m_auLabelIndex), sizeof(m_pStruct->m_auLabelIndex) ); // data, size
50,55c32
<         // write TRANSFER to_au label length & text
<         labelLength = strlen( m_pStruct->to_au ) + 1; // write with terminating null
<         binaryArchive.write( &labelLength, sizeof(labelLength) ); // data, size
<         binaryArchive.write( m_pStruct->to_au, labelLength ); // data, size
< 
<         // write TRANSFER to_age
---
>         // write TransferStruct to_age
58c35
<         // write TRANSFER to_ctype
---
>         // write TransferStruct to_ctype
61c38
<         // write TRANSFER to_rage
---
>         // write TransferStruct to_rage
67c44
<         TRANSFER tempStruct;
---
>         TransferStruct tempStruct;
70c47
<         // read TRANSFER start_period
---
>         // read TransferStruct start_period
73c50
<         // read TRANSFER end_period
---
>         // read TransferStruct end_period
76c53,54
<         size_t labelLength = 0;
---
>         // read TransferStruct m_zoneID
>         binaryArchive.read( &(m_pStruct->m_zoneID), sizeof(m_pStruct->m_zoneID) ); // data, size
78,81c56,57
<         // read TRANSFER to_zone label length & text
<         binaryArchive.read( &labelLength, sizeof(labelLength) ); // data, size
<         char* zoneLabel = new char[labelLength];
<         binaryArchive.read( zoneLabel, labelLength ); // data, size
---
>         // read TransferStruct m_auLabelIndex
>         binaryArchive.read( &(m_pStruct->m_auLabelIndex), sizeof(m_pStruct->m_auLabelIndex) ); // data, size
83,88c59
<         // read TRANSFER to_au label length & text
<         binaryArchive.read( &labelLength, sizeof(labelLength) ); // data, size
<         char* auLabel = new char[labelLength];
<         binaryArchive.read( auLabel, labelLength ); // data, size
< 
<         // read TRANSFER to_age
---
>         // read TransferStruct to_age
91c62
<         // read TRANSFER to_ctype
---
>         // read TransferStruct to_ctype
94c65
<         // read TRANSFER to_rage
---
>         // read TransferStruct to_rage
98c69
<                              zoneLabel, auLabel,
---
>                              m_pStruct->m_zoneID, m_pStruct->m_auLabelIndex,
100,111d70
< 
<         // set struct with values read before call to init_make_transfer
<         //m_pStruct->start_period = start_period; // done by init_make_transfer
<         //m_pStruct->end_period = end_period; // done by init_make_transfer
<         //m_pStruct->to_age = to_age; // done by init_make_transfer
<         //m_pStruct->to_ctype = to_ctype; // done by init_make_transfer
<         //m_pStruct->to_rage = to_rage; // done by init_make_transfer
< 
<         delete[] zoneLabel;
<         zoneLabel = 0;
<         delete[] auLabel;
<         auLabel = 0;
113c72
<     // AgeArea is not serialized (defaults to 0 until simulation)
---
>     // pAgeArea is not serialized (defaults to 0 until simulation)
117c76,77
< void Transfer::recreateStruct(int instart, int inend, char *inzone, char *inau, int inage, int inctype, int inrage)
---
> void Transfer::recreateStruct(const int start, const int end, const int zoneID,
>                               const int auLabelIndex, const int age, const int class_type, const int regenAge)
119,123c79
<     /*if (0 != m_pStruct) // clean up memory if overwriting existing struct
<     {
<         init_delete_transfer(m_pStruct);
<     }*/
<     TRANSFER* pTransfer = 0;
---
>     TransferStruct* pTransfer = 0;
126c82
<         pTransfer = init_make_transfer(m_pGroup, instart, inend, inzone, inau, inage, inctype, inrage);
---
>         pTransfer = init_make_transfer(m_pGroup, start, end, zoneID, auLabelIndex, age, class_type, regenAge);
138,153d93
< 
< /*int Transfer::lookupTRANSFERID(const string& label)
< {
<     // lookup AU's index in map by label
<     AConstIndexIterator item = m_labelIndex.find(label);
<     if ( item != m_labelIndex.end() )
<     {
<         return ( (item->second) );
<     }
<     else
<     {
<         throw ("AU not found in labelIndex map");
<     }
< }*/
< 
<