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

Fix some weird bugs for PhyloMOEA parallel version

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1397 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
wcancino 2009-02-04 09:06:16 +00:00
commit 2ea4e6d51d
6 changed files with 89 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

28
contribution/branches/PhyloMOEA/PhyloMOEA/utils.cpp
View file

@ -33,6 +33,7 @@ extern long seed;
extern string datafile,usertree, expid, path;
extern double pcrossover, pmutation, kappa, alpha;
extern unsigned int ngenerations, popsize, ncats;
extern LikelihoodCalculator *lik_calc_ptr;
void welcome_message()
{
@ -62,17 +63,19 @@ void save_exp_params(ostream &of=cout)
void optimize_solutions( eoPop<PhyloMOEO> &pop, LikelihoodCalculator &lik_calc)
void optimize_solutions( eoPop<PhyloMOEO> &pop)
{
cout << "entrando a optimize_solutions con " << pop.size() << " arvores " << endl;
int n = pop.size();
for(int i=0; i<n; i++)
{
phylotreeIND &sol = pop[i].get_tree();
lik_calc.set_tree(sol);
lik_calc_ptr->set_tree(sol);
cout << "\noptimizaing tree " << i+1 << " of " << n;
// cout << endl << "likelihood inicial:" << lik_calc->calculate_likelihood() << endl;
Newton_LikOptimizer test(lik_calc);
test.optimize();
Newton_LikOptimizer test(*lik_calc_ptr);
//test.optimize();
pop[i].invalidate();
//lik_calc->maximizelikelihood();
@ -83,6 +86,23 @@ void optimize_solutions( eoPop<PhyloMOEO> &pop, LikelihoodCalculator &lik_calc)
}
void optimize_solution( PhyloMOEO &indi)
{
phylotreeIND &sol = indi.get_tree();
lik_calc_ptr->set_tree(sol);
//cout << "\noptimizaing tree " << i+1 << " of " << n;
// cout << endl << "likelihood inicial:" << lik_calc->calculate_likelihood() << endl;
Newton_LikOptimizer test(*lik_calc_ptr);
test.optimize();
indi.invalidate();
//pop[i].invalidate();
//lik_calc->maximizelikelihood();
//lik_calc->set_tree(*sol);
// lik_calc->set_tree( *sol);
// cout << endl << "likelihood final:" << lik_calc->calculate_likelihood() << endl;
//}
}
void readtrees(const char *fname, eoPop<PhyloMOEO> &poptree)
{
int ntrees;