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

Update the explorer and the algo of TS to get the best so far solution

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1949 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
verel 2010-09-30 15:48:22 +00:00
commit da555f2095
2 changed files with 128 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

3
trunk/paradiseo-mo/src/algo/moTS.h
View file

@ -143,6 +143,9 @@ public:
explorer(_neighborhood, _eval, _neighborComp, _solNeighborComp, _tabuList, _intensification, _diversification, _aspiration) explorer(_neighborhood, _eval, _neighborComp, _solNeighborComp, _tabuList, _intensification, _diversification, _aspiration)
{} {}
moTSexplorer<Neighbor>& getExplorer() {
return explorer;
}
private: private:
moTimeContinuator<Neighbor> timeCont; moTimeContinuator<Neighbor> timeCont;

7
trunk/paradiseo-mo/src/explorer/moTSexplorer.h
View file

@ -223,6 +223,13 @@ public:
}; };
/**
* Give the current best found so far
* @return the best solution so far
*/
const EOT& getBest() {
return bestSoFar;
};
protected: protected: