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

changement a cause du deplacement des eval

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1760 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-04-29 10:15:25 +00:00
commit 5031737299
26 changed files with 44 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/paradiseo-mo/test/CMakeLists.txt
View file

@ -11,6 +11,7 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${PROBLEMS_SRC_DIR})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
######################################################################################

4
trunk/paradiseo-mo/test/t-moFirstImprHC.cpp
View file

@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <algo/moFirstImprHC.h>
#include "moTestClass.h"
#include <problems/eval/oneMaxFullEval.h>
#include <eval/oneMaxEval.h>
#include <continuator/moTrueContinuator.h>
#include <comparator/moSolNeighborComparator.h>
@ -42,7 +42,7 @@ int main(){
std::cout << "[t-moFirstImprHC] => START" << std::endl;
bitNeighborhood nh(4);
oneMaxFullEval<bitVector> fullEval;
oneMaxEval<bitVector> fullEval;
evalOneMax eval(4);
//test first constructor

4
trunk/paradiseo-mo/test/t-moILSexplorer.cpp
View file

@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <algo/moSimpleHC.h>
#include "moTestClass.h"
#include <problems/eval/oneMaxFullEval.h>
#include <eval/oneMaxEval.h>
#include <coolingSchedule/moSimpleCoolingSchedule.h>
#include <continuator/moTrueContinuator.h>
#include <comparator/moSolNeighborComparator.h>
@ -55,7 +55,7 @@ int main(){
std::cout << "[t-moILSexplorer] => START" << std::endl;
bitNeighborhood nh(4);
oneMaxFullEval<bitVector> fullEval;
oneMaxEval<bitVector> fullEval;
evalOneMax eval(4);
bitVector sol(4, true);

4
trunk/paradiseo-mo/test/t-moLocalSearch.cpp
View file

@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <algo/moLocalSearch.h>
#include <explorer/moSimpleHCexplorer.h>
#include <continuator/moTrueContinuator.h>
#include <problems/eval/oneMaxFullEval.h>
#include <eval/oneMaxEval.h>
#include <comparator/moSolNeighborComparator.h>
#include <comparator/moNeighborComparator.h>
@ -46,7 +46,7 @@ int main(){
bitNeighborhood nh(8);
oneMaxFullEval<bitVector> fullEval;
oneMaxEval<bitVector> fullEval;
evalOneMax eval(8);
moTrueContinuator<bitNeighbor> cont;
moSolNeighborComparator<bitNeighbor> sncomp;

4
trunk/paradiseo-mo/test/t-moMonOpPerturb.cpp
View file

@ -34,7 +34,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <perturb/moMonOpPerturb.h>
#include "moTestClass.h"
#include <problems/eval/oneMaxFullEval.h>
#include <eval/oneMaxEval.h>
class dummyMonOp: public eoMonOp<bitVector>{
@ -51,7 +51,7 @@ int main(){
std::cout << "[t-moMonOpPerturb] => START" << std::endl;
dummyMonOp op;
oneMaxFullEval<bitVector> eval;
oneMaxEval<bitVector> eval;
bitVector sol;
sol.push_back(1);

4
trunk/paradiseo-mo/test/t-moNeighborhoodPerturb.cpp
View file

@ -34,7 +34,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include "moTestClass.h"
#include <perturb/moNeighborhoodPerturb.h>
#include <problems/eval/oneMaxFullEval.h>
#include <eval/oneMaxEval.h>
#include <eval/moFullEvalByCopy.h>
typedef moOrderNeighborhood<bitNeighbor> Neighborhood;
@ -43,7 +43,7 @@ int main(){
std::cout << "[t-moNeighborhoodPerturb] => START" << std::endl;
oneMaxFullEval<bitVector> eval;
oneMaxEval<bitVector> eval;
moFullEvalByCopy<bitNeighbor> moeval(eval);

4
trunk/paradiseo-mo/test/t-moRandomBestHC.cpp
View file

@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <algo/moRandomBestHC.h>
#include "moTestClass.h"
#include <problems/eval/oneMaxFullEval.h>
#include <eval/oneMaxEval.h>
#include <continuator/moTrueContinuator.h>
#include <comparator/moSolNeighborComparator.h>
@ -42,7 +42,7 @@ int main(){
std::cout << "[t-moRandomBestHC] => START" << std::endl;
bitNeighborhood nh(4);
oneMaxFullEval<bitVector> fullEval;
oneMaxEval<bitVector> fullEval;
evalOneMax eval(4);
//test first constructor

4
trunk/paradiseo-mo/test/t-moRestartPerturb.cpp
View file

@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <perturb/moRestartPerturb.h>
#include <problems/permutation/moShiftNeighbor.h>
#include <problems/eval/queenFullEval.h>
#include <eval/queenEval.h>
#include <eoInt.h>
#include <eoInit.h>
@ -67,7 +67,7 @@ int main(){
dummyInit initializer(4);
queenFullEval<QUEEN> eval;
queenEval<QUEEN> eval;
moRestartPerturb<moShiftNeighbor<QUEEN> > test(initializer, eval, 3);

4
trunk/paradiseo-mo/test/t-moSA.cpp
View file

@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <algo/moSA.h>
#include "moTestClass.h"
#include <problems/eval/oneMaxFullEval.h>
#include <eval/oneMaxEval.h>
#include <coolingSchedule/moSimpleCoolingSchedule.h>
#include <continuator/moTrueContinuator.h>
#include <comparator/moSolNeighborComparator.h>
@ -43,7 +43,7 @@ int main(){
std::cout << "[t-moSA] => START" << std::endl;
bitNeighborhood nh(4);
oneMaxFullEval<bitVector> fullEval;
oneMaxEval<bitVector> fullEval;
evalOneMax eval(4);
//test first constructor

4
trunk/paradiseo-mo/test/t-moSimpleHC.cpp
View file

@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <algo/moSimpleHC.h>
#include "moTestClass.h"
#include <problems/eval/oneMaxFullEval.h>
#include <eval/oneMaxEval.h>
#include <continuator/moTrueContinuator.h>
#include <comparator/moSolNeighborComparator.h>
@ -43,7 +43,7 @@ int main(){
std::cout << "[t-moSimpleHC] => START" << std::endl;
bitNeighborhood nh(4);
oneMaxFullEval<bitVector> fullEval;
oneMaxEval<bitVector> fullEval;
evalOneMax eval(4);
//test first constructor