Diff of /trunk/gadget/optinfo.h

Parent Directory | Revision Log | Patch

	revision 12, Fri Jul 24 18:36:24 2015 UTC	revision 15, Tue Sep 1 19:14:33 2015 UTC
#	Line 121	Line 121
121	* \brief This is the function that will calculate the likelihood score using the Hooke & Jeeves optimiser	* \brief This is the function that will calculate the likelihood score using the Hooke & Jeeves optimiser
122	*/	*/
123	virtual void OptimiseLikelihood();	virtual void OptimiseLikelihood();
124	#ifdef GADGET_OPENMP	#ifdef SPECULATIVE
125	/**	/**
126	* \brief This is the function that will calculate the likelihood score using the Hooke & Jeeves optimiser parallelized with the reproducible version implemented OpenMP	* \brief This is the function that will calculate the likelihood score using the Hooke & Jeeves optimiser parallelized with the reproducible version implemented OpenMP
127	*/	*/
#	Line 145	Line 145
145	* \param param is the IntVector containing the order that the parameters should be searched in	* \param param is the IntVector containing the order that the parameters should be searched in
146	* \return the best function value found from the search	* \return the best function value found from the search
147	*/	*/
148	double bestNearbyOMP(DoubleVector& delta, DoubleVector& point, double prevbest, IntVector& param);	double bestNearbyRepro(DoubleVector& delta, DoubleVector& point, double prevbest, IntVector& param);
149	/**	/**
150	* \brief This function implemented the speculative version with OpenMP will calculate the best point that can be found close to the current point	* \brief This function implemented the speculative version with OpenMP will calculate the best point that can be found close to the current point
151	* \param delta is the DoubleVector of the steps to take when looking for the best point	* \param delta is the DoubleVector of the steps to take when looking for the best point
#	Line 154	Line 154
154	* \param param is the IntVector containing the order that the parameters should be searched in	* \param param is the IntVector containing the order that the parameters should be searched in
155	* \return the best function value found from the search	* \return the best function value found from the search
156	*/	*/
157	double bestNearbyOMP2(DoubleVector& delta, DoubleVector& point, double prevbest, IntVector& param);	double bestNearbySpec(DoubleVector& delta, DoubleVector& point, double prevbest, IntVector& param);
158	/**	/**
159	* \brief This is the maximum number of iterations for the Hooke & Jeeves optimisation	* \brief This is the maximum number of iterations for the Hooke & Jeeves optimisation
160	*/	*/
#	Line 211	Line 211
211	* \brief This is the function that will calculate the likelihood score using the Simulated Annealing optimiser	* \brief This is the function that will calculate the likelihood score using the Simulated Annealing optimiser
212	*/	*/
213	virtual void OptimiseLikelihood();	virtual void OptimiseLikelihood();
214	#ifdef GADGET_OPENMP	#ifdef SPECULATIVE
215	/**	/**
216	* \brief This is the function that will calculate the likelihood score using the Simulated Annealing optimiser parallelized with the reproducible version implemented OpenMP	* \brief This is the function that will calculate the likelihood score using the Simulated Annealing optimiser parallelized with the reproducible version implemented OpenMP
217	*/	*/
#	Line 315	Line 315
315	* \brief This is the function that will calculate the likelihood score using the BFGS optimiser	* \brief This is the function that will calculate the likelihood score using the BFGS optimiser
316	*/	*/
317	virtual void OptimiseLikelihood();	virtual void OptimiseLikelihood();
318	#ifdef GADGET_OPENMP	#ifdef SPECULATIVE
319	/**	/**
320	* \brief This function call the sequential function. BFGS isn't implemented with OpenMP	* \brief This function call the sequential function. BFGS isn't implemented with OpenMP
321	*/	*/

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

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

---

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