diff --git a/eo/src/mpi/eoMultiStart.h b/eo/src/mpi/eoMultiStart.h index b8455e68..5be5fd68 100644 --- a/eo/src/mpi/eoMultiStart.h +++ b/eo/src/mpi/eoMultiStart.h @@ -53,10 +53,14 @@ namespace eo { typedef eoUF< eoPop&, void> ResetAlgo; - MultiStartData( bmpi::communicator& _comm, eoAlgo& _algo, int _masterRank, ResetAlgo & _resetAlgo ) + MultiStartData( + bmpi::communicator& _comm, + eoAlgo& _algo, + int _masterRank, + ResetAlgo & _resetAlgo ) : - runs( 0 ), pop(), bests(), - comm( _comm ), algo( _algo ), masterRank( _masterRank ), resetAlgo( _resetAlgo ) + runs( 0 ), bests(), pop(), + comm( _comm ), algo( _algo ), resetAlgo( _resetAlgo ), masterRank( _masterRank ) { // empty } @@ -245,20 +249,20 @@ namespace eo { _data.runs = runs; - int nbWorkers = workers.size(); + unsigned nbWorkers = workers.size(); std::vector< int > seeds = _getSeeds( nbWorkers ); if( eo::mpi::Node::comm().rank() == _masterRank ) { if( seeds.size() < nbWorkers ) { // Random seeds - for( int i = seeds.size(); i < nbWorkers; ++i ) + for( unsigned i = seeds.size(); i < nbWorkers; ++i ) { seeds.push_back( eo::rng.rand() ); } } - for( int i = 0 ; i < nbWorkers ; ++i ) + for( unsigned i = 0 ; i < nbWorkers ; ++i ) { int wrkRank = workers[i]; eo::mpi::Node::comm().send( wrkRank, 1, seeds[ i ] ); diff --git a/eo/src/utils/eoParallel.h b/eo/src/utils/eoParallel.h index b812fecc..c7a15a4f 100644 --- a/eo/src/utils/eoParallel.h +++ b/eo/src/utils/eoParallel.h @@ -68,9 +68,9 @@ private: eoValueParam _isDynamic; eoValueParam _prefix; eoValueParam _nthreads; - eoValueParam _packetSize; eoValueParam _enableResults; eoValueParam _doMeasure; + eoValueParam _packetSize; double _t_start; }; diff --git a/eo/test/mpi/t-mpi-multipleRoles.cpp b/eo/test/mpi/t-mpi-multipleRoles.cpp index 07f65937..3a525126 100644 --- a/eo/test/mpi/t-mpi-multipleRoles.cpp +++ b/eo/test/mpi/t-mpi-multipleRoles.cpp @@ -118,7 +118,7 @@ struct Work: public eoUF< SerializableVector< SerializableBase >&, void > { cout << "Work phase..." << endl; subtask( v, Node::comm().rank() ); - for( int i = 0; i < v.size(); ++i ) + for( unsigned i = 0; i < v.size(); ++i ) { v[i] *= 2; } @@ -168,7 +168,7 @@ int main(int argc, char** argv) EmptyJob stop( algo, 0 ); v = metaV[0]; cout << "Results : " << endl; - for(int i = 0; i < v.size(); ++i) + for(unsigned i = 0; i < v.size(); ++i) { cout << v[i] << ' '; } diff --git a/eo/test/mpi/t-mpi-parallelApply.cpp b/eo/test/mpi/t-mpi-parallelApply.cpp index 6cda8990..559505bd 100644 --- a/eo/test/mpi/t-mpi-parallelApply.cpp +++ b/eo/test/mpi/t-mpi-parallelApply.cpp @@ -198,7 +198,7 @@ int main(int argc, char** argv) // job. EmptyJob stop( *(tests[i].assign), eo::mpi::DEFAULT_MASTER ); ++offset; - for(int i = 0; i < v.size(); ++i) + for(unsigned i = 0; i < v.size(); ++i) { cout << v[i] << ' '; if( originalV[i] + offset != v[i] ) diff --git a/eo/test/mpi/t-mpi-wrapper.cpp b/eo/test/mpi/t-mpi-wrapper.cpp index cedc717f..7e5fa4d2 100644 --- a/eo/test/mpi/t-mpi-wrapper.cpp +++ b/eo/test/mpi/t-mpi-wrapper.cpp @@ -116,7 +116,7 @@ int main(int argc, char** argv) if( job.isMaster() ) { ++offset; - for(int i = 0; i < v.size(); ++i) + for(unsigned i = 0; i < v.size(); ++i) { cout << v[i] << ' '; if( originalV[i] + offset != v[i] )