From 8ad56f7ad3bb784c65b9accf0a941801c67bda0e Mon Sep 17 00:00:00 2001 From: nojhan Date: Tue, 28 Apr 2020 16:37:48 +0200 Subject: [PATCH] fix more warnings --- eo/src/eoLinearTopology.h | 8 ++++---- eo/src/eoPartiallyMappedXover.h | 12 ++++++------ eo/src/eoRingTopology.h | 8 ++++---- eo/test/t-eoExtendedVelocity.cpp | 2 +- eo/test/t-eoPartiallyMappedXover.cpp | 14 +++++++------- eo/test/t-eoRingTopology.cpp | 2 +- eo/test/t-operator-forge.cpp | 1 + eo/tutorial/Lesson2/FirstBitEA.cpp | 2 +- eo/tutorial/Lesson6/BinaryPSO.cpp | 2 +- 9 files changed, 26 insertions(+), 25 deletions(-) diff --git a/eo/src/eoLinearTopology.h b/eo/src/eoLinearTopology.h index cec66845a..c480e315f 100644 --- a/eo/src/eoLinearTopology.h +++ b/eo/src/eoLinearTopology.h @@ -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; } } diff --git a/eo/src/eoPartiallyMappedXover.h b/eo/src/eoPartiallyMappedXover.h index f88a469be..992fbcf77 100644 --- a/eo/src/eoPartiallyMappedXover.h +++ b/eo/src/eoPartiallyMappedXover.h @@ -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; diff --git a/eo/src/eoRingTopology.h b/eo/src/eoRingTopology.h index 615227909..a5526fea5 100644 --- a/eo/src/eoRingTopology.h +++ b/eo/src/eoRingTopology.h @@ -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; } } diff --git a/eo/test/t-eoExtendedVelocity.cpp b/eo/test/t-eoExtendedVelocity.cpp index 3fca3f30c..b2290be3d 100644 --- a/eo/test/t-eoExtendedVelocity.cpp +++ b/eo/test/t-eoExtendedVelocity.cpp @@ -16,7 +16,7 @@ double f (const Particle & _particle) return (-sum); } -int main_function(int argc, char **argv) +int main_function(int /*argc*/, char **/*argv*/) { const unsigned POP_SIZE = 6, VEC_SIZE = 2, NEIGHBORHOOD_SIZE=2; diff --git a/eo/test/t-eoPartiallyMappedXover.cpp b/eo/test/t-eoPartiallyMappedXover.cpp index 371c45a18..293799ec4 100644 --- a/eo/test/t-eoPartiallyMappedXover.cpp +++ b/eo/test/t-eoPartiallyMappedXover.cpp @@ -22,7 +22,7 @@ int main() { sol1.resize(9); sol2.resize(9); - for(int i = 0; i < sol1.size(); i++) + for(size_t i = 0; i < sol1.size(); i++) sol1[i] = i; sol2[0] = 3; @@ -46,23 +46,23 @@ int main() { std::cout << sol2 << std::endl; int verif[9]; - for(int i = 0; i < sol1.size(); i++) + for(size_t i = 0; i < sol1.size(); i++) verif[i] = -1; - for(int i = 0; i < sol1.size(); i++) + for(size_t i = 0; i < sol1.size(); i++) verif[ sol1[i] ] = 1; - for(int i = 0; i < sol1.size(); i++) + for(size_t i = 0; i < sol1.size(); i++) assert(verif[i] != -1); - for(int i = 0; i < sol2.size(); i++) + for(size_t i = 0; i < sol2.size(); i++) verif[i] = -1; - for(int i = 0; i < sol2.size(); i++) + for(size_t i = 0; i < sol2.size(); i++) verif[ sol2[i] ] = 1; - for(int i = 0; i < sol2.size(); i++) + for(size_t i = 0; i < sol2.size(); i++) assert(verif[i] != -1); std::cout << "[t-eoPartiallyMappedXover] => OK" << std::endl; diff --git a/eo/test/t-eoRingTopology.cpp b/eo/test/t-eoRingTopology.cpp index 9274114d9..b309f33f1 100644 --- a/eo/test/t-eoRingTopology.cpp +++ b/eo/test/t-eoRingTopology.cpp @@ -16,7 +16,7 @@ double f (const Indi & _indi) return (-sum); } -int main_function(int argc, char **argv) +int main_function(int /*argc*/, char **/*argv*/) { //Parameters const unsigned int VEC_SIZE = 2; diff --git a/eo/test/t-operator-forge.cpp b/eo/test/t-operator-forge.cpp index 8c7eee0d7..1e38305c6 100644 --- a/eo/test/t-operator-forge.cpp +++ b/eo/test/t-operator-forge.cpp @@ -8,6 +8,7 @@ struct OpInterface std::string _name; OpInterface(std::string name) : _name(name) {} virtual void operator()() = 0; + virtual ~OpInterface() {} }; struct OpA : public OpInterface diff --git a/eo/tutorial/Lesson2/FirstBitEA.cpp b/eo/tutorial/Lesson2/FirstBitEA.cpp index dfb98bb12..cae668024 100644 --- a/eo/tutorial/Lesson2/FirstBitEA.cpp +++ b/eo/tutorial/Lesson2/FirstBitEA.cpp @@ -36,7 +36,7 @@ typedef eoBit Indi; // A bitstring with fitness double // GENERAL //----------------------------------------------------------------------------- -void main_function(int argc, char **argv) +void main_function(int /*argc*/, char **/*argv*/) { // PARAMETRES const unsigned int SEED = 42; // seed for random number generator diff --git a/eo/tutorial/Lesson6/BinaryPSO.cpp b/eo/tutorial/Lesson6/BinaryPSO.cpp index 2e670f536..39650aaf8 100644 --- a/eo/tutorial/Lesson6/BinaryPSO.cpp +++ b/eo/tutorial/Lesson6/BinaryPSO.cpp @@ -34,7 +34,7 @@ double binary_value (const Particle & _particle) -void main_function(int argc, char **argv) +void main_function(int /*argc*/, char **/*argv*/) { // PARAMETRES // all parameters are hard-coded!