VNSelection added

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

trunk/paradiseo-mo/src/explorer/moVNSexplorer.h

@@ -33,6 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <explorer/moNeighborhoodExplorer.h>
 #include <neighborhood/moVariableNeighborhoodSelection.h>
 #include <eoOp.h>
+#include <acceptCrit/moAcceptanceCriterion.h>
 
 /**
  * Explorer for Variiable Neighborhood Search

trunk/paradiseo-mo/src/mo.h

@@ -142,6 +142,10 @@
 #include <neighborhood/moRndWithoutReplNeighborhood.h>
 #include <neighborhood/moRndWithReplNeighborhood.h>
 #include <neighborhood/moVariableNeighborhoodSelection.h>
+#include <neighborhood/moVectorVNSelection.h>
+#include <neighborhood/moBackwardVectorVNSelection.h>
+#include <neighborhood/moForwardVectorVNSelection.h>
+#include <neighborhood/moRndVectorVNSelection.h>
 
 #include <perturb/moLocalSearchInit.h>
 #include <perturb/moMonOpPerturb.h>

trunk/paradiseo-mo/src/neighborhood/moBackwardVectorVNSelection.h

@@ -0,0 +1,86 @@
+/*
+<moBackwardVectorVNSelection.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 _moBackwardVectorVNSelection_h
+#define _moBackwardVectorVNSelection_h
+
+#include <neighborhood/moVectorVNSelection.h>
+
+template< class EOT >
+class moBackwardVectorVNSelection: public moVectorVNSelection<EOT>{
+
+	using moVectorVNSelection<EOT>::LSvector;
+	using moVectorVNSelection<EOT>::shakeVector;
+	using moVectorVNSelection<EOT>::current;
+
+public:
+
+	moBackwardVectorVNSelection(eoMonOp<EOT>& _firstLS, eoMonOp<EOT>& _firstShake, bool _cycle):moVectorVNSelection<EOT>(_firstLS, _firstShake), cycle(_cycle){}
+
+    /**
+     * Return the class id.
+     * @return the class name as a std::string
+     */
+    virtual std::string className() const {
+        return "moBackwardVectorVNSelection";
+    }
+
+    /**
+     * test if there is still some neighborhood to explore
+     * @return true if there is some neighborhood to explore
+     */
+    virtual bool cont(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){
+    	return (cycle || (current >0 ));
+    }
+
+    /**
+     * put the current neighborhood on the first one
+     */
+    virtual void init(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){
+    	current=LSvector.size()-1;
+    	_ls=LSvector[current];
+    	_shake = shakeVector[current];
+    }
+
+    /**
+     * put the current neighborhood on the next one
+     */
+    virtual void next(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){
+    	current= (current + LSvector.size() -1) % LSvector.size();
+    	_ls=LSvector[current];
+    	_shake = shakeVector[current];
+    }
+
+private:
+
+	bool cycle;
+
+};
+
+#endif

trunk/paradiseo-mo/src/neighborhood/moForwardVectorVNSelection.h

@@ -0,0 +1,86 @@
+/*
+<moForwardVectorVNSelection.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 _moForwardVectorVNSelection_h
+#define _moForwardVectorVNSelection_h
+
+#include <neighborhood/moVectorVNSelection.h>
+
+template< class EOT >
+class moForwardVectorVNSelection: public moVectorVNSelection<EOT>{
+
+	using moVectorVNSelection<EOT>::LSvector;
+	using moVectorVNSelection<EOT>::shakeVector;
+	using moVectorVNSelection<EOT>::current;
+
+public:
+
+	moForwardVectorVNSelection(eoMonOp<EOT>& _firstLS, eoMonOp<EOT>& _firstShake, bool _cycle):moVectorVNSelection<EOT>(_firstLS, _firstShake), cycle(_cycle){}
+
+    /**
+     * Return the class id.
+     * @return the class name as a std::string
+     */
+    virtual std::string className() const {
+        return "moForwardVectorVNSelection";
+    }
+
+    /**
+     * test if there is still some neighborhood to explore
+     * @return true if there is some neighborhood to explore
+     */
+    virtual bool cont(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){
+    	return (cycle || (current <= (LSvector.size()-2)));
+    }
+
+    /**
+     * put the current neighborhood on the first one
+     */
+    virtual void init(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){
+    	current=0;
+    	_ls = LSvector[current];
+    	_shake = shakeVector[current];
+    }
+
+    /**
+     * put the current neighborhood on the next one
+     */
+    virtual void next(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){
+    	current = (current+1) % LSvector.size();
+    	_ls = LSvector[current];
+    	_shake = shakeVector[current];
+    }
+
+private:
+
+	bool cycle;
+
+};
+
+#endif

trunk/paradiseo-mo/src/neighborhood/moRndVectorVNSelection.h

