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

fix more warnings

Browse source
This commit is contained in:
Johann Dreo 2020-04-28 16:37:48 +02:00
commit 8ad56f7ad3
9 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
eo/src/eoLinearTopology.h
View file

@ -192,16 +192,16 @@ public:
/**
* Print the structure of the topology on the standrad output.
*/
void printOn()
void printOn(std::ostream& out) const
{
for (unsigned i=0;i< neighborhoods.size();i++)
{
std::cout << "{ " ;
out << "{ " ;
for (unsigned j=0;j< neighborhoods[i].size();j++)
{
std::cout << neighborhoods[i].get(j) << " ";
out << neighborhoods[i].get(j) << " ";
}
std::cout << "}" << std::endl;
out << "}" << std::endl;
}
}

12
eo/src/eoPartiallyMappedXover.h
View file

@ -53,23 +53,23 @@ public:
bool operator()(EOT & _solution1, EOT & _solution2) {
if (_solution1.size() > 1) {
// random indexes such that i1 < i2
int i1 = rng.random(_solution1.size());
int i2 = rng.random(_solution1.size());
size_t i1 = rng.random(_solution1.size());
size_t i2 = rng.random(_solution1.size());
while (i1 == i2)
i2 = rng.random(_solution1.size());
if (i1 > i2) {
int tmp = i1;
size_t tmp = i1;
i1 = i2;
i2 = tmp;
}
// the permutations between s1 and s2
int * p1 = new int[_solution1.size()];
int * p2 = new int[_solution1.size()];
size_t * p1 = new size_t[_solution1.size()];
size_t * p2 = new size_t[_solution1.size()];
int i;
size_t i;
for(i = 0; i < _solution1.size(); i++) {
p1[i] = -1;
p2[i] = -1;

8
eo/src/eoRingTopology.h
View file

@ -143,16 +143,16 @@ public:
/**
* Print the structure of the topology on the standard output.
*/
void printOn()
void printOn(std::ostream& out) const
{
for (unsigned i=0;i< neighborhoods.size();i++)
{
std::cout << "{ " ;
out << "{ " ;
for (unsigned j=0;j< neighborhoods[i].size();j++)
{
std::cout << neighborhoods[i].get(j) << " ";
out << neighborhoods[i].get(j) << " ";
}
std::cout << "}" << std::endl;
out << "}" << std::endl;
}
}