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

nettoyage des #include

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1659 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-01-20 13:42:53 +00:00
commit 278c0e70ab
8 changed files with 15 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,37 +24,23 @@ using namespace std;
//-----------------------------------------------------------------------------
// fitness function
#include <funcOneMax.h>
#include <eoInt.h>
#include <neighborhood/moEmptyNeighbor.h>
#include <continuator/moTrueContinuator.h>
// local search algorithm
#include <algo/moLocalSearch.h>
// the simple HC explorer
#include <explorer/moSimpleHCexplorer.h>
// explore the neighborhood of a bit string in order
#include <neighborhood/moBitNeighborhood.h>
#include <oneMaxBitNeighbor.h>
#include <eval/moFullEvalByModif.h>
#include <eval/moFullEvalByCopy.h>
#include <oneMaxBitNeighbor.h>
#include <comparator/moNeighborComparator.h>
#include <continuator/moTrueContinuator.h>
#include <algo/moLocalSearch.h>
#include <explorer/moSimpleHCexplorer.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 moBitNeighbor<unsigned int> Neighbor ; // incremental evaluation
typedef moBitNeighborhood<Neighbor> Neighborhood ;
// GENERAL
//-----------------------------------------------------------------------------
@ -125,7 +111,7 @@ void main_function(int argc, char **argv)
FuncOneMax<Indi> eval(vecSize);
moFullEvalByCopy<moBitNeighbor<unsigned int> > fulleval(eval);
moFullEvalByCopy<Neighbor > fulleval(eval);
/* =========================================================
*
@ -152,9 +138,9 @@ void main_function(int argc, char **argv)
*
* ========================================================= */
moNeighborComparator<moBitNeighbor<unsigned int> > comparator;
moNeighborComparator<Neighbor > comparator;
moBitNeighborhood<moBitNeighbor<unsigned int> > neighborhood ;
Neighborhood neighborhood ;
/* =========================================================
*
@ -162,7 +148,7 @@ void main_function(int argc, char **argv)
*
* ========================================================= */
moSimpleHCexplorer<moBitNeighborhood<moBitNeighbor<unsigned int> > > explorer(neighborhood, fulleval, comparator);
moSimpleHCexplorer<Neighborhood> explorer(neighborhood, fulleval, comparator);
/* =========================================================
*
@ -170,9 +156,9 @@ void main_function(int argc, char **argv)
*
* ========================================================= */
moTrueContinuator<moBitNeighborhood<moBitNeighbor<unsigned int> > > continuator;
moTrueContinuator<Neighborhood> continuator;
moLocalSearch< moSimpleHCexplorer<moBitNeighborhood<moBitNeighbor<unsigned int> > >, moTrueContinuator<moBitNeighborhood<moBitNeighbor<unsigned int> > > > localSearch(explorer, continuator);
moLocalSearch< moSimpleHCexplorer<Neighborhood>, moTrueContinuator<Neighborhood> > localSearch(explorer, continuator);
/* =========================================================
*