--- trunk/gadget/ecosystem.h 2015/06/10 13:01:42 10 +++ trunk/gadget/ecosystem.h 2015/07/23 19:00:38 11 @@ -82,7 +82,7 @@ * \brief This function will read in the optimisation parameters from the input file * \param infile is the CommentStream to read the optimisation parameters from */ - void readOptimisation(CommentStream& infile); + void readOptimisation(CommentStream& infile, unsigned* seed); /** * \brief This function will write the current model status to file * \param filename is the name of the file to write the model information to @@ -111,10 +111,16 @@ * \brief This function will display information about the optimised values of the parameters */ void writeOptValues(); + //FIXME doc +//#ifdef GADGET_OPENMP +// void writeOptValuesOMP(); +//#endif /** * \brief This is the function that will optimise the likelihood score */ void Optimise(); + //FIXME doc + void OptimiseOMP(); /** * \brief This function will initialise the Ecosystem parameters */ @@ -124,6 +130,8 @@ * \param Stochastic is the StochasticData containing the new values of the parameters */ void Update(const StochasticData* const Stochastic) const { keeper->Update(Stochastic); }; + //FIXME doc + void Update(const DoubleVector v)const { keeper->Update(v);} /** * \brief This function will reset the Ecosystem information */ @@ -260,6 +268,8 @@ /** * \brief This is the flag used to denote whether the user has interrupted the current model run */ + //FIXME doc + DoubleVector getValues() {return keeper->getValues();} volatile int interrupted; protected: /**