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

Add the notion of currentNeighbor in the moMetropolisHastingexplorer

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2541 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
verel 2011-12-06 13:29:01 +00:00
commit e6baefd199
2 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
trunk/paradiseo-mo/src/explorer/moMetropolisHastingExplorer.h
View file

@ -58,6 +58,7 @@ public:
using moNeighborhoodExplorer<Neighbor>::neighborhood; using moNeighborhoodExplorer<Neighbor>::neighborhood;
using moNeighborhoodExplorer<Neighbor>::eval; using moNeighborhoodExplorer<Neighbor>::eval;
using moNeighborhoodExplorer<Neighbor>::currentNeighbor;
/** /**
* Constructor * Constructor
@ -69,7 +70,6 @@ public:
*/ */
moMetropolisHastingExplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval, moNeighborComparator<Neighbor>& _neighborComparator, moSolNeighborComparator<Neighbor>& _solNeighborComparator, unsigned int _nbStep) : moNeighborhoodExplorer<Neighbor>(_neighborhood, _eval), neighborComparator(_neighborComparator), solNeighborComparator(_solNeighborComparator), nbStep(_nbStep) { moMetropolisHastingExplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval, moNeighborComparator<Neighbor>& _neighborComparator, moSolNeighborComparator<Neighbor>& _solNeighborComparator, unsigned int _nbStep) : moNeighborhoodExplorer<Neighbor>(_neighborhood, _eval), neighborComparator(_neighborComparator), solNeighborComparator(_solNeighborComparator), nbStep(_nbStep) {
isAccept = false; isAccept = false;
current=new Neighbor();
if (!neighborhood.isRandom()) { if (!neighborhood.isRandom()) {
std::cout << "moMetropolisHastingExplorer::Warning -> the neighborhood used is not random" << std::endl; std::cout << "moMetropolisHastingExplorer::Warning -> the neighborhood used is not random" << std::endl;
} }
@ -79,7 +79,6 @@ public:
* Destructor * Destructor
*/ */
~moMetropolisHastingExplorer() { ~moMetropolisHastingExplorer() {
delete current;
} }
/** /**
@ -113,10 +112,10 @@ public:
//Test if _solution has a Neighbor //Test if _solution has a Neighbor
if (neighborhood.hasNeighbor(_solution)) { if (neighborhood.hasNeighbor(_solution)) {
//init the first neighbor //init the first neighbor
neighborhood.init(_solution, (*current)); neighborhood.init(_solution, currentNeighbor);
//eval the _solution moved with the neighbor and stock the result in the neighbor //eval the _solution moved with the neighbor and stock the result in the neighbor
eval(_solution, (*current)); eval(_solution, currentNeighbor);
} }
else { else {
//if _solution hasn't neighbor, //if _solution hasn't neighbor,
@ -139,9 +138,9 @@ public:
*/ */
virtual void move(EOT & _solution) { virtual void move(EOT & _solution) {
//move the solution //move the solution
(*current).move(_solution); currentNeighbor.move(_solution);
//update its fitness //update its fitness
_solution.fitness((*current).fitness()); _solution.fitness(currentNeighbor.fitness());
}; };
/** /**
@ -152,18 +151,18 @@ public:
virtual bool accept(EOT & _solution) { virtual bool accept(EOT & _solution) {
double alpha=0.0; double alpha=0.0;
if (neighborhood.hasNeighbor(_solution)) { if (neighborhood.hasNeighbor(_solution)) {
if (solNeighborComparator(_solution, *current)) if (solNeighborComparator(_solution, currentNeighbor)
isAccept = true; isAccept = true;
else { else {
if (_solution.fitness() != 0) { if (_solution.fitness() != 0) {
if ( (double)current->fitness() < (double)_solution.fitness()) // maximizing if ( (double)currentNeighbor.fitness() < (double)_solution.fitness()) // maximizing
alpha = (double) current->fitness() / (double) _solution.fitness(); alpha = (double) currentNeighbor.fitness() / (double) _solution.fitness();
else //minimizing else //minimizing
alpha = (double) _solution.fitness() / (double) current->fitness(); alpha = (double) _solution.fitness() / (double) currentNeighbor.fitness();
isAccept = (rng.uniform() < alpha) ; isAccept = (rng.uniform() < alpha) ;
} }
else { else {
if ( (double)current->fitness() < (double)_solution.fitness()) // maximizing if ( (double)currentNeighbor.fitness() < (double)_solution.fitness()) // maximizing
isAccept = true; isAccept = true;
else else
isAccept = false; isAccept = false;
@ -184,9 +183,6 @@ private:
// maximum number of steps to do // maximum number of steps to do
unsigned int nbStep; unsigned int nbStep;
//Pointer on the best and the current neighbor
Neighbor* current;
// true if the move is accepted // true if the move is accepted
bool isAccept ; bool isAccept ;
}; };

10
trunk/paradiseo-mo/src/explorer/moNeighborhoodExplorer.h
View file

@ -44,7 +44,15 @@
#include <eval/moDummyEval.h> #include <eval/moDummyEval.h>
/** /**
* Explore the neighborhood * Explore the neighborhood according to the local search algorithm
*
* During this exploration,
* the parameters are updated
* one neighbor is selected
* a comparason with the solution is made to acccept or not this new neighbor
*
* the current neighbor is the neighbor under consideration during the search
*
*/ */
template< class Neighbor > template< class Neighbor >
class moNeighborhoodExplorer : public eoUF<typename Neighbor::EOT&, void> class moNeighborhoodExplorer : public eoUF<typename Neighbor::EOT&, void>