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

Add problems directory and rename SimpleHCneutralExplorer in RamdomBestHCExplorer

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1735 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-04-08 14:48:26 +00:00
commit 4819120e6c
21 changed files with 43 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/paradiseo-mo/tutorial/oneMax/application/CMakeLists.txt
View file

@ -7,7 +7,7 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib)
ADD_EXECUTABLE(testSimpleHC testSimpleHC.cpp)
ADD_EXECUTABLE(testFirstImpr testFirstImpr.cpp)
ADD_EXECUTABLE(testRandomWalk testRandomWalk.cpp)
ADD_EXECUTABLE(testSimpleHCneutral testSimpleHCneutral.cpp)
ADD_EXECUTABLE(testRandomBestHC testRandomBestHC.cpp)
ADD_EXECUTABLE(testHCneutral testHCneutral.cpp)
ADD_EXECUTABLE(testMetropolisHasting testMetropolisHasting.cpp)
#ADD_EXECUTABLE(testWithMove testWithMove.cpp)
@ -19,7 +19,7 @@ ADD_EXECUTABLE(testSimulatedAnnealing testSimulatedAnnealing.cpp)
TARGET_LINK_LIBRARIES(testSimpleHC eoutils ga eo)
TARGET_LINK_LIBRARIES(testFirstImpr eoutils ga eo)
TARGET_LINK_LIBRARIES(testRandomWalk eoutils ga eo)
TARGET_LINK_LIBRARIES(testSimpleHCneutral eoutils ga eo)
TARGET_LINK_LIBRARIES(testRandomBestHC eoutils ga eo)
TARGET_LINK_LIBRARIES(testHCneutral eoutils ga eo)
TARGET_LINK_LIBRARIES(testMetropolisHasting eoutils ga eo)
#TARGET_LINK_LIBRARIES(testWithMove eoutils ga eo)

4
trunk/paradiseo-mo/tutorial/oneMax/application/testILS.cpp
View file

@ -194,9 +194,9 @@ void main_function(int argc, char **argv)
moILSexplorer< Neighbor > explorerILS(hc, perturb, accept);
moIterContinuator<moDummyNeighbor<Indi, Indi::Fitness> > continuatorILS(100);
moIterContinuator<moDummyNeighbor<Indi> > continuatorILS(100);
moLocalSearch<moDummyNeighbor<Indi, Indi::Fitness> >localSearch(explorerILS, continuatorILS, eval);
moLocalSearch<moDummyNeighbor<Indi> >localSearch(explorerILS, continuatorILS, eval);
/* =========================================================

6
trunk/paradiseo-mo/tutorial/oneMax/application/testSimpleHCneutral.cpp → trunk/paradiseo-mo/tutorial/oneMax/application/testRandomBestHC.cpp
View file

@ -1,5 +1,5 @@
//-----------------------------------------------------------------------------
/** testSimpleHCneutral.cpp
/** testRandomBestHC.cpp
*
* SV - 24/01/10
*
@ -34,7 +34,7 @@ using namespace std;
#include <comparator/moSolNeighborComparator.h>
#include <continuator/moTrueContinuator.h>
#include <algo/moLocalSearch.h>
#include <explorer/moSimpleHCneutralExplorer.h>
#include <explorer/moRandomBestHCExplorer.h>
// REPRESENTATION
//-----------------------------------------------------------------------------
@ -149,7 +149,7 @@ void main_function(int argc, char **argv)
*
* ========================================================= */
moSimpleHCneutralExplorer<Neighbor> explorer(neighborhood, fulleval, comparator, solComparator);
moRandomBestHCExplorer<Neighbor> explorer(neighborhood, fulleval, comparator, solComparator);
/* =========================================================

2
trunk/paradiseo-mo/tutorial/oneMax/application/testRandomNeutralWalk.cpp
View file

@ -26,7 +26,7 @@ using namespace std;
#include <funcRoyalRoad.h>
#include <eoInt.h>
#include <neighborhood/moRndWithoutReplNeighborhood.h>
#include <neighborhood/moBitNeighbor.h>
#include <problems/bitString/moBitNeighbor.h>
#include <eval/moFullEvalByModif.h>
#include <eval/moFullEvalByCopy.h>

2
trunk/paradiseo-mo/tutorial/oneMax/src/oneMaxBitNeighbor.h
View file

@ -1,7 +1,7 @@
#ifndef _oneMaxBitNeighbor_h
#define _oneMaxBitNeighbor_h
#include <neighborhood/moBitNeighbor.h>
#include <problems/bitString/moBitNeighbor.h>
#include <ga.h>
/*