1 files changed, 7 insertions, 3 deletions

diff --git a/src/explicitsimulation.h b/src/explicitsimulation.h
index c2aeed9..7713c71 100644
--- a/src/explicitsimulation.h
+++ b/src/explicitsimulation.h
@@ -31,6 +31,9 @@ namespace Genetic
         protected:
                 void updateFitness();
                 void setFitness( Genetic::PhenotypeId, double dFitness );
+                void workDone();
+                void setRunning( bool b );
+                bool isRunning();
 
         protected:
                 Population xPop;
@@ -49,8 +52,12 @@ namespace Genetic
                 PhenotypeId uMaxFitness;
 
                 Bu::Mutex mFitness;
+                Bu::Condition cWorkDone;
                 typedef Bu::SynchroQueue<Phenotype *> WorkQueue;
                 WorkQueue qWork;
+                int iWorkDone;
+                bool bRunning;
+                Bu::Mutex mRunning;
 
                 class Processor : public Bu::Thread
                 {
@@ -59,8 +66,6 @@ namespace Genetic
                                         WorkQueue &rqWork, int iId );
                         virtual ~Processor();
 
-                        void setRunning( bool b ) { bRunning = b; }
-
                 protected:
                         virtual void run();
 
@@ -68,7 +73,6 @@ namespace Genetic
                         FitnessFunction *pFunc;
                         WorkQueue &rqWork;
                         int iId;
-                        bool bRunning;
                 };
 
                 typedef Bu::List<Processor *> ProcessorList;