Diff of /trunk/gadget/keeper.cc

Parent Directory | Revision Log | Patch

	revision 11, Thu Jul 23 19:00:38 2015 UTC	revision 17, Mon Nov 9 10:22:57 2015 UTC
#	Line 7	Line 7
7
8	extern Ecosystem* EcoSystem;	extern Ecosystem* EcoSystem;
9
10	#ifndef NO_OPENMP	#ifdef _OPENMP
11	extern Ecosystem** EcoSystems;	extern Ecosystem** EcoSystems;
12	#endif	#endif
13
#	Line 290	Line 290
290
291	//JMB - print the number of function evaluations at the start of the line	//JMB - print the number of function evaluations at the start of the line
292	int iters = EcoSystem->getFuncEval();	int iters = EcoSystem->getFuncEval();
293	#ifndef NO_OPENMP	#ifdef _OPENMP
294	int numThr = omp_get_max_threads ( );	int numThr = omp_get_max_threads ( );
295	for (int i = 0; i < numThr; i++)	for (int i = 0; i < numThr; i++)
296	iters += EcoSystems[i]->getFuncEval();	iters += EcoSystems[i]->getFuncEval();
#	Line 423	Line 423
423
424	if (interrupt) {	if (interrupt) {
425	int iters = EcoSystem->getFuncEval();	int iters = EcoSystem->getFuncEval();
426	#ifndef NO_OPENMP	#ifdef _OPENMP
427	int numThr = omp_get_max_threads ( );	int numThr = omp_get_max_threads ( );
428	for (i = 0; i < numThr; i++)	for (i = 0; i < numThr; i++)
429	iters += EcoSystems[i]->getFuncEval();	iters += EcoSystems[i]->getFuncEval();
#	Line 431	Line 431
431	paramfile << "; Gadget was interrupted after a total of " << iters	paramfile << "; Gadget was interrupted after a total of " << iters
432	<< " function evaluations\n; the best likelihood value found so far is "	<< " function evaluations\n; the best likelihood value found so far is "
433	<< setprecision(p) << bestlikelihood << endl;	<< setprecision(p) << bestlikelihood << endl;
434	} else if (EcoSystem->getFuncEval() == 0) {	} else if (EcoSystem->getFuncEval() == 0) {
435	paramfile << "; a simulation run was performed giving a likelihood value of "	paramfile << "; a simulation run was performed giving a likelihood value of "
436	<< setprecision(p) << EcoSystem->getLikelihood() << endl;	<< setprecision(p) << EcoSystem->getLikelihood() << endl;

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

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

---

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