nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ForwardVNselect compile et semble marcher, mais pas moBackwardVNSelection...

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1928 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
verel 2010-08-29 09:21:37 +00:00
commit 107abf4434
4 changed files with 78 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

3
trunk/paradiseo-mo/src/explorer/moVNSexplorer.h
View file

@ -104,7 +104,8 @@ public:
shake(current); shake(current);
std::cout << "current apres shake: "<< current << std::endl; std::cout << "current apres shake: "<< current << std::endl;
ls(current); ls(current);
std::cout << "current apres ls: "<< ls.className() << " " << current << std::endl; std::cout << "current apres ls: "<< ls.className() ;
std::cout << " sol: " << current << std::endl;
} }
/** /**

19
trunk/paradiseo-mo/src/neighborhood/moBackwardVectorVNSelection.h
View file

@ -2,7 +2,7 @@
<moBackwardVectorVNSelection.h> <moBackwardVectorVNSelection.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau Sebastien Verel, Arnaud Liefooghe, Jeremie Humeau
This software is governed by the CeCILL license under French law and This software is governed by the CeCILL license under French law and
abiding by the rules of distribution of free software. You can ue, abiding by the rules of distribution of free software. You can ue,
@ -55,30 +55,31 @@ public:
* test if there is still some neighborhood to explore * test if there is still some neighborhood to explore
* @return true if there is some neighborhood to explore * @return true if there is some neighborhood to explore
*/ */
virtual bool cont(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){ virtual bool cont(EOT& _solution){
return (cycle || (current > 0)); return (cycle || (current > 0));
} }
/** /**
* put the current neighborhood on the first one * put the current neighborhood on the first one
*/ */
virtual void init(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){ virtual void init(EOT& _solution){
current = LSvector.size() - 1; current = LSvector.size() - 1;
_ls= *(LSvector[current]); std::cout << "current LS: " << current << std::endl;
_shake = *(shakeVector[current]); std::cout << _solution << std::endl;
} }
/** /**
* put the current neighborhood on the next one * put the current neighborhood on the next one
*/ */
virtual void next(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){ virtual void next(EOT& _solution){
current = (current + LSvector.size() -1) % LSvector.size(); current = (current + LSvector.size() -1) % LSvector.size();
_ls= *(LSvector[current]); std::cout << "current LS: " << current << std::endl;
_shake = *(shakeVector[current]); std::cout << _solution << std::endl;
} }
private: private:
bool cycle; bool cycle;
}; };

4
trunk/paradiseo-mo/src/neighborhood/moVariableNeighborhoodSelection.h
View file

@ -67,14 +67,14 @@ public:
* *
* @return current shake operator * @return current shake operator
*/ */
virtual const eoMon<EOT> & getShake() = 0; virtual eoMonOp<EOT> & getShake() = 0;
/** /**
* Get the current local search based on the current neighborhood * Get the current local search based on the current neighborhood
* *
* @return current local search * @return current local search
*/ */
virtual const eoMon<EOT> & getLocalSearch() = 0; virtual eoMonOp<EOT> & getLocalSearch() = 0;
}; };

6
trunk/paradiseo-mo/src/neighborhood/moVectorVNSelection.h
View file

@ -62,7 +62,7 @@ public:
* *
* @return current shake operator * @return current shake operator
*/ */
virtual const eoMon<EOT> & getShake() { virtual eoMonOp<EOT> & getShake() {
return *(shakeVector[current]); return *(shakeVector[current]);
} }
@ -71,7 +71,9 @@ public:
* *
* @return current local search * @return current local search
*/ */
virtual const eoMon<EOT> & getLocalSearch() { virtual eoMonOp<EOT> & getLocalSearch() {
std::cout << "getLS : " << current << " sur " << LSvector.size() << std::endl;
std::cout << "getLS : ls = " << LSvector[current]->className() << std::endl;
return *(LSvector[current]); return *(LSvector[current]);
} }