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

Doc and tests added

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1706 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-03-23 15:14:04 +00:00
commit baf31d0c30
25 changed files with 159 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
branches/newMo/src/explorer/moMetropolisHastingExplorer.h
View file

@ -35,6 +35,8 @@
#ifndef _moMetropolisHastingExplorer_h
#define _moMetropolisHastingExplorer_h
#include <cstdlib>
#include <explorer/moNeighborhoodExplorer.h>
#include <comparator/moNeighborComparator.h>
#include <comparator/moSolNeighborComparator.h>
@ -67,6 +69,9 @@ public:
moMetropolisHastingExplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval, moNeighborComparator<Neighbor>& _neighborComparator, moSolNeighborComparator<Neighbor>& _solNeighborComparator, unsigned int _nbStep) : moNeighborhoodExplorer<Neighborhood>(_neighborhood, _eval), neighborComparator(_neighborComparator), solNeighborComparator(_solNeighborComparator), nbStep(_nbStep) {
isAccept = false;
current=new Neighbor();
if(!neighborhood.isRandom()){
std::cout << "moMetropolisHastingExplorer::Warning -> the neighborhood used is not random" << std::endl;
}
}
/**

3
branches/newMo/src/explorer/moRandomNeutralWalkExplorer.h
View file

@ -69,6 +69,9 @@ public:
nbStep(_nbStep) {
isAccept = false;
current=new Neighbor();
if(!neighborhood.isRandom()){
std::cout << "moRandomNeutralWalkExplorer::Warning -> the neighborhood used is not random" << std::endl;
}
}
/**

3
branches/newMo/src/explorer/moRandomWalkExplorer.h
View file

@ -63,6 +63,9 @@ public:
current=new Neighbor();
// number of step done
step = 0;
if(!neighborhood.isRandom()){
std::cout << "moRandomWalkExplorer::Warning -> the neighborhood used is not random" << std::endl;
}
}
/**

8
branches/newMo/src/explorer/moTSExplorer.h
View file

@ -110,8 +110,7 @@ public:
*/
virtual void updateParam(EOT& _solution)
{
if ((*this).moveApplied())
{
if ((*this).moveApplied()){
tabuList.add(_solution, *best);
intensification.add(_solution, *best);
diversification.add(_solution, *best);
@ -126,10 +125,9 @@ public:
/**
* terminate : NOTHING TO DO
* terminate : _solution becomes the best so far
*/
virtual void terminate(EOT & _solution)
{
virtual void terminate(EOT & _solution){
_solution= bestSoFar;
};