diff --git a/trunk/paradiseo-mo/test/t-moILSexplorer.cpp b/trunk/paradiseo-mo/test/t-moILSexplorer.cpp index fab42a797..ae86ac87c 100644 --- a/trunk/paradiseo-mo/test/t-moILSexplorer.cpp +++ b/trunk/paradiseo-mo/test/t-moILSexplorer.cpp @@ -1,31 +1,31 @@ /* - -Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 -Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau + 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 ue, -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". + This software is governed by the CeCILL license under French law and + abiding by the rules of distribution of free software. You can ue, + 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". -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. + 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 -*/ + ParadisEO WebSite : http://paradiseo.gforge.inria.fr + Contact: paradiseo-help@lists.gforge.inria.fr + */ #include #include @@ -41,60 +41,58 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include #include - class dummyMonOp: public eoMonOp { - bool operator()(bitVector& _sol) { - _sol[0]=!_sol[0]; - return true; - } + bool operator()(bitVector& _sol) { + _sol[0] = !_sol[0]; + return true; + } }; int main() { - std::cout << "[t-moILSexplorer] => START" << std::endl; - bitNeighborhood nh(4); - oneMaxEval fullEval; - evalOneMax eval(4); + std::cout << "[t-moILSexplorer] => START" << std::endl; + bitNeighborhood nh(4); + oneMaxEval fullEval; + evalOneMax eval(4); - bitVector sol(4, true); - fullEval(sol); + bitVector sol(4, true); + fullEval(sol); - //test first constructor - moSimpleHC ls(nh, fullEval, eval); + //test first constructor + moSimpleHC ls(nh, fullEval, eval); - dummyMonOp op; - moMonOpPerturb perturb(op, fullEval); + dummyMonOp op; + moMonOpPerturb perturb(op, fullEval); - moAlwaysAcceptCrit accept; + moAlwaysAcceptCrit accept; - moILSexplorer test(ls, perturb, accept); + moILSexplorer test(ls, perturb, accept); - assert(test.className()=="moILSexplorer"); - assert(test.isContinue(sol)); - assert(test.accept(sol)); + assert(test.className() == "moILSexplorer"); + assert(test.isContinue(sol)); + assert(test.accept(sol)); - test.initParam(sol); - test.moveApplied(true); - test.updateParam(sol); - test.moveApplied(false); - test.updateParam(sol); - test.terminate(sol); + test.initParam(sol); + test.moveApplied(true); + test.updateParam(sol); + test.moveApplied(false); + test.updateParam(sol); + test.terminate(sol); - test.initParam(sol); - test(sol); - test.move(sol); + test.initParam(sol); + test(sol); + test.move(sol); - for (unsigned int i=0; i OK" << std::endl; - std::cout << "[t-moILSexplorer] => OK" << std::endl; - - return EXIT_SUCCESS; + return EXIT_SUCCESS; }