--- trunk/gadget/ecosystem.h 2015/07/23 19:00:38 11 +++ trunk/gadget/ecosystem.h 2015/07/24 18:36:24 12 @@ -111,16 +111,10 @@ * \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 */ @@ -130,8 +124,13 @@ * \param Stochastic is the StochasticData containing the new values of the parameters */ void Update(const StochasticData* const Stochastic) const { keeper->Update(Stochastic); }; - //FIXME doc +#ifndef NO_OPENMP + /** + * \brief This function will update the store values of the parameters of the Ecosystems used with OpenMP + * \param v is the DoubleVector that store the values of the parameters of the main Ecosystem + */ void Update(const DoubleVector v)const { keeper->Update(v);} +#endif /** * \brief This function will reset the Ecosystem information */ @@ -266,10 +265,13 @@ */ StockPtrVector& getModelStockVector() { return stockvec; }; /** - * \brief This is the flag used to denote whether the user has interrupted the current model run + * \brief This function will return the DoubleVector used to store the values of the parameters + * \return values the return of the method getValues from Keeper */ - //FIXME doc DoubleVector getValues() {return keeper->getValues();} + /** + * \brief This is the flag used to denote whether the user has interrupted the current model run + */ volatile int interrupted; protected: /**