1 files changed, 36 insertions, 0 deletions

diff --git a/src/population.h b/src/population.h
index 0fdad32..c2d1bec 100644
--- a/src/population.h
+++ b/src/population.h
@@ -1,13 +1,49 @@
 #ifndef GENETIC_POPULATION_H
 #define GENETIC_POPULATION_H
 
+#include <bu/string.h>
+#include <bu/hash.h>
+#include <bu/mutex.h>
+
+#include "genetic/config.h"
+
 namespace Genetic
 {
+        class Phenotype;
+
         class Population
         {
         public:
                 Population();
                 virtual ~Population();
+
+                typedef Bu::Hash<PhenotypeId, Phenotype *> PhenotypeHash;
+                typedef PhenotypeHash::iterator iterator;
+                typedef PhenotypeHash::const_iterator const_iterator;
+
+                iterator begin() { return hPhenotype.begin(); }
+                const_iterator begin() const { return hPhenotype.begin(); }
+                int getSize() const { return hPhenotype.getSize(); }
+
+                PhenotypeId addPhenotype( Phenotype *pNew );
+                Phenotype *getPhenotype( PhenotypeId id )
+                        { return hPhenotype.get( id ); }
+                bool hasProperty( PhenotypeId id, const Bu::String &sKey ) const;
+                Bu::Variant getProperty( PhenotypeId id, const Bu::String &sKey ) const;
+                void setProperty( PhenotypeId id, const Bu::String &sKey,
+                                Bu::Variant vValue );
+                void delPhenotype( PhenotypeId id );
+                Phenotype *takePhenotype( PhenotypeId id );
+                void clear();
+
+                PhenotypeId timestep();
+                PhenotypeId time() const;
+
+        private:
+                PhenotypeId uNextId;
+                PhenotypeId uTime;
+                PhenotypeHash hPhenotype;
+                mutable Bu::Mutex mGeneral;
         };
 };