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

New config of Paradiseo with Cmake 2.6

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1347 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2009-01-16 14:28:26 +00:00
commit 712e8d6cfa
84 changed files with 1468 additions and 739 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/paradiseo-mo/src/moVNS.h
View file

@ -52,7 +52,7 @@ class moVNS : public moAlgo < EOT>
typedef typename EOT::Fitness Fitness;
public:
//! Generic constructor
/*!
Generic constructor using a moExpl
@ -62,7 +62,7 @@ public:
*/
moVNS(moExpl< EOT> & _explorer, eoEvalFunc < EOT> & _full_evaluation): explorer(_explorer), full_evaluation(_full_evaluation) {}
//! Function which launches the VNS
/*!
@ -79,17 +79,16 @@ public:
EOT solution_initial=_solution;
EOT solution_prime, solution_second;
explorer.setIndice(i);
while(i<explorer.size()) {
solution_prime=solution_initial;
if(solution_prime.invalid())
full_evaluation(solution_prime);
explorer(solution_prime, solution_second);
if(solution_second.invalid())
full_evaluation(solution_second);
if(solution_second > solution_initial) {
solution_initial=solution_second;
change=true;
@ -103,7 +102,6 @@ public:
if(i<explorer.size())
explorer.setIndice(i);
}
}
_solution=solution_initial;
return change;