From 0ece491d558c9d2fa257898f28ecaf1538debf63 Mon Sep 17 00:00:00 2001 From: boufaras Date: Wed, 11 Jan 2012 10:08:21 +0000 Subject: [PATCH] UPDATE SRC FOR NEW VERSION git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2615 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-mo/test/moTestClass.h | 27 --- .../test/t-moNeighborhoodSizeUtils.cpp | 57 ------ .../test/t-moXBitFlippingNeighbor.cpp | 132 ------------- .../paradiseo-mo/test/t-moXChangeNeighbor.cpp | 88 --------- .../test/t-moXChangeNeighborhood.cpp | 178 ------------------ trunk/paradiseo-mo/test/t-moXSwapNeighbor.cpp | 120 ------------ 6 files changed, 602 deletions(-) delete mode 100755 trunk/paradiseo-mo/test/t-moNeighborhoodSizeUtils.cpp delete mode 100644 trunk/paradiseo-mo/test/t-moXBitFlippingNeighbor.cpp delete mode 100644 trunk/paradiseo-mo/test/t-moXChangeNeighbor.cpp delete mode 100644 trunk/paradiseo-mo/test/t-moXChangeNeighborhood.cpp delete mode 100644 trunk/paradiseo-mo/test/t-moXSwapNeighbor.cpp diff --git a/trunk/paradiseo-mo/test/moTestClass.h b/trunk/paradiseo-mo/test/moTestClass.h index 4ca3f10ec..a04a42272 100644 --- a/trunk/paradiseo-mo/test/moTestClass.h +++ b/trunk/paradiseo-mo/test/moTestClass.h @@ -53,7 +53,6 @@ #include #include -#include typedef eoBit bitVector; typedef moBitNeighbor bitNeighbor; @@ -84,32 +83,6 @@ public: } }; -template < class EOT> -class XChangeNeighborDummy: public moXChangeNeighbor { -public: - - XChangeNeighborDummy() : - moXChangeNeighbor () { - - } - - /** - * Constructor - * @param _xChange the number of x-change to do - */ - - XChangeNeighborDummy(unsigned int _xChange) : - moXChangeNeighbor (_xChange) { - } - /** - * Move a solution - * @param _solution the related solution - */ - void move(EOT & _solution) { - - } -}; - class moDummyNeighborhoodTest: public moNeighborhood { public: typedef moDummyNeighborTest Neighbor; diff --git a/trunk/paradiseo-mo/test/t-moNeighborhoodSizeUtils.cpp b/trunk/paradiseo-mo/test/t-moNeighborhoodSizeUtils.cpp deleted file mode 100755 index 67c36bf91..000000000 --- a/trunk/paradiseo-mo/test/t-moNeighborhoodSizeUtils.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - - Boufaras Karima, Thé Van Luong - - 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. - - ParadisEO WebSite : http://paradiseo.gforge.inria.fr - Contact: paradiseo-help@lists.gforge.inria.fr - */ - -#include -#include -#include -#include - -int main() { - - std::cout << "[t-moNeighborhoodSizeUtils] => START" << std::endl; - - //test factorial - int fact; - fact = factorial(5); - assert(fact == (5 * 4 * 3 * 2 * 1)); - - //test Size of Mapping - int sizeMap = sizeMapping(5, 1); - assert(sizeMap == 5); - - sizeMap = sizeMapping(5, 2); - assert(sizeMap == 10); - - sizeMap = sizeMapping(6, 3); - assert(sizeMap == 20); - - std::cout << "[t-moNeighborhoodSizeUtils] => OK" << std::endl; - - return EXIT_SUCCESS; -} diff --git a/trunk/paradiseo-mo/test/t-moXBitFlippingNeighbor.cpp b/trunk/paradiseo-mo/test/t-moXBitFlippingNeighbor.cpp deleted file mode 100644 index 8a40cd2aa..000000000 --- a/trunk/paradiseo-mo/test/t-moXBitFlippingNeighbor.cpp +++ /dev/null @@ -1,132 +0,0 @@ -/* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - - Karima Boufaras, Thé Van LUONG - - 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 -#include -#include -#include -#include - -typedef eoBit Solution; -typedef moXBitFlippingNeighbor Neighbor; - -int main() { - - std::cout << "[t-moXBitFlippingNeighbor] => START" << std::endl; - - Solution sol(5, 0); - for (int i = 0; i < 5; i++) { - sol[i] = (i % 2 == 0) ? 0 : 1; - } - - assert(sol[0] == 0); - assert(sol[1] == 1); - assert(sol[2] == 0); - assert(sol[3] == 1); - assert(sol[4] == 0); - - //test constructor - Neighbor neighbor; - assert(neighbor.index() == 0); - //test x-change getter - assert(neighbor.getXChange() == 0); - - //test x-change setter - neighbor.setXChange(2); - assert(neighbor.getXChange() == 2); - - //test index setter - for (unsigned int i = 0; i < neighbor.getXChange(); i++) - neighbor.setIndice(i, i); - - //test index getter - for (unsigned int i = 0; i < neighbor.getXChange(); i++) - assert(neighbor.getIndice(i) == i); - - //test move - neighbor.move(sol); - assert(sol[neighbor.getIndice(0)] == 1); - assert(sol[neighbor.getIndice(1)] == 0); - - //test moveBack - neighbor.moveBack(sol); - assert(sol[neighbor.getIndice(0)] == 0); - assert(sol[neighbor.getIndice(1)] == 1); - - //test set & get indice - neighbor.setIndice(0, 1); - neighbor.setIndice(1, 2); - assert(neighbor.getIndice(0) == 1); - assert(neighbor.getIndice(1) == 2); - - //test move - neighbor.move(sol); - assert(sol[neighbor.getIndice(0)] == 0); - assert(sol[neighbor.getIndice(1)] == 1); - - //test move back - neighbor.moveBack(sol); - assert(sol[neighbor.getIndice(0)] == 1); - assert(sol[neighbor.getIndice(1)] == 0); - - Neighbor neighbor1(3); - - //test setter of one index - neighbor1.setIndice(0, 2); - neighbor1.setIndice(1, 3); - neighbor1.setIndice(2, 4); - - //test getter of one index - assert(neighbor1.getIndice(0) == 2); - assert(neighbor1.getIndice(1) == 3); - assert(neighbor1.getIndice(2) == 4); - - //test move - neighbor1.move(sol); - assert(sol[neighbor1.getIndice(0)] == 1); - assert(sol[neighbor1.getIndice(1)] == 0); - assert(sol[neighbor1.getIndice(2)] == 1); - - //test moveBack - neighbor1.moveBack(sol); - assert(sol[neighbor1.getIndice(0)] == 0); - assert(sol[neighbor1.getIndice(1)] == 1); - assert(sol[neighbor1.getIndice(2)] == 0); - - std::cout << "[t-moXBitFlippingNeighbor] => OK" << std::endl; - - return EXIT_SUCCESS; -} - diff --git a/trunk/paradiseo-mo/test/t-moXChangeNeighbor.cpp b/trunk/paradiseo-mo/test/t-moXChangeNeighbor.cpp deleted file mode 100644 index 48937a9c4..000000000 --- a/trunk/paradiseo-mo/test/t-moXChangeNeighbor.cpp +++ /dev/null @@ -1,88 +0,0 @@ -/* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - - Boufaras Karima, Thé Van Luong - - 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. - - ParadisEO WebSite : http://paradiseo.gforge.inria.fr - Contact: paradiseo-help@lists.gforge.inria.fr - */ - -#include -#include -#include -#include -#include -#include - -typedef eoInt Sol; -typedef XChangeNeighborDummy Neighbor; - -int main() { - - std::cout << "[t-moXChangeNeighbor] => START" << std::endl; - - //test default constructor - Neighbor neighbor0; - assert(neighbor0.index() == 0); - assert(neighbor0.getXChange() == 0); - - //test constructor - Neighbor neighbor(5); - assert(neighbor.index() == 0); - assert(neighbor.getXChange() == 5); - - //test setter & getter of one index - for (unsigned int i = 0; i < neighbor.getXChange(); i++) - neighbor.setIndice(i, i); - - for (unsigned int i = 0; i < neighbor.getXChange(); i++) - assert(neighbor.getIndice(i) == i); - - //test copy Constructor - Neighbor neighbor1(neighbor); - assert(neighbor1.index() == 0); - assert(neighbor1.getXChange() == 5); - for (unsigned int i = 0; i < neighbor1.getXChange(); i++) - assert(neighbor1.getIndice(i) == i); - - //test assignement operator - - for (unsigned int i = 0; i < neighbor1.getXChange(); i++) - neighbor1.setIndice(i, 0); - - Neighbor neighbor2(2); - - //test setter of one index - neighbor2.setIndice(0, 0); - neighbor2.setIndice(1, 1); - neighbor2.setIndice(2, 2); - - //test getter of one index - assert(neighbor2.getIndice(0) == 0); - assert(neighbor2.getIndice(1) == 1); - assert(neighbor2.getIndice(2) == 2); - - std::cout << "[t-moXChangeNeighbor] => OK" << std::endl; - - return EXIT_SUCCESS; -} diff --git a/trunk/paradiseo-mo/test/t-moXChangeNeighborhood.cpp b/trunk/paradiseo-mo/test/t-moXChangeNeighborhood.cpp deleted file mode 100644 index c9f469892..000000000 --- a/trunk/paradiseo-mo/test/t-moXChangeNeighborhood.cpp +++ /dev/null @@ -1,178 +0,0 @@ -/* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - - Karima Boufaras, Thé Van LUONG - - 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 -#include -#include -#include -#include -#include -#include - -typedef eoInt Solution; -typedef moXSwapNeighbor Neighbor; -typedef moXChangeNeighborhood Neighborhood; - -int main() { - - std::cout << "[t-moXChangeNeighborhood] => START" << std::endl; - - //test factorial - assert(factorial(10) == 3628800); - - //test sizeMapping - assert(sizeMapping(6, 1) == 6); - assert(sizeMapping(6, 2) == 15); - assert(sizeMapping(6, 3) == 20); - assert(sizeMapping(6, 4) == 15); - assert(sizeMapping(6, 5) == 6); - - Solution sol(6); - Neighbor neighbor(2); - Neighbor neighbor1; - - unsigned int * first; - unsigned int * second; - unsigned int * third; - unsigned int * forth; - - first = new unsigned int[15]; - second = new unsigned int[15]; - third = new unsigned int[15]; - forth = new unsigned int[15]; - - unsigned int id = 0; - for (unsigned int i = 0; i < 5; i++) - for (unsigned int j = i + 1; j < 6; j++) { - first[id] = i; - second[id] = j; - id++; - } - - //test Constructor - Neighborhood neighborhood(15, 2); - //test x-change getter - assert(neighborhood.getXChange() == 2); - //test neighborhoodSize getter - assert(neighborhood.getNeighborhoodSize() == 15); - //test current index getter - assert(neighborhood.position() == 0); - - //test neighborhood methods - - //test hasNeighbor - assert(neighborhood.hasNeighbor(sol) == true); - - //test init - neighborhood.init(sol, neighbor); - assert(neighbor.index() == 0); - assert(neighbor.getXChange() == 2); - assert(neighborhood.position() == 0); - - //test Mapping - assert(neighbor.getIndice(0) == first[neighborhood.position()]); - assert(neighbor.getIndice(1) == second[neighborhood.position()]); - - //test next & cont - unsigned i = 1; - while (neighborhood.cont(sol)) { - neighborhood.next(sol, neighbor); - assert(neighborhood.position() == i); - //test Mapping - assert(neighbor.getIndice(0) == first[neighborhood.position()]); - assert(neighbor.getIndice(1) == second[neighborhood.position()]); - i++; - } - - id = 0; - for (unsigned int i = 0; i < 3; i++) - for (unsigned int j = i + 1; j < 4; j++) - for (unsigned int k = j + 1; k < 5; k++) - for (unsigned int l = k + 1; l < 6; l++) { - first[id] = i; - second[id] = j; - third[id] = k; - forth[id] = l; - id++; - } - - //test Constructor - Neighborhood neighborhood1(15, 4); - //test x-change getter - assert(neighborhood1.getXChange() == 4); - //test neighborhood1Size getter - assert(neighborhood1.getNeighborhoodSize() == 15); - //test current index getter - assert(neighborhood1.position() == 0); - - //test neighborhood methods - - //test hasNeighbor - assert(neighborhood1.hasNeighbor(sol) == true); - - //test init - neighborhood1.init(sol, neighbor1); - assert(neighbor1.index() == 0); - assert(neighbor1.getXChange() == 4); - assert(neighborhood1.position() == 0); - - //test Mapping - assert(neighbor1.getIndice(0) == first[neighborhood1.position()]); - assert(neighbor1.getIndice(1) == second[neighborhood1.position()]); - assert(neighbor1.getIndice(2) == third[neighborhood1.position()]); - assert(neighbor1.getIndice(3) == forth[neighborhood1.position()]); - - //test next & cont - i = 1; - while (neighborhood.cont(sol)) { - neighborhood.next(sol, neighbor1); - assert(neighborhood.position() == i); - //test Mapping - assert(neighbor1.getIndice(0) == first[neighborhood1.position()]); - assert(neighbor1.getIndice(1) == second[neighborhood1.position()]); - assert(neighbor1.getIndice(2) == third[neighborhood1.position()]); - assert(neighbor1.getIndice(3) == forth[neighborhood1.position()]); - i++; - } - - delete[] (first); - delete[] (second); - delete[] (third); - delete[] (forth); - std::cout << "[t-moXChangeNeighborhood] => OK" << std::endl; - - return EXIT_SUCCESS; -} - diff --git a/trunk/paradiseo-mo/test/t-moXSwapNeighbor.cpp b/trunk/paradiseo-mo/test/t-moXSwapNeighbor.cpp deleted file mode 100644 index 8507238fd..000000000 --- a/trunk/paradiseo-mo/test/t-moXSwapNeighbor.cpp +++ /dev/null @@ -1,120 +0,0 @@ -/* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - - Karima Boufaras, Thé Van LUONG - - 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 -#include -#include -#include -#include - -typedef eoInt Solution; -typedef moXSwapNeighbor Neighbor; - -int main() { - - std::cout << "[t-moXSwapNeighbor] => START" << std::endl; - - Solution sol1(5); - for (int i = 4; i >=0; i--) - sol1[4-i] = i; - - //test constructor - Neighbor neighbor(2); - assert(neighbor.index() == 0); - assert(neighbor.getXChange() == 2); - - //test setter of one index - for (unsigned int i = 0; i < neighbor.getXChange(); i++) - neighbor.setIndice(i, i); - - //test getter of one index - for (unsigned int i = 0; i < neighbor.getXChange(); i++) - assert(neighbor.getIndice(i) == i); - - //test move - neighbor.move(sol1); - assert(sol1[neighbor.getIndice(0)] == 3); - assert(sol1[neighbor.getIndice(1)] == 4); - - //test moveBack - neighbor.moveBack(sol1); - assert(sol1[neighbor.getIndice(0)] == 4); - assert(sol1[neighbor.getIndice(1)] == 3); - - //test set & get indice - neighbor.setIndice(0, 1); - neighbor.setIndice(1, 2); - assert(neighbor.getIndice(0) == 1); - assert(neighbor.getIndice(1) == 2); - - //test move - neighbor.move(sol1); - assert(sol1[neighbor.getIndice(0)] == 2); - assert(sol1[neighbor.getIndice(1)] == 3); - - //test move back - neighbor.moveBack(sol1); - assert(sol1[neighbor.getIndice(0)] == 3); - assert(sol1[neighbor.getIndice(1)] == 2); - - Neighbor neighbor2(3); - - //test setter of one index - neighbor2.setIndice(0, 0); - neighbor2.setIndice(1, 1); - neighbor2.setIndice(2, 2); - - //test getter of one index - assert(neighbor2.getIndice(0) == 0); - assert(neighbor2.getIndice(1) == 1); - assert(neighbor2.getIndice(2) == 2); - - //test move - neighbor2.move(sol1); - assert(sol1[neighbor2.getIndice(0)] == 3); - assert(sol1[neighbor2.getIndice(1)] == 2); - assert(sol1[neighbor2.getIndice(2)] == 4); - - //test moveBack - neighbor2.moveBack(sol1); - assert(sol1[neighbor2.getIndice(0)] == 4); - assert(sol1[neighbor2.getIndice(1)] == 3); - assert(sol1[neighbor2.getIndice(2)] == 2); - - std::cout << "[t-moXSwapNeighbor] => OK" << std::endl; - - return EXIT_SUCCESS; -} -