@@ -0,0 +1,96 @@
+/*
+<moRndVectorVNSelection.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 _moRndVectorVNSelection_h
+#define _moRndVectorVNSelection_h
+
+#include <utils/eoRndGenerators.h>
+#include <utils/rnd_generators.h>
+
+#include <neighborhood/moVectorVNSelection.h>
+
+template< class EOT >
+class moRndVectorVNSelection: public moVectorVNSelection<EOT>{
+
+	using moVectorVNSelection<EOT>::LSvector;
+	using moVectorVNSelection<EOT>::shakeVector;
+	using moVectorVNSelection<EOT>::current;
+
+public:
+
+	moRndVectorVNSelection(eoMonOp<EOT>& _firstLS, eoMonOp<EOT>& _firstShake, bool _cycle):moVectorVNSelection<EOT>(_firstLS, _firstShake), cycle(_cycle){}
+
+    /**
+     * Return the class id.
+     * @return the class name as a std::string
+     */
+    virtual std::string className() const {
+        return "moRndVectorVNSelection";
+    }
+
+    /**
+     * test if there is still some neighborhood to explore
+     * @return true if there is some neighborhood to explore
+     */
+    virtual bool cont(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){
+    	return (cycle || (current <= (LSvector.size()-2)));
+    }
+
+    /**
+     * put the current neighborhood on the first one
+     */
+    virtual void init(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){
+    	if(order.size()==0){
+    		for(unsigned int i=0; i<LSvector.size(); i++)
+    			order.push_back(i);
+    		std::random_shuffle(order.begin(), order.end(),gen);
+    	}
+    	current=0;
+    	_ls=LSvector[order[current]];
+    	_shake=shakeVector[order[current]];
+    }
+
+    /**
+     * put the current neighborhood on the next one
+     */
+    virtual void next(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){
+    	current= (current+1) % LSvector.size();
+    	_ls=LSvector[order[current]];
+    	_shake=shakeVector[order[current]];
+    }
+
+private:
+
+	bool cycle;
+	std::vector<unsigned int> order;
+	UF_random_generator<unsigned int> gen;
+
+};
+
+#endif

trunk/paradiseo-mo/src/neighborhood/moVectorVNSelection.h

@@ -0,0 +1,84 @@
+/*
+<moVectorVNSelection.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 _moVectorVNSelection_h
+#define _moVectorVNSelection_h
+
+#include <neighborhood/moVariableNeighborhoodSelection.h>
+#include <eoOp.h>
+
+template< class EOT >
+class moVectorVNSelection: public moVariableNeighborhoodSelection<EOT>{
+
+public:
+
+	moVectorVNSelection(eoMonOp<EOT>& _firstLS, eoMonOp<EOT>& _firstShake){
+		LSvector.push_back(&_firstLS);
+		shakeVector.push_back(&_firstShake);
+		current=0;
+	}
+
+	void addLS(eoMonOp<EOT>& _otherLS, eoMonOp<EOT>& _otherShake){
+		LSvector.push_back(&_otherLS);
+		shakeVector.push_back(&_otherShake);
+	}
+
+    /**
+     * Return the class id.
+     * @return the class name as a std::string
+     */
+    virtual std::string className() const {
+        return "moVectorVNSelection";
+    }
+
+    /**
+     * test if there is still some neighborhood to explore
+     * @return true if there is some neighborhood to explore
+     */
+    virtual bool cont(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls) = 0;
+
+    /**
+     * put the current neighborhood on the first one
+     */
+    virtual void init(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls) = 0;
+
+    /**
+     * put the current neighborhood on the next one
+     */
+    virtual void next(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls) = 0;
+
+protected:
+	std::vector<eoMonOp<EOT>* > LSvector;
+	std::vector<eoMonOp<EOT>* > shakeVector;
+	unsigned int current;
+
+};
+
+
+#endif

trunk/paradiseo-mo/tutorial/Lesson9/VNS.cpp

@@ -38,6 +38,10 @@ using namespace std;
 #include <neighborhood/moIndexNeighbor.h>
 #include <neighborhood/moRndWithoutReplNeighborhood.h>
 #include <neighborhood/moOrderNeighborhood.h>
+#include <explorer/moVNSexplorer.h>
+#include <neighborhood/moBackwardVectorVNSelection.h>
+#include <neighborhood/moForwardVectorVNSelection.h>
+#include <neighborhood/moRndVectorVNSelection.h>
 
 //Algorithm and its components
 #include <coolingSchedule/moCoolingSchedule.h>
@@ -149,33 +153,12 @@ void main_function(int argc, char **argv)
     shiftNeighborhood shiftNH((vecSize-1) * (vecSize-1));
     swapNeighborhood swapNH(100);
 
-    moForwardVariableNeighborhood< moIndexNeighbor<Queen> > varNH( dynamic_cast<moNeighborhood<moIndexNeighbor<Queen> > *>(&shiftNH));
-    varNH.add(dynamic_cast<moNeighborhood<moIndexNeighbor<Queen> > *>(&swapNH));
-
-    varNH.initNeighborhood();
 
     Queen sol;
 
     init(sol);
     shiftNeighbor n;
 
-    varNH.init(sol, n);
-
-	n.move(sol);
-
-    n.print();
-
-    varNH.next(sol, n);
-	n.move(sol);
-    n.print();
-
-    varNH.nextNeighborhood();
-
-    swapNeighbor n2;
-    varNH.init(sol, n2);
-    std::cout << "key: " << n2.index() << std::endl;
-    varNH.next(sol, n2);
-    std::cout << "key: " << n2.index() << std::endl;
 
     /* =========================================================
      *