diff --git a/contribution/branches/MOLS/test/CMakeLists.txt b/contribution/branches/MOLS/test/CMakeLists.txt index f126edf10..6b751fb3c 100644 --- a/contribution/branches/MOLS/test/CMakeLists.txt +++ b/contribution/branches/MOLS/test/CMakeLists.txt @@ -6,6 +6,8 @@ SET (TEST_LIST t-moeoFirstImprovingNeighborhoodExplorer t-moeoRecursiveFirstImprovingNeighborhoodExplorer t-moeoUnifiedDominanceBasedLS + t-moeoDMLSGenUpdater + t-moeoDMLSMonOp ) FOREACH (test ${TEST_LIST}) diff --git a/contribution/branches/MOLS/test/t-moeoDMLSGenUpdater.cpp b/contribution/branches/MOLS/test/t-moeoDMLSGenUpdater.cpp new file mode 100644 index 000000000..23b54af00 --- /dev/null +++ b/contribution/branches/MOLS/test/t-moeoDMLSGenUpdater.cpp @@ -0,0 +1,101 @@ +/* +* +* 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-moeoDMLSGenUpdater.cpp +//----------------------------------------------------------------------------- + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +//----------------------------------------------------------------------------- + +//----------------------------------------------------------------------------- + +int main() +{ + std::cout << "[moeoDMLSGenUpdater] => "; + + + + moeoExhaustiveUnvisitedSelect < Solution > select; + + testEval eval; + testMoveInit init; + testMoveNext next; + testMoveIncrEval2 incr; + testMoveIncrEval3 incr2; + moeoExhaustiveNeighborhoodExplorer < testMove > explorer(init, next, incr); + + moeoUnboundedArchive arch; + moeoUnboundedArchive arch2; + eoGenContinue cont(10); + moeoUnifiedDominanceBasedLS algo(cont, eval, arch, explorer, select); + + eoGenContinue < Solution > cont2(10); + + + moeoDMLSGenUpdater < testMove > updater(algo, arch, arch2, cont2); + + moeoDMLSGenUpdater < testMove > updater2(eval, explorer, select, arch2, cont2); + + moeoDMLSGenUpdater < testMove > updater3(eval, arch, explorer, select, arch2, cont2, 10, true); + + // objective vectors + eoPop pop; + for(unsigned int i=0;i<9; i++){ + updater(); + assert(cont2.value()==i+1); + } + updater(); + updater(); + std::cout << cont2.value(); + assert(cont2.value()==1); + + std::cout << "OK" << std::endl; + return EXIT_SUCCESS; +} + +//----------------------------------------------------------------------------- diff --git a/contribution/branches/MOLS/test/t-moeoDMLSMonOp.cpp b/contribution/branches/MOLS/test/t-moeoDMLSMonOp.cpp new file mode 100644 index 000000000..fcefd6e04 --- /dev/null +++ b/contribution/branches/MOLS/test/t-moeoDMLSMonOp.cpp @@ -0,0 +1,92 @@ +/* +* +* 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-moeoDMLSMonOp.cpp +//----------------------------------------------------------------------------- + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +//----------------------------------------------------------------------------- + +//----------------------------------------------------------------------------- + +int main() +{ + std::cout << "[moeoDMLSMonOp] => "; + + moeoExhaustiveUnvisitedSelect < Solution > select; + + testEval eval; + testMoveInit init; + testMoveNext next; + testMoveIncrEval2 incr; + testMoveIncrEval3 incr2; + moeoExhaustiveNeighborhoodExplorer < testMove > explorer(init, next, incr); + + moeoUnboundedArchive arch; + eoGenContinue cont(10); + moeoUnifiedDominanceBasedLS algo(cont, eval, arch, explorer, select); + + moeoDMLSMonOp < testMove > updater(algo, arch); + + moeoDMLSMonOp < testMove > updater2(eval, explorer, select); + + moeoDMLSMonOp < testMove > updater3(eval, arch, explorer, select, 10, true); + + // objective vectors + Solution moeo; + ObjectiveVector obj; + obj[0]=500; + obj[1]=500; + moeo.objectiveVector(obj); + updater(moeo); + + std::cout << "OK" << std::endl; + return EXIT_SUCCESS; +} + +//-----------------------------------------------------------------------------