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

Essai du nouveau "modele"

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1655 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-01-20 09:43:06 +00:00
commit c3085595bf
13 changed files with 85 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

25
branches/newMo/tutorial/oneMax/application/testSimpleHC.cpp
View file

@ -40,17 +40,20 @@ using namespace std;
// explore the neighborhood of a bit string in order
#include <neighborhood/moBitNeighborhood.h>
#include <eval/moFullEvalBitNeighbor.h>
#include <eval/moFullEvalByModif.h>
#include <oneMaxBitNeighbor.h>
#include <comparator/moNeighborComparator.h>
// REPRESENTATION
//-----------------------------------------------------------------------------
// define your individuals
typedef eoBit<unsigned> Indi;
//typedef OneMaxBitNeighbor<unsigned> Neighbor ; // incremental evaluation
typedef moFullEvalBitNeighbor<unsigned> Neighbor ; // full evaluation
typedef moBitNeighborhood<Neighbor> Neighborhood ;
//typedef moFullEvalBitNeighbor<unsigned> Neighbor ; // full evaluation
//typedef moBitNeighborhood<Neighbor> Neighborhood ;
// GENERAL
//-----------------------------------------------------------------------------
@ -121,6 +124,8 @@ void main_function(int argc, char **argv)
FuncOneMax<Indi> eval(vecSize);
moFullEvalByModif<moBitNeighbor<unsigned int> > fulleval(eval);
/* =========================================================
*
* Initilisation of the solution
@ -138,7 +143,7 @@ void main_function(int argc, char **argv)
* ========================================================= */
// no need if incremental evaluation with OneMaxBitNeighbor
Neighbor::setFullEvalFunc(eval);
// Neighbor::setFullEvalFunc(eval);
/* =========================================================
*
@ -146,7 +151,9 @@ void main_function(int argc, char **argv)
*
* ========================================================= */
Neighborhood neighborhood;
moNeighborComparator<moBitNeighbor<unsigned int> > comparator;
moBitNeighborhood<moBitNeighbor<unsigned int> > neighborhood ;
/* =========================================================
*
@ -154,7 +161,7 @@ void main_function(int argc, char **argv)
*
* ========================================================= */
moSimpleHCexplorer<Neighborhood> explorer(neighborhood);
moSimpleHCexplorer<moBitNeighborhood<moBitNeighbor<unsigned int> > > explorer(neighborhood, fulleval, comparator);
/* =========================================================
*
@ -162,9 +169,9 @@ void main_function(int argc, char **argv)
*
* ========================================================= */
moTrueContinuator<Neighborhood> continuator;
moTrueContinuator<moBitNeighborhood<moBitNeighbor<unsigned int> > > continuator;
moLocalSearch< moSimpleHCexplorer<Neighborhood>, moTrueContinuator<Neighborhood> > localSearch(explorer, continuator);
moLocalSearch< moSimpleHCexplorer<moBitNeighborhood<moBitNeighbor<unsigned int> > >, moTrueContinuator<moBitNeighborhood<moBitNeighbor<unsigned int> > > > localSearch(explorer, continuator);
/* =========================================================
*
@ -180,7 +187,7 @@ void main_function(int argc, char **argv)
std::cout << "initial: " << solution << std::endl ;
localSearch(solution);
localSearch(solution);
std::cout << "final: " << solution << std::endl ;