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

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/paradiseo/paradiseo

Browse source
This commit is contained in:
Johann Dreo 2013-04-17 08:45:35 +02:00
commit 63e0b26186
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mo/src/perturb/moMonOpPerturb.h
View file

@ -60,8 +60,8 @@ public:
bool operator()(EOT& _solution) {
bool res = false;
for(unsigned int i = 0; i < nbPerturbation; i++)
res = res || monOp(_solution);
for(unsigned int i = 0; i < nbPerturbation; i++)
res = monOp(_solution) || res;
_solution.invalidate();
fullEval(_solution);

2
mo/src/problems/bitString/moBitsWithoutReplNeighborhood.h
View file

@ -81,7 +81,7 @@ public:
/* all the neighbors */
if (neighborhoodSize >= 1000000) {
std::cout << "moBitsNeighborhood::Warning : the neighborhood size is larger than 10^6 : " << neighborhoodSize << std::endl;
std::cout << "moBitsWithoutReplNeighborhood::Warning : the neighborhood size is larger than 10^6 : " << neighborhoodSize << std::endl;
}
int j;