Ajout des entetes et du test du simple HC explorer

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1667 331e1502-861f-0410-8da2-ba01fb791d7f

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")

branches/newMo/test/moTestClass.h

@@ -1,3 +1,37 @@
+/*
+  <moTestClass.h>
+  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 <eoEvalFunc.h>
 #include <neighborhood/moNeighbor.h>
 #include <neighborhood/moBackableNeighbor.h>
+#include <neighborhood/moNeighborhood.h>
 
 typedef EO<int> Solution;
 
@@ -19,6 +54,32 @@ public:
     virtual void moveBack(Solution & _solution){}
 };
 
+class moDummyNeighborhood : public moNeighborhood<moDummyNeighbor>{
+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<Solution>{
 public:
 	void operator()(Solution& _sol){

branches/newMo/test/t-moBitNeighbor.cpp

@@ -1,3 +1,37 @@
+/*
+  <t-moBitNeighborh.cpp>
+  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 <neighborhood/moBitNeighbor.h>
 
 #include <cstdlib>

branches/newMo/test/t-moBitNeighborhood.cpp

@@ -1,3 +1,37 @@
+/*
+  <t-moBitNeighborhood.cpp>
+  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 <neighborhood/moBitNeighborhood.h>
 
 #include <cstdlib>

branches/newMo/test/t-moFullEvalByCopy.cpp

@@ -1,3 +1,37 @@
+/*
+  <t-moFullEvalByCopy.cpp>
+  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 <eval/moFullEvalByCopy.h>
 

branches/newMo/test/t-moFullEvalByModif.cpp

@@ -1,3 +1,37 @@
+/*
+  <t-moFullEvalByModif.cpp>
+  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 <eval/moFullEvalByModif.h>
 

branches/newMo/test/t-moNeighbor.cpp

@@ -1,3 +1,37 @@
+/*
+  <t-moNeighbor.cpp>
+  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 <cstdlib>

branches/newMo/test/t-moSimpleHCexplorer.cpp

@@ -0,0 +1,88 @@
+/*
+  <t-moSimpleHCexplorer.cpp>
+  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 <eval/moFullEvalByCopy.h>
+#include <explorer/moSimpleHCexplorer.h>
+#include <comparator/moNeighborComparator.h>
+
+#include <cstdlib>
+#include <cassert>
+
+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<moDummyNeighbor> fulleval(eval);
+	moNeighborComparator<moDummyNeighbor> comp;
+
+	//verif constructor
+	moSimpleHCexplorer<moDummyNeighborhood> 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;
+}