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

trunk/paradiseo-mo/test/CMakeLists.txt

@@ -66,6 +66,9 @@ SET (TEST_LIST
 		t-moSimpleCoolingSchedule
 		t-moAlwaysAcceptCrit
 		t-moBetterAcceptCrit
+		t-moCountMoveMemory
+		t-moMonOpPerturb
+		t-moRestartPerturb
 		)
 				
 FOREACH (test ${TEST_LIST})

trunk/paradiseo-mo/test/t-moCountMoveMemory.cpp

@@ -0,0 +1,91 @@
+/*
+<t-moCountMoveMemory.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  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 <iostream>
+#include <cstdlib>
+#include <cassert>
+
+#include <memory/moCountMoveMemory.h>
+#include "moTestClass.h"
+
+int main(){
+
+	std::cout << "[t-moCountMoveMemory] => START" << std::endl;
+
+	bitVector sol;
+	bitNeighbor n;
+
+
+	moCountMoveMemory<bitNeighbor> test;
+
+	test.init(sol);
+	assert(test.getNbMove()==0);
+	assert(test.getNbNoMove()==0);
+	assert(test.getCounter()==0);
+
+	test.add(sol,n);
+	assert(test.getNbMove()==1);
+	assert(test.getNbNoMove()==0);
+	assert(test.getCounter()==0);
+
+	test.add(sol,n);
+	assert(test.getNbMove()==2);
+	assert(test.getNbNoMove()==0);
+	assert(test.getCounter()==0);
+
+	test.update(sol,n);
+	assert(test.getNbMove()==2);
+	assert(test.getNbNoMove()==1);
+	assert(test.getCounter()==1);
+
+	test.add(sol,n);
+	assert(test.getNbMove()==3);
+	assert(test.getNbNoMove()==1);
+	assert(test.getCounter()==0);
+
+	test.update(sol,n);
+	assert(test.getNbMove()==3);
+	assert(test.getNbNoMove()==2);
+	assert(test.getCounter()==1);
+
+	test.update(sol,n);
+	assert(test.getNbMove()==3);
+	assert(test.getNbNoMove()==3);
+	assert(test.getCounter()==2);
+
+	test.clearMemory();
+	assert(test.getNbMove()==0);
+	assert(test.getNbNoMove()==0);
+	assert(test.getCounter()==0);
+
+	std::cout << "[t-moCountMoveMemory] => OK" << std::endl;
+
+	return EXIT_SUCCESS;
+}
+

trunk/paradiseo-mo/test/t-moMonOpPerturb.cpp

@@ -0,0 +1,74 @@
+/*
+<t-moMonOpPerturb.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  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 <iostream>
+#include <cstdlib>
+#include <cassert>
+#include <eoOp.h>
+
+#include <perturb/moMonOpPerturb.h>
+#include "moTestClass.h"
+#include <problems/eval/oneMaxFullEval.h>
+
+
+class dummyMonOp: public eoMonOp<bitVector>{
+
+	bool operator()(bitVector& _sol){
+		_sol[0]=!_sol[0];
+		return true;
+	}
+
+};
+
+int main(){
+
+	std::cout << "[t-moMonOpPerturb] => START" << std::endl;
+
+	dummyMonOp op;
+	oneMaxFullEval<bitVector> eval;
+
+	bitVector sol;
+	sol.push_back(1);
+	sol.push_back(0);
+	sol.push_back(1);
+
+	sol.fitness(5);
+
+	moMonOpPerturb<bitNeighbor> test(op, eval);
+
+	test(sol);
+
+	assert(sol.fitness()==1);
+
+
+	std::cout << "[t-moMonOpPerturb] => OK" << std::endl;
+
+	return EXIT_SUCCESS;
+}
+

trunk/paradiseo-mo/test/t-moRestartPerturb.cpp

@@ -0,0 +1,43 @@
+/*
+<t-moRestartPerturb.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  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 <iostream>
+#include <cstdlib>
+#include <cassert>
+
+int main(){
+
+	std::cout << "[t-moRestartPerturb] => START" << std::endl;
+
+
+	std::cout << "[t-moRestartPerturb] => OK" << std::endl;
+
+	return EXIT_SUCCESS;
+}
+