diff --git a/contribution/branches/MOLS/test/CMakeLists.txt b/contribution/branches/MOLS/test/CMakeLists.txt index de4d030f2..658c4355f 100644 --- a/contribution/branches/MOLS/test/CMakeLists.txt +++ b/contribution/branches/MOLS/test/CMakeLists.txt @@ -3,6 +3,7 @@ SET (TEST_LIST t-moeoNumberUnvisitedSelect t-moeoExhaustiveNeighborhoodExplorer t-moeoSubNeighborhoodExplorer + t-moeoUnifiedDominanceBasedLS ) FOREACH (test ${TEST_LIST}) diff --git a/contribution/branches/MOLS/test/moeoTestClass.h b/contribution/branches/MOLS/test/moeoTestClass.h index b577339cb..6a3fd8e7c 100644 --- a/contribution/branches/MOLS/test/moeoTestClass.h +++ b/contribution/branches/MOLS/test/moeoTestClass.h @@ -24,6 +24,17 @@ typedef moeoRealObjectiveVector < ObjectiveVectorTraits > ObjectiveVector; typedef MOEO < ObjectiveVector, double, double > Solution; +class testEval : public eoEvalFunc +{ +public: + void operator()(Solution & _solution){ + ObjectiveVector objVec; + objVec[0]=500; + objVec[1]=0; + _solution.objectiveVector(objVec); + } +}; + class testMove : public moMove < Solution > { public : @@ -85,3 +96,39 @@ public : return objVec; } } ; + +class testMoveIncrEval2 : public moMoveIncrEval +{ +public : + + testMoveIncrEval2(unsigned int _counter=1):counter(_counter){}; + + ObjectiveVector operator () (const testMove & _move, const Solution & _solution) + { + ObjectiveVector objVec= _solution.objectiveVector(); + objVec[0]+=counter; + objVec[1]+=counter; + counter++; + return objVec; + } +private: + unsigned int counter; +} ; + +class testMoveIncrEval3 : public moMoveIncrEval +{ +public : + ObjectiveVector operator () (const testMove & _move, const Solution & _solution) + { + ObjectiveVector objVec= _solution.objectiveVector(); + if(objVec[0]>0) + objVec[0]--; + else + objVec[0]=500; + if(objVec[1]<500) + objVec[1]++; + else + objVec[1]=500; + return objVec; + } +} ; diff --git a/contribution/branches/MOLS/test/t-moeoUnifiedDominanceBasedLS.cpp b/contribution/branches/MOLS/test/t-moeoUnifiedDominanceBasedLS.cpp new file mode 100644 index 000000000..705686b7c --- /dev/null +++ b/contribution/branches/MOLS/test/t-moeoUnifiedDominanceBasedLS.cpp @@ -0,0 +1,99 @@ +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Lille-Nord Europe, 2006-2008 +* (C) OPAC Team, LIFL, 2002-2008 +* +* Arnaud Liefooghe +* Jeremie Humeau +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* +*/ +//----------------------------------------------------------------------------- +// t-moeoUnifiedDominanceBasedLS.cpp +//----------------------------------------------------------------------------- + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +//----------------------------------------------------------------------------- + +//----------------------------------------------------------------------------- + +int main() +{ + std::cout << "[moeoUnifiedDominanceBasedLS] => "; + + + + moeoExhaustiveUnvisitedSelect < Solution > select; + + testEval eval; + testMoveInit init; + testMoveNext next; + testMoveIncrEval2 incr; + testMoveIncrEval3 incr2; + moeoExhaustiveNeighborhoodExplorer < testMove > explorer(init, next, incr); + + moeoUnboundedArchive arch; + eoCtrlCContinue cont; + moeoUnifiedDominanceBasedLS algo(cont, eval, arch, explorer, select); + + // objective vectors + eoPop < Solution > pop; + pop.resize(2); + pop[0].flag(0); + pop[1].flag(0); + + algo(pop); + + assert(arch.size()==1); + assert(arch[0].flag()==1); + + arch.resize(0); + moeoExhaustiveNeighborhoodExplorer < testMove > explorer2(init, next, incr2); + moeoUnifiedDominanceBasedLS algo2(cont, eval, arch, explorer2, select); + algo2(pop); + assert(arch.size()==501); + assert(arch[0].objectiveVector()[0]==500); + assert(arch[0].objectiveVector()[1]==0); + assert(arch[500].objectiveVector()[1]==500); + assert(arch[500].objectiveVector()[0]==0); + + std::cout << "OK" << std::endl; + return EXIT_SUCCESS; +} + +//-----------------------------------------------------------------------------