moMonOpDiversification.h + test added

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

trunk/paradiseo-mo/src/memory/moMonOpDiversification.h

@@ -0,0 +1,72 @@
+/*
+<moMonOpDiversification.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  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
+*/
+
+#ifndef _moMonOpDiversification_h
+#define _moMonOpDiversification_h
+
+
+#include <eoEvalFunc.h>
+#include <eoOp.h>
+#include <memory/moDiversification.h>
+#include <memory/moDummyMemory.h>
+
+/**
+ * Diversification strategy applies a "monOp" operator
+ */
+template< class Neighbor >
+class moMonOpDiversification : public moDiversification<Neighbor>, public moDummyMemory<Neighbor>
+{
+public:
+    typedef typename Neighbor::EOT EOT;
+
+	/**
+	 * Default Constructor
+	 * @param _monOp an eoMonOp (diversification operator)
+	 * @param _fullEval a full evaluation function
+	 */
+	moMonOpDiversification(eoMonOp<EOT>& _monOp, eoEvalFunc<EOT>& _fullEval):monOp(_monOp), fullEval(_fullEval){}
+
+	/**
+	 * Apply monOp on the solution
+	 * @param _solution to diversify
+	 * @return value of monOp
+	 */
+	bool operator()(EOT& _solution){
+		bool res = monOp(_solution);
+		fullEval(_solution);
+		return res;
+	}
+
+private:
+	/** monOp */
+	eoMonOp<EOT>& monOp;
+	eoEvalFunc<EOT>& fullEval;
+};
+
+#endif

trunk/paradiseo-mo/src/mo.h

@@ -100,6 +100,7 @@
 #include <memory/moNeighborVectorTabuList.h>
 #include <memory/moTabuList.h>
 #include <memory/moCountMoveMemory.h>
+#include <memory/moMonOpDiversification.h>
 
 #include <neighborhood/moBackableNeighbor.h>
 #include <neighborhood/moDummyNeighbor.h>

trunk/paradiseo-mo/test/CMakeLists.txt

@@ -79,6 +79,7 @@ SET (TEST_LIST
 		t-moFirstImprHC
 		t-moRandomBestHC
 		t-moNeighborVectorTabuList
+		t-moMonOpDiversification
 		)
 				
 FOREACH (test ${TEST_LIST})

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

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