test added

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

trunk/paradiseo-mo/test/CMakeLists.txt

@@ -72,6 +72,8 @@ SET (TEST_LIST
 		t-moNeighborhoodPerturb
 		t-moSAexplorer
 		t-moSA
+		t-moLocalSearch
+		t-moILSexplorer
 		)
 				
 FOREACH (test ${TEST_LIST})

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

@@ -31,9 +31,66 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <cstdlib>
 #include <cassert>
 
+#include <algo/moSimpleHC.h>
+#include "moTestClass.h"
+#include <problems/eval/oneMaxFullEval.h>
+#include <coolingSchedule/moSimpleCoolingSchedule.h>
+#include <continuator/moTrueContinuator.h>
+#include <comparator/moSolNeighborComparator.h>
+#include <explorer/moILSexplorer.h>
+#include <perturb/moMonOpPerturb.h>
+#include <acceptCrit/moAlwaysAcceptCrit.h>
+
+
+class dummyMonOp: public eoMonOp<bitVector>{
+
+	bool operator()(bitVector& _sol){
+		_sol[0]=!_sol[0];
+		return true;
+	}
+
+};
+
 int main(){
 
 	std::cout << "[t-moILSexplorer] => START" << std::endl;
+	bitNeighborhood nh(4);
+	oneMaxFullEval<bitVector> fullEval;
+	evalOneMax eval(4);
+
+	bitVector sol(4, true);
+	fullEval(sol);
+
+	//test first constructor
+	moSimpleHC<bitNeighbor> ls(nh, fullEval, eval);
+
+	dummyMonOp op;
+	moMonOpPerturb<bitNeighbor> perturb(op, fullEval);
+
+	moAlwaysAcceptCrit<bitNeighbor> accept;
+
+	moILSexplorer<bitNeighbor> test(ls, perturb, accept);
+
+	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(sol);
+	test.move(sol);
+
+	for(unsigned int i=0; i<sol.size(); i++)
+		assert(!sol[i]);
+	assert(sol.fitness()==0);
+
+	test(sol);
 
 
 	std::cout << "[t-moILSexplorer] => OK" << std::endl;

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

@@ -0,0 +1,70 @@
+/*
+<t-moLocalSearch.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 <algo/moLocalSearch.h>
+#include <explorer/moSimpleHCexplorer.h>
+#include <continuator/moTrueContinuator.h>
+#include <problems/eval/oneMaxFullEval.h>
+#include <comparator/moSolNeighborComparator.h>
+#include <comparator/moNeighborComparator.h>
+
+#include "moTestClass.h"
+
+int main(){
+
+	std::cout << "[t-moLocalSearch] => START" << std::endl;
+
+
+
+	bitNeighborhood nh(8);
+	oneMaxFullEval<bitVector> fullEval;
+	evalOneMax eval(8);
+	moTrueContinuator<bitNeighbor> cont;
+	moSolNeighborComparator<bitNeighbor> sncomp;
+	moNeighborComparator<bitNeighbor> ncomp;
+	moSimpleHCexplorer<bitNeighbor> explorer(nh, eval, ncomp, sncomp);
+	moLocalSearch<bitNeighbor> test(explorer, cont, fullEval);
+
+	bitVector sol(8, true);
+
+	test(sol);
+
+	assert(sol.fitness()==0);
+	for(unsigned int i=0; i<sol.size(); i++)
+		assert(!sol[i]);
+
+
+	std::cout << "[t-moLocalSearch] => OK" << std::endl;
+
+	return EXIT_SUCCESS;
+}
+