Diff of /trunk/gadget/ecosystem.h

Parent Directory | Revision Log | Patch

	revision 10, Wed Jun 10 13:01:42 2015 UTC	revision 11, Thu Jul 23 19:00:38 2015 UTC
#	Line 82	Line 82
82	* \brief This function will read in the optimisation parameters from the input file	* \brief This function will read in the optimisation parameters from the input file
83	* \param infile is the CommentStream to read the optimisation parameters from	* \param infile is the CommentStream to read the optimisation parameters from
84	*/	*/
85	void readOptimisation(CommentStream& infile);	void readOptimisation(CommentStream& infile, unsigned* seed);
86	/**	/**
87	* \brief This function will write the current model status to file	* \brief This function will write the current model status to file
88	* \param filename is the name of the file to write the model information to	* \param filename is the name of the file to write the model information to
#	Line 111	Line 111
111	* \brief This function will display information about the optimised values of the parameters	* \brief This function will display information about the optimised values of the parameters
112	*/	*/
113	void writeOptValues();	void writeOptValues();
114		//FIXME doc
115		//#ifdef GADGET_OPENMP
116		//  void writeOptValuesOMP();
117		//#endif
118	/**	/**
119	* \brief This is the function that will optimise the likelihood score	* \brief This is the function that will optimise the likelihood score
120	*/	*/
121	void Optimise();	void Optimise();
122		//FIXME doc
123		void OptimiseOMP();
124	/**	/**
125	* \brief This function will initialise the Ecosystem parameters	* \brief This function will initialise the Ecosystem parameters
126	*/	*/
#	Line 124	Line 130
130	* \param Stochastic is the StochasticData containing the new values of the parameters	* \param Stochastic is the StochasticData containing the new values of the parameters
131	*/	*/
132	void Update(const StochasticData* const Stochastic) const { keeper->Update(Stochastic); };	void Update(const StochasticData* const Stochastic) const { keeper->Update(Stochastic); };
133		//FIXME doc
134		void Update(const DoubleVector v)const { keeper->Update(v);}
135	/**	/**
136	* \brief This function will reset the Ecosystem information	* \brief This function will reset the Ecosystem information
137	*/	*/
#	Line 260	Line 268
268	/**	/**
269	* \brief This is the flag used to denote whether the user has interrupted the current model run	* \brief This is the flag used to denote whether the user has interrupted the current model run
270	*/	*/
271		//FIXME doc
272		DoubleVector getValues() {return keeper->getValues();}
273	volatile int interrupted;	volatile int interrupted;
274	protected:	protected:
275	/**	/**

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.10   changed lines   Added in v.11

---

root@forge.cesga.es	ViewVC Help
Powered by ViewVC 1.0.0