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

review and update the documentation

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2347 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
boufaras 2011-08-03 09:43:06 +00:00
commit ee9fb52f07
1 changed files with 12 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

33
branches/ParadisEO-GPU/tutoriel/OneMax/testFirstImpr.cu
View file

@ -43,14 +43,15 @@ using namespace std;
#include <ga.h> #include <ga.h>
// OneMax full eval function // OneMax full eval function
#include <problems/eval/EvalOneMax.h> #include <problems/eval/EvalOneMax.h>
// OneMax increment eval function //Parallel evaluation of neighborhood on GPU
#include <eval/moGPUEvalByModif.h> #include <eval/moGPUEvalByModif.h>
// OneMax increment evaluation function
#include <problems/eval/OneMaxIncrEval.h> #include <problems/eval/OneMaxIncrEval.h>
// One Max solution // One Max solution
#include <GPUType/moGPUBitVector.h> #include <GPUType/moGPUBitVector.h>
// One Max neighbor // Bit neighbor
#include <neighborhood/moGPUBitNeighbor.h> #include <neighborhood/moGPUBitNeighbor.h>
// One Max ordered neighborhood // Ordered neighborhood
#include <neighborhood/moGPUOrderNeighborhoodByModif.h> #include <neighborhood/moGPUOrderNeighborhoodByModif.h>
// The Solution and neighbor comparator // The Solution and neighbor comparator
#include <comparator/moNeighborComparator.h> #include <comparator/moNeighborComparator.h>
@ -69,7 +70,7 @@ using namespace std;
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------
// Define types of the representation solution, different neighbors and neighborhoods // Define types of the representation solution, different neighbors and neighborhoods
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------
// REPRESENTATION
typedef moGPUBitVector<eoMaximizingFitness> solution; typedef moGPUBitVector<eoMaximizingFitness> solution;
typedef moGPUBitNeighbor <eoMaximizingFitness> Neighbor; typedef moGPUBitNeighbor <eoMaximizingFitness> Neighbor;
typedef moGPUOrderNeighborhoodByModif<Neighbor> Neighborhood; typedef moGPUOrderNeighborhoodByModif<Neighbor> Neighborhood;
@ -93,16 +94,6 @@ void main_function(int argc, char **argv)
parser.processParam( seedParam ); parser.processParam( seedParam );
unsigned seed = seedParam.value(); unsigned seed = seedParam.value();
// description of genotype
eoValueParam<unsigned int> vecSizeParam(1, "vecSize", "Genotype size", 'V');
parser.processParam( vecSizeParam, "Representation" );
unsigned vecSize = vecSizeParam.value();
//Number of position to change
eoValueParam<unsigned int> nbPosParam(1, "nbPos", "X Change", 'N');
parser.processParam( nbPosParam, "Exchange" );
unsigned nbPos = nbPosParam.value();
// the name of the "status" file where all actual parameter values will be saved // the name of the "status" file where all actual parameter values will be saved
string str_status = parser.ProgramName() + ".status"; // default value string str_status = parser.ProgramName() + ".status"; // default value
eoValueParam<string> statusParam(str_status.c_str(), "status", "Status file"); eoValueParam<string> statusParam(str_status.c_str(), "status", "Status file");
@ -135,7 +126,7 @@ void main_function(int argc, char **argv)
* *
* ========================================================= */ * ========================================================= */
solution sol(vecSize); solution sol(SIZE);
/* ========================================================= /* =========================================================
* *
@ -152,7 +143,7 @@ void main_function(int argc, char **argv)
* ========================================================= */ * ========================================================= */
OneMaxIncrEval<Neighbor> incr_eval; OneMaxIncrEval<Neighbor> incr_eval;
moGPUEvalByModif<Neighbor,OneMaxIncrEval<Neighbor> > cueval(vecSize,incr_eval); moGPUEvalByModif<Neighbor,OneMaxIncrEval<Neighbor> > gpuEval(SIZE,incr_eval);
/* ========================================================= /* =========================================================
* *
@ -169,7 +160,7 @@ void main_function(int argc, char **argv)
* *
* ========================================================= */ * ========================================================= */
Neighborhood neighborhood(vecSize,cueval); Neighborhood neighborhood(SIZE,gpuEval);
/* ========================================================= /* =========================================================
* *
@ -177,7 +168,7 @@ void main_function(int argc, char **argv)
* *
* ========================================================= */ * ========================================================= */
moFirstImprHCexplorer<Neighbor> explorer(neighborhood, cueval, comparator, solComparator); moFirstImprHCexplorer<Neighbor> explorer(neighborhood, gpuEval, comparator, solComparator);
/* ========================================================= /* =========================================================
@ -197,7 +188,7 @@ void main_function(int argc, char **argv)
* *
* ========================================================= */ * ========================================================= */
moFirstImprHC<Neighbor> firstImprHC(neighborhood,eval,cueval); moFirstImprHC<Neighbor> firstImprHC(neighborhood,eval,gpuEval);
/* ========================================================= /* =========================================================
* *
@ -214,7 +205,7 @@ void main_function(int argc, char **argv)
localSearch(sol); localSearch(sol);
timer.stop(); timer.stop();
std::cout << "final: " << sol << std::endl; std::cout << "final: " << sol << std::endl;
printf("CUDA execution time = %f ms\n",timer.getTime()); printf("GPU execution time = %f ms\n",timer.getTime());
timer.deleteTimer(); timer.deleteTimer();
/* ========================================================= /* =========================================================
@ -223,7 +214,7 @@ void main_function(int argc, char **argv)
* *
* ========================================================= */ * ========================================================= */
solution sol1(vecSize); solution sol1(SIZE);
eval(sol1); eval(sol1);
std::cout<< std::endl; std::cout<< std::endl;
std::cout << "initial: " << sol1<< std::endl; std::cout << "initial: " << sol1<< std::endl;