From 22a1dcd1462e2da6150b47547002f5ed6bcacef7 Mon Sep 17 00:00:00 2001 From: canape Date: Tue, 26 Feb 2008 10:47:56 +0000 Subject: [PATCH] peo debug git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1006 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-peo/src/core/complete_topo.cpp | 2 +- trunk/paradiseo-peo/src/core/random_topo.cpp | 2 +- trunk/paradiseo-peo/src/core/star_topo.cpp | 2 +- trunk/paradiseo-peo/src/peoData.h | 10 ++++++++-- trunk/paradiseo-peo/src/peoMultiStart.h | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/trunk/paradiseo-peo/src/core/complete_topo.cpp b/trunk/paradiseo-peo/src/core/complete_topo.cpp index e0871e3aa..01b4e1a00 100644 --- a/trunk/paradiseo-peo/src/core/complete_topo.cpp +++ b/trunk/paradiseo-peo/src/core/complete_topo.cpp @@ -44,7 +44,7 @@ void CompleteTopology :: setNeighbors (Cooperative * __mig, __from.clear () ; __to.clear () ; - for (int i = 0; i < mig.size (); i ++) { + for (unsigned i = 0; i < mig.size (); i ++) { if (mig [i] != __mig) { __from.push_back (mig [i]); __to.push_back (mig [i]); diff --git a/trunk/paradiseo-peo/src/core/random_topo.cpp b/trunk/paradiseo-peo/src/core/random_topo.cpp index 3b34fc3b6..50b1e2e10 100644 --- a/trunk/paradiseo-peo/src/core/random_topo.cpp +++ b/trunk/paradiseo-peo/src/core/random_topo.cpp @@ -46,7 +46,7 @@ void RandomTopology :: setNeighbors (Cooperative * __mig, __from.clear () ; __to.clear () ; - for (int i = 0; i < mig.size (); i ++) { + for (unsigned i = 0; i < mig.size (); i ++) { if (mig [i] != __mig && rng.uniform() < 0.5 ) { __from.push_back (mig [i]); __to.push_back (mig [i]); diff --git a/trunk/paradiseo-peo/src/core/star_topo.cpp b/trunk/paradiseo-peo/src/core/star_topo.cpp index 575dca638..285c848d7 100644 --- a/trunk/paradiseo-peo/src/core/star_topo.cpp +++ b/trunk/paradiseo-peo/src/core/star_topo.cpp @@ -50,7 +50,7 @@ void StarTopology :: setNeighbors (Cooperative * __mig, if ( __mig == center ) { - for (int i = 0; i < mig.size (); i ++) { + for (unsigned i = 0; i < mig.size (); i ++) { if (mig [i] != center) { __from.push_back (mig [i]); __to.push_back (mig [i]); diff --git a/trunk/paradiseo-peo/src/peoData.h b/trunk/paradiseo-peo/src/peoData.h index f64ffffe7..d197f700d 100644 --- a/trunk/paradiseo-peo/src/peoData.h +++ b/trunk/paradiseo-peo/src/peoData.h @@ -52,9 +52,11 @@ class continuator { public: - //! @brief Virtual function of check - //! @return true if the algorithm must continue + //! @brief Virtual function of check + //! @return true if the algorithm must continue virtual bool check()=0; + //! @brief Virtual destructor + virtual ~continuator(){} }; @@ -103,6 +105,8 @@ template < class TYPE> class selector //! @brief Virtual operator on the template type //! @param TYPE & virtual void operator()(TYPE &)=0; + //! @brief Virtual destructor + virtual ~selector(){} }; @@ -156,6 +160,8 @@ template < class TYPE> class replacement //! @brief Virtual operator on the template type //! @param TYPE & virtual void operator()(TYPE &)=0; + //! @brief Virtual destructor + virtual ~replacement(){} }; diff --git a/trunk/paradiseo-peo/src/peoMultiStart.h b/trunk/paradiseo-peo/src/peoMultiStart.h index a8c250929..40accdde2 100644 --- a/trunk/paradiseo-peo/src/peoMultiStart.h +++ b/trunk/paradiseo-peo/src/peoMultiStart.h @@ -207,7 +207,7 @@ template < typename EntityType > class peoMultiStart : public Service virtual ~AbstractAggregationAlgorithm() { } virtual void operator()( AbstractDataType& dataTypeInstanceA, AbstractDataType& dataTypeInstanceB ) - {}; + {} }; template < typename AggregationAlgorithmType > struct AggregationAlgorithm : public AbstractAggregationAlgorithm