From 0ad2d5ad2b8611fa254bd8452018fde31a3f4598 Mon Sep 17 00:00:00 2001 From: maartenkeijzer Date: Thu, 23 Dec 2004 15:40:44 +0000 Subject: [PATCH] Some small changes concerning flags and warnings --- eo/src/eoDominanceMap.h | 1 - eo/src/eoNDSorting.h | 17 +++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/eo/src/eoDominanceMap.h b/eo/src/eoDominanceMap.h index fa57e507..ead93196 100644 --- a/eo/src/eoDominanceMap.h +++ b/eo/src/eoDominanceMap.h @@ -51,7 +51,6 @@ public: /** Clears the map */ void clear() { std::vector >::clear(); -#warning Is this correct? Was: "fitnesses.clear()" fitness.clear(); } diff --git a/eo/src/eoNDSorting.h b/eo/src/eoNDSorting.h index 0da93bb3..912a24b0 100644 --- a/eo/src/eoNDSorting.h +++ b/eo/src/eoNDSorting.h @@ -41,9 +41,12 @@ template class eoNDSorting : public eoPerf2WorthCached { -public: - + public : + using eoNDSorting< EOT >::value; + eoNDSorting(bool nasty_flag_ = false) : nasty_declone_flag_that_only_is_implemented_for_two_objectives(nasty_flag_) + {} + eoNDSorting() : nasty_declone_flag_that_only_is_implemented_for_two_objectives(false) @@ -376,7 +379,7 @@ template class eoNDSorting_I : public eoNDSorting { public : - eoNDSorting_I(double _nicheSize) : eoNDSorting(), nicheSize(_nicheSize) {} + eoNDSorting_I(double _nicheSize, bool nasty_flag_ = false) : eoNDSorting(nasty_flag_), nicheSize(_nicheSize) {} std::vector niche_penalty(const std::vector& current_front, const eoPop& _pop) { @@ -429,9 +432,11 @@ public : template class eoNDSorting_II : public eoNDSorting { -public: - - typedef std::pair double_index_pair; + public: + + eoNDSorting_II(bool nasty_flag_ = false) : eoNDSorting(nasty_flag_) {} + + typedef std::pair double_index_pair; class compare_nodes {