6,8c6,7
< //#include <list>
< //#include <map>
< //#include <fstream>
---
> #include <iostream>
> 
12a12,13
> 
> #include "RegenStruct.h"
13a15
> #include "AUStruct.h"
19d20
< 
23,28c24,25
<     enum { LABEL_SIZE = FssimApp::MAX_LABEL_LENGTH };
< 
<     // constructor
<     Regen(REGEN* pREGENStruct = 0, AU* pAU = 0, AU* pParentAu = 0, Zone* pZoneOfParentAu = 0)
<         : m_pStruct(pREGENStruct), m_pAU(pAU), m_pParentAU(pParentAu),
<           m_pZoneOfParentAU(pZoneOfParentAu) // only used by binary read to re-establish parent AU
---
>     Regen(AUStruct* pParentAu, RegenStruct* pRegenStruct = 0) // constructor
>         : m_pStruct(pRegenStruct), m_pParentAU(pParentAu)
30,37d26
<         if (0 != pREGENStruct) // we are writing
<         //if (0 != m_pStruct) // we are writing
<         {
<             // initialize null member from struct
<             if(0 != m_pStruct->au && 0 == m_pAU)
<             {
<                 m_pAU = m_pStruct->au;
<             }
39,50d27
<             cout << "Regen's au id: " << m_pStruct->au->id << endl;
< #endif
<         }
<         else // we are reading & need the zone of the parent au
<         {
<             assert(0 != pZoneOfParentAu);
< #ifdef _TSB_REGEN_DEBUG
<             cout << "Regen's parent au's zone id: " << pZoneOfParentAu->getStruct()->id << endl;
< #endif
<         }
<         assert(0 != pParentAu);
< #ifdef _TSB_REGEN_DEBUG
54d30
<     virtual ~Regen(); // destructor
55a32,33
>     virtual ~Regen() {} // destructor
> 
58,60c36
<     // getter inlined for efficiency - do not add lines of code
<     REGEN* getStruct() { return m_pStruct; }
<     int getAuID() { return m_auID; }
---
>     RegenStruct* getStruct() { return m_pStruct; }
63c39
<     void recreateStruct(int toAge, double percent, int offset, int reEntry);
---
>     void recreateStruct();
66c42
<     REGEN* m_pStruct;
---
>     RegenStruct* m_pStruct;
69,72c45
<     AU* m_pAU;
<     int m_auID; // used on read to preserve value for lookup after all au's are serialized
<     AU* m_pParentAU;
<     Zone* m_pZoneOfParentAU;
---
>     AUStruct* m_pParentAU;