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

Style for PEO

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@906 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
canape 2008-01-25 16:14:06 +00:00
commit b74a446baa
82 changed files with 1946 additions and 1663 deletions
Download patch file Download diff file Expand all files Collapse all files

36
trunk/paradiseo-peo/tutorial/Lesson4/mainEALS.cpp
View file

@ -59,13 +59,13 @@ int main (int __argc, char * * __argv)
{
peo :: init (__argc, __argv);
loadParameters (__argc, __argv);
loadParameters (__argc, __argv);
RouteInit route_init;
RouteEval full_eval;
OrderXover order_cross;
OrderXover order_cross;
PartialMappedXover pm_cross;
EdgeXover edge_cross;
CitySwap city_swap_mut;
CitySwap city_swap_mut;
// Initialization of the local search
TwoOptInit pmx_two_opt_init;
@ -76,7 +76,7 @@ int main (int __argc, char * * __argv)
// EA
eoPop <Route> pop (POP_SIZE, route_init);
eoGenContinue <Route> cont (NUM_GEN);
eoGenContinue <Route> cont (NUM_GEN);
eoCheckPoint <Route> checkpoint (cont);
eoEvalFuncCounter< Route > eval(full_eval);
eoStochTournamentSelect <Route> select_one;
@ -86,16 +86,16 @@ int main (int __argc, char * * __argv)
eoEasyEA< Route > eaAlg( checkpoint, eval, select, transform, replace );
peoWrapper parallelEA( eaAlg, pop);
peo :: run ();
peo :: finalize ();
peo :: finalize ();
if (getNodeRank()==1)
{
pop.sort();
std :: cout << "\nResult before the local search\n";
for(unsigned i=0;i<pop.size();i++)
std::cout<<"\n"<<pop[i].fitness();
}
{
pop.sort();
std :: cout << "\nResult before the local search\n";
for (unsigned i=0;i<pop.size();i++)
std::cout<<"\n"<<pop[i].fitness();
}
// Local search
peo :: init (__argc, __argv);
peoMultiStart <Route> initParallelHC (hc);
@ -105,10 +105,10 @@ int main (int __argc, char * * __argv)
peo :: finalize( );
if (getNodeRank()==1)
{
std :: cout << "\nResult after the local search\n";
pop.sort();
for(unsigned i=0;i<pop.size();i++)
std::cout<<"\n"<<pop[i].fitness();
}
{
std :: cout << "\nResult after the local search\n";
pop.sort();
for (unsigned i=0;i<pop.size();i++)
std::cout<<"\n"<<pop[i].fitness();
}
}

38
trunk/paradiseo-peo/tutorial/Lesson4/mainLSEA.cpp
View file

@ -58,13 +58,13 @@ int main (int __argc, char * * __argv)
{
peo :: init (__argc, __argv);
loadParameters (__argc, __argv);
loadParameters (__argc, __argv);
RouteInit route_init;
RouteEval full_eval;
OrderXover order_cross;
OrderXover order_cross;
PartialMappedXover pm_cross;
EdgeXover edge_cross;
CitySwap city_swap_mut;
CitySwap city_swap_mut;
// Local search
TwoOptInit pmx_two_opt_init;
@ -80,17 +80,17 @@ int main (int __argc, char * * __argv)
peo :: finalize( );
if (getNodeRank()==1)
{
std :: cout << "\nResult before the EA\n";
pop.sort();
for(unsigned i=0;i<pop.size();i++)
std::cout<<"\n"<<pop[i].fitness();
std :: cout << "\n\n";
}
{
std :: cout << "\nResult before the EA\n";
pop.sort();
for (unsigned i=0;i<pop.size();i++)
std::cout<<"\n"<<pop[i].fitness();
std :: cout << "\n\n";
}
// EA
peo :: init (__argc, __argv);
eoGenContinue <Route> cont (NUM_GEN);
eoGenContinue <Route> cont (NUM_GEN);
eoCheckPoint <Route> checkpoint (cont);
eoEvalFuncCounter< Route > eval(full_eval);
eoStochTournamentSelect <Route> select_one;
@ -100,14 +100,14 @@ int main (int __argc, char * * __argv)
eoEasyEA< Route > eaAlg( checkpoint, eval, select, transform, replace );
peoWrapper parallelEA( eaAlg, pop);
peo :: run ();
peo :: finalize ();
peo :: finalize ();
if (getNodeRank()==1)
{
std :: cout << "\nResult after the EA\n";
pop.sort();
for(unsigned i=0;i<pop.size();i++)
std::cout<<"\n"<<pop[i].fitness();
std :: cout << "\n\n";
}
{
std :: cout << "\nResult after the EA\n";
pop.sort();
for (unsigned i=0;i<pop.size();i++)
std::cout<<"\n"<<pop[i].fitness();
std :: cout << "\n\n";
}
}