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

minor bugs in MO

Browse source
This commit is contained in:
liefooga 2013-02-22 12:16:37 +01:00
commit 1cd3fd6a30
3 changed files with 146 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mo/src/explorer/moRandomNeutralWalkExplorer.h
View file

@ -73,7 +73,7 @@ public:
nbStep(_nbStep) { nbStep(_nbStep) {
isAccept = false; isAccept = false;
if (!neighborhood.isRandom()) { if (!neighborhood.isRandom()) {
std::cout << "moRandomNeutralWalkExplorer::Warning -> the neighborhood used is not random" << std::endl; std::cout << "moRandomNeutralWalkExplorer::Warning -> the neighborhood used is not random (" << neighborhood.className() << ")" << std::endl;
} }
} }

2
mo/src/explorer/moRandomWalkExplorer.h
View file

@ -68,7 +68,7 @@ public:
moRandomWalkExplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval) : moNeighborhoodExplorer<Neighbor>(_neighborhood, _eval) { moRandomWalkExplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval) : moNeighborhoodExplorer<Neighbor>(_neighborhood, _eval) {
isAccept = false; isAccept = false;
if (!neighborhood.isRandom()) { if (!neighborhood.isRandom()) {
std::cout << "moRandomWalkExplorer::Warning -> the neighborhood used is not random" << std::endl; std::cout << "moRandomNeutralWalkExplorer::Warning -> the neighborhood used is not random (" << neighborhood.className() << ")" << std::endl;
} }
} }

243
mo/src/problems/bitString/moBitFlipNeighborhood.h
View file

