Diff of /trunk/gadget/ecosystem.h

Parent Directory | Revision Log | Patch

	revision 11, Thu Jul 23 19:00:38 2015 UTC	revision 12, Fri Jul 24 18:36:24 2015 UTC
#	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();
	//FIXME doc
	//#ifdef GADGET_OPENMP
	//  void writeOptValuesOMP();
	//#endif
114	/**	/**
115	* \brief This is the function that will optimise the likelihood score	* \brief This is the function that will optimise the likelihood score
116	*/	*/
117	void Optimise();	void Optimise();
	//FIXME doc
	void OptimiseOMP();
118	/**	/**
119	* \brief This function will initialise the Ecosystem parameters	* \brief This function will initialise the Ecosystem parameters
120	*/	*/
#	Line 130	Line 124
124	* \param Stochastic is the StochasticData containing the new values of the parameters	* \param Stochastic is the StochasticData containing the new values of the parameters
125	*/	*/
126	void Update(const StochasticData* const Stochastic) const { keeper->Update(Stochastic); };	void Update(const StochasticData* const Stochastic) const { keeper->Update(Stochastic); };
127	//FIXME doc	#ifndef NO_OPENMP
128		/**
129		* \brief This function will update the store values of the parameters of the Ecosystems used with OpenMP
130		* \param v is the DoubleVector that store the values of the parameters of the main Ecosystem
131		*/
132	void Update(const DoubleVector v)const { keeper->Update(v);}	void Update(const DoubleVector v)const { keeper->Update(v);}
133		#endif
134	/**	/**
135	* \brief This function will reset the Ecosystem information	* \brief This function will reset the Ecosystem information
136	*/	*/
#	Line 266	Line 265
265	*/	*/
266	StockPtrVector& getModelStockVector() { return stockvec; };	StockPtrVector& getModelStockVector() { return stockvec; };
267	/**	/**
268	* \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
269		* \return values the return of the method getValues from Keeper
270	*/	*/
	//FIXME doc
271	DoubleVector getValues() {return keeper->getValues();}	DoubleVector getValues() {return keeper->getValues();}
272		/**
273		* \brief This is the flag used to denote whether the user has interrupted the current model run
274		*/
275	volatile int interrupted;	volatile int interrupted;
276	protected:	protected:
277	/**	/**

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

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

---

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