Nettoyage VNS
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1920 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
f16abb9d6b
commit
5bd7771afe
6 changed files with 336 additions and 66 deletions
|
|
@ -66,8 +66,8 @@ public:
|
|||
/**
|
||||
* initParam: NOTHING TO DO
|
||||
*/
|
||||
virtual void initParam(EOT & _solution) {
|
||||
_selection.init(_solution, *shake, *ls);
|
||||
virtual void initParam(EOT& _solution) {
|
||||
selection.init(_solution, *shake, *ls);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -75,10 +75,10 @@ public:
|
|||
*/
|
||||
virtual void updateParam(EOT & _solution) {
|
||||
if ((*this).moveApplied()) {
|
||||
_selection.init(_solution, *shake, *ls);
|
||||
selection.init(_solution, *shake, *ls);
|
||||
}
|
||||
else if (_selection.cont(_solution, *shake, *ls)){
|
||||
_selection.next(_solution, *shake, *ls);
|
||||
else if (selection.cont(_solution, *shake, *ls)){
|
||||
selection.next(_solution, *shake, *ls);
|
||||
}
|
||||
else
|
||||
stop=true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue