Removed all remaining warnings at compilation

This commit is contained in:
Benjamin Bouvier 2012-07-27 15:22:23 +02:00
commit b31c520eba
5 changed files with 15 additions and 11 deletions

View file

@ -53,10 +53,14 @@ namespace eo
{ {
typedef eoUF< eoPop<EOT>&, void> ResetAlgo; typedef eoUF< eoPop<EOT>&, void> ResetAlgo;
MultiStartData( bmpi::communicator& _comm, eoAlgo<EOT>& _algo, int _masterRank, ResetAlgo & _resetAlgo ) MultiStartData(
bmpi::communicator& _comm,
eoAlgo<EOT>& _algo,
int _masterRank,
ResetAlgo & _resetAlgo )
: :
runs( 0 ), pop(), bests(), runs( 0 ), bests(), pop(),
comm( _comm ), algo( _algo ), masterRank( _masterRank ), resetAlgo( _resetAlgo ) comm( _comm ), algo( _algo ), resetAlgo( _resetAlgo ), masterRank( _masterRank )
{ {
// empty // empty
} }
@ -245,20 +249,20 @@ namespace eo
{ {
_data.runs = runs; _data.runs = runs;
int nbWorkers = workers.size(); unsigned nbWorkers = workers.size();
std::vector< int > seeds = _getSeeds( nbWorkers ); std::vector< int > seeds = _getSeeds( nbWorkers );
if( eo::mpi::Node::comm().rank() == _masterRank ) if( eo::mpi::Node::comm().rank() == _masterRank )
{ {
if( seeds.size() < nbWorkers ) if( seeds.size() < nbWorkers )
{ {
// Random seeds // Random seeds
for( int i = seeds.size(); i < nbWorkers; ++i ) for( unsigned i = seeds.size(); i < nbWorkers; ++i )
{ {
seeds.push_back( eo::rng.rand() ); seeds.push_back( eo::rng.rand() );
} }
} }
for( int i = 0 ; i < nbWorkers ; ++i ) for( unsigned i = 0 ; i < nbWorkers ; ++i )
{ {
int wrkRank = workers[i]; int wrkRank = workers[i];
eo::mpi::Node::comm().send( wrkRank, 1, seeds[ i ] ); eo::mpi::Node::comm().send( wrkRank, 1, seeds[ i ] );

View file

@ -68,9 +68,9 @@ private:
eoValueParam<bool> _isDynamic; eoValueParam<bool> _isDynamic;
eoValueParam<std::string> _prefix; eoValueParam<std::string> _prefix;
eoValueParam<unsigned int> _nthreads; eoValueParam<unsigned int> _nthreads;
eoValueParam<unsigned int> _packetSize;
eoValueParam<bool> _enableResults; eoValueParam<bool> _enableResults;
eoValueParam<bool> _doMeasure; eoValueParam<bool> _doMeasure;
eoValueParam<unsigned int> _packetSize;
double _t_start; double _t_start;
}; };

View file

@ -118,7 +118,7 @@ struct Work: public eoUF< SerializableVector< SerializableBase<int> >&, void >
{ {
cout << "Work phase..." << endl; cout << "Work phase..." << endl;
subtask( v, Node::comm().rank() ); subtask( v, Node::comm().rank() );
for( int i = 0; i < v.size(); ++i ) for( unsigned i = 0; i < v.size(); ++i )
{ {
v[i] *= 2; v[i] *= 2;
} }
@ -168,7 +168,7 @@ int main(int argc, char** argv)
EmptyJob stop( algo, 0 ); EmptyJob stop( algo, 0 );
v = metaV[0]; v = metaV[0];
cout << "Results : " << endl; cout << "Results : " << endl;
for(int i = 0; i < v.size(); ++i) for(unsigned i = 0; i < v.size(); ++i)
{ {
cout << v[i] << ' '; cout << v[i] << ' ';
} }

View file

@ -198,7 +198,7 @@ int main(int argc, char** argv)
// job. // job.
EmptyJob stop( *(tests[i].assign), eo::mpi::DEFAULT_MASTER ); EmptyJob stop( *(tests[i].assign), eo::mpi::DEFAULT_MASTER );
++offset; ++offset;
for(int i = 0; i < v.size(); ++i) for(unsigned i = 0; i < v.size(); ++i)
{ {
cout << v[i] << ' '; cout << v[i] << ' ';
if( originalV[i] + offset != v[i] ) if( originalV[i] + offset != v[i] )

View file

@ -116,7 +116,7 @@ int main(int argc, char** argv)
if( job.isMaster() ) if( job.isMaster() )
{ {
++offset; ++offset;
for(int i = 0; i < v.size(); ++i) for(unsigned i = 0; i < v.size(); ++i)
{ {
cout << v[i] << ' '; cout << v[i] << ' ';
if( originalV[i] + offset != v[i] ) if( originalV[i] + offset != v[i] )