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

changement dans moContinuator.init qui n'est plus virtuel pure, et l'indentation de moLS ;-)

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1675 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
verel 2010-02-01 12:50:03 +00:00
commit a1c3c96542
2 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

52
branches/newMo/src/algo/moLocalSearch.h
View file

@ -65,34 +65,34 @@ public:
if(_solution.invalid()) if(_solution.invalid())
fullEval(_solution); fullEval(_solution);
// initialization of the parameter of the search (for example fill empty the tabu list) // initialization of the parameter of the search (for example fill empty the tabu list)
searchExplorer.initParam(_solution); searchExplorer.initParam(_solution);
// initialization of the external continuator (for example the time, or the number of generations) // initialization of the external continuator (for example the time, or the number of generations)
continuator.init(_solution); continuator.init(_solution);
bool b=continuator(_solution);
bool b=continuator(_solution); do {
// explore the neighborhood of the solution
do{ searchExplorer(_solution);
// explore the neighborhood of the solution
searchExplorer(_solution); // if a solution in the neighborhood can be accepted
if (searchExplorer.accept(_solution))
// if a solution in the neighborhood can be accepted searchExplorer.move(_solution);
if (searchExplorer.accept(_solution))
searchExplorer.move(_solution); // update the parameter of the search (for ex. Temperature of the SA)
searchExplorer.updateParam(_solution);
// update the parameter of the search (for ex. Temperature of the SA)
searchExplorer.updateParam(_solution); b=continuator(_solution);
} while (b && searchExplorer.isContinue(_solution));
b=continuator(_solution);
}while (b && searchExplorer.isContinue(_solution)); searchExplorer.terminate(_solution);
searchExplorer.terminate(_solution); continuator.lastCall(_solution);
continuator.lastCall(_solution); //A CHANGER
return true;
//A CHANGER
return true;
}; };

2
branches/newMo/src/continuator/moContinuator.h
View file

@ -51,7 +51,7 @@ public:
* Init Continuator parameters * Init Continuator parameters
* @param _solution the related solution * @param _solution the related solution
*/ */
virtual void init(EOT& _solution) = 0 ; virtual void init(EOT& _solution) { } ;
/** /**
* Last Call to terminate the checkpoint * Last Call to terminate the checkpoint