diff --git a/branches/newMo/test/CMakeLists.txt b/branches/newMo/test/CMakeLists.txt index 4a6d8d8eb..292a01898 100644 --- a/branches/newMo/test/CMakeLists.txt +++ b/branches/newMo/test/CMakeLists.txt @@ -33,7 +33,8 @@ SET (TEST_LIST t-moBitNeighbor t-moBitNeighborhood t-moFullEvalByCopy - t-moFullEvalByModif) + t-moFullEvalByModif + t-moSimpleHCexplorer) FOREACH (test ${TEST_LIST}) SET ("T_${test}_SOURCES" "${test}.cpp") diff --git a/branches/newMo/test/moTestClass.h b/branches/newMo/test/moTestClass.h index ca08fb8f6..c97c5e94a 100644 --- a/branches/newMo/test/moTestClass.h +++ b/branches/newMo/test/moTestClass.h @@ -1,3 +1,37 @@ +/* + + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + + Sébastien Verel, Arnaud Liefooghe, Jérémie 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 +*/ + #ifndef _moTestClass_h #define _moTestClass_h @@ -5,6 +39,7 @@ #include #include #include +#include typedef EO Solution; @@ -19,6 +54,32 @@ public: virtual void moveBack(Solution & _solution){} }; +class moDummyNeighborhood : public moNeighborhood{ +public: + typedef moDummyNeighbor Neighbor; + + moDummyNeighborhood():i(0),j(0){} + + virtual bool hasNeighbor(EOT & _solution){ + bool res; + if(i%3==0) + res=false; + else + res=true; + i++; + return res; + } + virtual void init(EOT & _solution, Neighbor & _current){} + virtual void next(EOT & _solution, Neighbor & _current){} + virtual bool cont(EOT & _solution){ + j++; + return (j%10!=0); + } + +private: + int i,j; +}; + class moDummyEval: public eoEvalFunc{ public: void operator()(Solution& _sol){ diff --git a/branches/newMo/test/t-moBitNeighbor.cpp b/branches/newMo/test/t-moBitNeighbor.cpp index 363bc6ce6..ffc708c72 100644 --- a/branches/newMo/test/t-moBitNeighbor.cpp +++ b/branches/newMo/test/t-moBitNeighbor.cpp @@ -1,3 +1,37 @@ +/* + + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + + Sébastien Verel, Arnaud Liefooghe, Jérémie 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 +*/ + #include #include diff --git a/branches/newMo/test/t-moBitNeighborhood.cpp b/branches/newMo/test/t-moBitNeighborhood.cpp index ff6282c39..d38e0a9ee 100644 --- a/branches/newMo/test/t-moBitNeighborhood.cpp +++ b/branches/newMo/test/t-moBitNeighborhood.cpp @@ -1,3 +1,37 @@ +/* + + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + + Sébastien Verel, Arnaud Liefooghe, Jérémie 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 +*/ + #include #include diff --git a/branches/newMo/test/t-moFullEvalByCopy.cpp b/branches/newMo/test/t-moFullEvalByCopy.cpp index 126902f51..c2865a751 100644 --- a/branches/newMo/test/t-moFullEvalByCopy.cpp +++ b/branches/newMo/test/t-moFullEvalByCopy.cpp @@ -1,3 +1,37 @@ +/* + + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + + Sébastien Verel, Arnaud Liefooghe, Jérémie 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 +*/ + #include "moTestClass.h" #include diff --git a/branches/newMo/test/t-moFullEvalByModif.cpp b/branches/newMo/test/t-moFullEvalByModif.cpp index e7ac33ad5..0c71df098 100644 --- a/branches/newMo/test/t-moFullEvalByModif.cpp +++ b/branches/newMo/test/t-moFullEvalByModif.cpp @@ -1,3 +1,37 @@ +/* + + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + + Sébastien Verel, Arnaud Liefooghe, Jérémie 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 +*/ + #include "moTestClass.h" #include diff --git a/branches/newMo/test/t-moNeighbor.cpp b/branches/newMo/test/t-moNeighbor.cpp index 8f2e69961..60dc8d1b0 100644 --- a/branches/newMo/test/t-moNeighbor.cpp +++ b/branches/newMo/test/t-moNeighbor.cpp @@ -1,3 +1,37 @@ +/* + + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + + Sébastien Verel, Arnaud Liefooghe, Jérémie 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 +*/ + #include "moTestClass.h" #include diff --git a/branches/newMo/test/t-moSimpleHCexplorer.cpp b/branches/newMo/test/t-moSimpleHCexplorer.cpp new file mode 100644 index 000000000..7311daf2c --- /dev/null +++ b/branches/newMo/test/t-moSimpleHCexplorer.cpp @@ -0,0 +1,88 @@ +/* + + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + + Sébastien Verel, Arnaud Liefooghe, Jérémie 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 +*/ + +#include "moTestClass.h" +#include +#include +#include + +#include +#include + +int main(){ + + //Pas grand chose à faire: le gros du travail est fait par le voisin et l'eval + + std::cout << "[t-moSimpleHCexplorer] => START" << std::endl; + + Solution sol; + moDummyNeighbor neighbor; + moDummyEval eval; + moDummyNeighborhood nh; + moFullEvalByCopy fulleval(eval); + moNeighborComparator comp; + + //verif constructor + moSimpleHCexplorer test(nh, fulleval, comp); + + //verif operator() et accept: le neigorhood est construit pour qu'on tombe dans les 3 cas suivants: + //hasNeighbor() retourne faux a l'entrée de l'operator() donc on doit pas continuer + sol.fitness(3); + test(sol); + test.accept(sol); + assert(!test.isContinue(sol)); + + //hasNeighbor() retourne faux a l'entrée de accept() donc on doit pas continuer + test(sol); + test.accept(sol); + assert(!test.isContinue(sol)); + + //hasNeighbor() retourne vrai et on ameliore la fitness donc on doit continuer + test(sol); + test.accept(sol); + assert(test.isContinue(sol)); + + //verif de move -> on affecte la fitness du best d'avant + test.move(sol); + + //hasNeighbor() retourne vrai et on ameliore la pas fitness donc on doit pas continuer + test(sol); + test(sol); + test.accept(sol); + assert(!test.isContinue(sol)); + + std::cout << "[t-moSimpleHCexplorer] => OK" << std::endl; + + return EXIT_SUCCESS; +}