nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

OMP additions

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1559 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
wcancino 2009-03-18 09:25:02 +00:00
commit f316e1dd35
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
contribution/branches/PhyloMOEA/PhyloMOEA/PhyloMOEA.cpp
View file

@ -18,7 +18,7 @@
#include <utils.h> #include <utils.h>
#include <apply.h> #include <apply.h>
#include <omp.h>
gsl_rng *rn2; gsl_rng *rn2;
RandomNr *rn; RandomNr *rn;
@ -27,7 +27,7 @@ long seed;
//vector<phylotreeIND> arbores; //vector<phylotreeIND> arbores;
string datafile,usertree, expid, path, algotype, optimize_branch; string datafile,usertree, expid, path, algotype, optimize_branch;
double pcrossover, pmutation, kappa, alpha; double pcrossover, pmutation, kappa, alpha;
unsigned int ngenerations, popsize, ncats; unsigned int ngenerations, popsize, ncats, nthreads;
ofstream exp_data,evolution_data, best_media_scores, final_trees, final_pareto_trees, clades_pareto, clades_final,final_scores,pareto_scores; ofstream exp_data,evolution_data, best_media_scores, final_trees, final_pareto_trees, clades_pareto, clades_final,final_scores,pareto_scores;
LikelihoodCalculator *lik_calc_ptr; LikelihoodCalculator *lik_calc_ptr;
phylotreeIND *templatetree_ptr; phylotreeIND *templatetree_ptr;
@ -62,7 +62,9 @@ int main(int argc, char *argv[])
ostringstream convert; ostringstream convert;
convert << seed; convert << seed;
expid = parser.createParam(convert.str(), "expid", "Experiment ID", 'e',"Param").value(); expid = parser.createParam(convert.str(), "expid", "Experiment ID", 'e',"Param").value();
nthreads = parser.createParam(omp_get_max_threads(), "nthreads", "Numthreads", 'i',"Param").value();
omp_set_num_threads(nthreads);
if(getNodeRank()==1) welcome_message(); if(getNodeRank()==1) welcome_message();
if( datafile.size()==0 ) if( datafile.size()==0 )
{ {