@ -1,36 +1,36 @@
/* /*
<moBitFlipNeighborhood.h> <moBitFlipNeighborhood.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Sebastien Verel, Arnaud Liefooghe, Jeremie Humeau Sebastien Verel, Arnaud Liefooghe, Jeremie Humeau
This software is governed by the CeCILL license under French law and This software is governed by the CeCILL license under French law and
abiding by the rules of distribution of free software. You can use, abiding by the rules of distribution of free software. You can use,
modify and/ or redistribute the software under the terms of the CeCILL modify and/ or redistribute the software under the terms of the CeCILL
license as circulated by CEA, CNRS and INRIA at the following URL license as circulated by CEA, CNRS and INRIA at the following URL
"http://www.cecill.info". "http://www.cecill.info".
As a counterpart to the access to the source code and rights to copy, As a counterpart to the access to the source code and rights to copy,
modify and redistribute granted by the license, users are provided only modify and redistribute granted by the license, users are provided only
with a limited warranty and the software's author, the holder of the with a limited warranty and the software's author, the holder of the
economic rights, and the successive licensors have only limited liability. economic rights, and the successive licensors have only limited liability.
In this respect, the user's attention is drawn to the risks associated In this respect, the user's attention is drawn to the risks associated
with loading, using, modifying and/or developing or reproducing the with loading, using, modifying and/or developing or reproducing the
software by the user in light of its specific status of free software, software by the user in light of its specific status of free software,
that may mean that it is complicated to manipulate, and that also that may mean that it is complicated to manipulate, and that also
therefore means that it is reserved for developers and experienced therefore means that it is reserved for developers and experienced
professionals having in-depth computer knowledge. Users are therefore professionals having in-depth computer knowledge. Users are therefore
encouraged to load and test the software's suitability as regards their encouraged to load and test the software's suitability as regards their
requirements in conditions enabling the security of their systems and/or requirements in conditions enabling the security of their systems and/or
data to be ensured and, more generally, to use and operate it in the data to be ensured and, more generally, to use and operate it in the
same conditions as regards security. same conditions as regards security.
The fact that you are presently reading this means that you have had The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms. knowledge of the CeCILL license and that you accept its terms.
ParadisEO WebSite : http://paradiseo.gforge.inria.fr ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef _moBitFlipNeighborhood_h #ifndef _moBitFlipNeighborhood_h
#define _moBitFlipNeighborhood_h #define _moBitFlipNeighborhood_h
@ -52,110 +52,119 @@ class moBitFlipNeighborhood : public moNeighborhood<Neighbor>
{ {
public: public:
/** /**
* Define type of a solution corresponding to Neighbor * Define type of a solution corresponding to Neighbor
*/ */
typedef typename Neighbor::EOT EOT; typedef typename Neighbor::EOT EOT;
/** /**
* Constructor * Constructor
* *
* @param _rate bit flip rate (per bit) * @param _rate bit flip rate (per bit)
* @param _length bit string length * @param _length bit string length
* @param _sampleSize number of neighbor to sample in the neighborhood, if 0 all the neighborhood is sampled * @param _sampleSize number of neighbor to sample in the neighborhood, if 0 all the neighborhood is sampled
*/ */
moBitFlipNeighborhood(double _rate, unsigned _length, unsigned _sampleSize): moNeighborhood<Neighbor>(), rate(_rate), length(_length), sampleSize(_sampleSize) { moBitFlipNeighborhood(double _rate, unsigned _length, unsigned _sampleSize): moNeighborhood<Neighbor>(), rate(_rate), length(_length), sampleSize(_sampleSize) {
nNeighbors = 0; nNeighbors = 0;
} std::cout << "rate = " << rate << std::endl;
/**
* Test if it exist a neighbor
* @param _solution the solution to explore
* @return true if the neighborhood was not empty (bit string larger than 0)
*/
virtual bool hasNeighbor(EOT& _solution) {
return _solution.size() > 0;
}
/**
* one random neighbor
*
* @param _solution the solution to explore
* @param _neighbor the first neighbor
*/
virtual void randomNeighbor(EOT & _solution, Neighbor & _neighbor) {
// number of flipped bits
_neighbor.nBits = 0;
for(unsigned int i = 0; i < _solution.size(); i++) {
if (rng.flip(rate)) {
if (_neighbor.nBits < _neighbor.bits.size())
_neighbor.bits[_neighbor.nBits] = i;
else
_neighbor.bits.push_back(i);
_neighbor.nBits++;
}
} }
// reduce the size if necessary /**
if (_neighbor.nBits < _neighbor.bits.size()) * Test if it exist a neighbor
_neighbor.bits.resize(_neighbor.nBits); * @param _solution the solution to explore
} * @return true if the neighborhood was not empty (bit string larger than 0)
*/
virtual bool hasNeighbor(EOT& _solution) {
return _solution.size() > 0;
}
/** /**
* Initialization of the neighborhood: * one random neighbor
* one random neighbor *
* * @param _solution the solution to explore
* @param _solution the solution to explore * @param _neighbor the first neighbor
* @param _neighbor the first neighbor */
*/ virtual void randomNeighbor(EOT & _solution, Neighbor & _neighbor) {
virtual void init(EOT & _solution, Neighbor & _neighbor) { // number of flipped bits
randomNeighbor(_solution, _neighbor); _neighbor.nBits = 0;
nNeighbors = 1; for(unsigned int i = 0; i < _solution.size(); i++) {
} if (rng.flip(rate)) {
if (_neighbor.nBits < _neighbor.bits.size())
_neighbor.bits[_neighbor.nBits] = i;
else
_neighbor.bits.push_back(i);
_neighbor.nBits++;
}
}
/** // reduce the size if necessary
* Give the next neighbor if (_neighbor.nBits < _neighbor.bits.size())
* apply several bit flips on the solution _neighbor.bits.resize(_neighbor.nBits);
* @param _solution the solution to explore (population of solutions) }
* @param _neighbor the next neighbor which in order of distance
*/
virtual void next(EOT & _solution, Neighbor & _neighbor) {
randomNeighbor(_solution, _neighbor);
nNeighbors++; /**
} * Initialization of the neighborhood:
* one random neighbor
*
* @param _solution the solution to explore
* @param _neighbor the first neighbor
*/
virtual void init(EOT & _solution, Neighbor & _neighbor) {
randomNeighbor(_solution, _neighbor);
/** nNeighbors = 1;
* Test if all neighbors are explored or not,if false, there is no neighbor left to explore }
* @param _solution the solution to explore
* @return true if there is again a neighbor to explore: population size larger or equals than 1
*/
virtual bool cont(EOT & _solution) {
return nNeighbors < sampleSize ;
}
/** /**
* Return the class Name * Give the next neighbor
* @return the class name as a std::string * apply several bit flips on the solution
*/ * @param _solution the solution to explore (population of solutions)
virtual std::string className() const { * @param _neighbor the next neighbor which in order of distance
return "moBitFlipNeighborhood"; */
} virtual void next(EOT & _solution, Neighbor & _neighbor) {
randomNeighbor(_solution, _neighbor);
nNeighbors++;
}
/**
* Test if all neighbors are explored or not,if false, there is no neighbor left to explore
* @param _solution the solution to explore
* @return true if there is again a neighbor to explore: population size larger or equals than 1
*/
virtual bool cont(EOT & _solution) {
return nNeighbors < sampleSize ;
}
/**
* The neighborhood is random here
* @return true, since the neighborhood is random
*/
bool isRandom() {
return true;
}
/**
* Return the class Name
* @return the class name as a std::string
*/
virtual std::string className() const {
return "moBitFlipNeighborhood";
}
protected: protected:
// bit flip rate // bit flip rate
double rate; double rate;
// length of the bit string // length of the bit string
unsigned int length; unsigned int length;
// maximum number of visited neighbor i.e. number of neighbor to sample in the neighborhood // maximum number of visited neighbor i.e. number of neighbor to sample in the neighborhood
unsigned int sampleSize; unsigned int sampleSize;
// number of visited neighbors // number of visited neighbors
unsigned nNeighbors; unsigned nNeighbors;
}; };
#endif #endif