--- trunk/gadget/maininfo.h 2015/07/23 19:00:38 11 +++ trunk/gadget/maininfo.h 2017/04/07 09:20:55 20 @@ -50,6 +50,12 @@ * \param filename is the name of the file */ void setPrintFinalFile(char* filename); +#ifdef _OPENMP + /** + * \brief This function will store parallel options + */ + void setParallel(char* filename); +#endif /** * \brief This function will store the filename that the initial values for the model parameters will be read from * \param filename is the name of the file @@ -70,8 +76,6 @@ * \return flag */ int runOptimise() const { return runoptimise; }; - //FIXME doc - int runOmp() const { return runomp; }; /** * \brief This function will return the flag used to determine whether a simulation run should be performed * \return flag @@ -87,6 +91,13 @@ * \return flag */ int runPrint() const { return runprint; }; +#ifdef _OPENMP + /** + * \brief This function will return the flag used to determine whether the current simulation should print the model output + * \return flag + */ + int runParallel() const { return runparallel; }; +#endif /** * \brief This function will return the flag used to determine whether the optimisation parameters have been given * \return flag @@ -146,14 +157,14 @@ * \brief This function will return the maximum ratio of a stock that can be consumed on any given timestep * \return maxratio */ - double getMaxRatio() const { - return maxratio; - } - unsigned* getSeed() const {return seed;} -// unsigned getSeedM() const {return seedM;} -// unsigned getSeedP() const {return seedP;} - - ; + double getMaxRatio() const { + return maxratio; + } + /** + * \brief This function will return seeds used in SA + * \return seed array of unsigned int with the seeds used in SA + */ + unsigned* getSeed() const {return seed;}; private: @@ -206,8 +217,6 @@ * \brief This is the flag used to denote whether the current simulation has been started using paramin (PVM) or not */ int runnetwork; - //FIXME doc - int runomp; /** * \brief This is the flag used to denote whether the current simulation should print model output or not */ @@ -232,13 +241,16 @@ * \brief This is the maximum ratio of a stock that can be consumed on any given timestep */ double maxratio; - - //FIXME doc - //see[0] = seed; see[1] = seedM; see[2] = seedP; + /** + * \brief vector with the seeds used in SA + * \note see[0] = seed | see[1] = seedM | see[2] = seedP + */ unsigned* seed; -// unsigned seed = 0; -// unsigned seedM = 0; -// unsigned seedP = 0; +#ifdef _OPENMP + /** + * \brief This is the flag used to denote whether the likelihood score should be optimised in pararrel */ + int runparallel; +#endif }; #endif