1 files changed, 33 insertions, 2 deletions

diff --git a/src/explicitsimulation.h b/src/explicitsimulation.h
index ebddd62..c2aeed9 100644
--- a/src/explicitsimulation.h
+++ b/src/explicitsimulation.h
@@ -4,6 +4,10 @@
 #include "genetic/population.h"
 #include "genetic/config.h"
 
+#include <bu/thread.h>
+#include <bu/mutex.h>
+#include <bu/synchroqueue.h>
+
 namespace Genetic
 {
         class Operator;
@@ -13,7 +17,8 @@ namespace Genetic
         {
         public:
                 ExplicitSimulation( Operator *pOper, FitnessFunction *pFunc,
-                                int iPopSize, float fKeep, float fRandom, bool bKeepBest=true );
+                                int iThreads, int iPopSize, float fKeep, float fRandom,
+                                bool bKeepBest=true );
                 virtual ~ExplicitSimulation();
 
                 void timestep();
@@ -25,11 +30,11 @@ namespace Genetic
 
         protected:
                 void updateFitness();
+                void setFitness( Genetic::PhenotypeId, double dFitness );
 
         protected:
                 Population xPop;
                 Operator *pOper;
-                FitnessFunction *pFunc;
 
         private:
                 int iPopSize;
@@ -42,6 +47,32 @@ namespace Genetic
                 double dMaxFitness;
                 double dTotalFitness;
                 PhenotypeId uMaxFitness;
+
+                Bu::Mutex mFitness;
+                typedef Bu::SynchroQueue<Phenotype *> WorkQueue;
+                WorkQueue qWork;
+
+                class Processor : public Bu::Thread
+                {
+                public:
+                        Processor( ExplicitSimulation &rSim, FitnessFunction *pFunc,
+                                        WorkQueue &rqWork, int iId );
+                        virtual ~Processor();
+
+                        void setRunning( bool b ) { bRunning = b; }
+
+                protected:
+                        virtual void run();
+
+                        ExplicitSimulation &rSim;
+                        FitnessFunction *pFunc;
+                        WorkQueue &rqWork;
+                        int iId;
+                        bool bRunning;
+                };
+
+                typedef Bu::List<Processor *> ProcessorList;
+                ProcessorList lProcessor;
         };
 };