diff --git a/trunk/paradiseo-moeo/src/algo/moeoVFAS.h b/trunk/paradiseo-moeo/src/algo/moeoVFAS.h index 118ed6c3c..c0093ae70 100644 --- a/trunk/paradiseo-moeo/src/algo/moeoVFAS.h +++ b/trunk/paradiseo-moeo/src/algo/moeoVFAS.h @@ -66,8 +66,6 @@ class moeoVFAS:public moeoPopAlgo < typename M::EOType > take a base vector of weight, and modify it to relaunch the algo with a diferent fitness use a selectOne to determine which moeot should be the base for the algo launch use a eoPop to keep result from each iteration - - @param _algorithm The solution based heuristic to use. It should at least use the fitness value at some point. @param _continue The stopping criterion. @param _select a selector to choose on which moeot we use the algorithm @@ -77,7 +75,7 @@ class moeoVFAS:public moeoPopAlgo < typename M::EOType > */ moeoVFAS (moeoSolAlgo & _algorithm, eoContinue & _continue,moeoSelectOne &_select, std::vector &_weights, eoEvalFunc< MOEOT > &_eval , moeoVariableWeightStrategy &_wstrat ): - algo(_algorithm),cont(_continue), select(_select), weights(_weights),eval(_eval),wstrat(_wstrat), refPoint(defaultRefPoint),rstrat(defaultRstrat) + algo(_algorithm),cont(_continue), select(_select), weights(_weights),eval(_eval),refPoint(defaultRefPoint), wstrat(_wstrat), rstrat(defaultRstrat) {} /*! @@ -98,7 +96,7 @@ class moeoVFAS:public moeoPopAlgo < typename M::EOType > */ moeoVFAS (moeoSolAlgo & _algorithm, eoContinue & _continue,moeoSelectOne &_select, std::vector &_weights, ObjectiveVector &_refPoint, eoEvalFunc< MOEOT > &_eval , moeoVariableWeightStrategy &_wstrat , moeoVariableRefPointStrategy& _rstrat): - algo(_algorithm),cont(_continue), select(_select), weights(_weights),eval(_eval),wstrat(_wstrat), rstrat(_rstrat),refPoint(_refPoint) + algo(_algorithm),cont(_continue), select(_select), weights(_weights),eval(_eval),refPoint(_refPoint),wstrat(_wstrat), rstrat(_rstrat) {} /** @@ -110,7 +108,7 @@ class moeoVFAS:public moeoPopAlgo < typename M::EOType > **/ moeoVFAS (moeoSolAlgo & _algorithm, eoContinue & _continue,moeoSelectOne &_select, eoEvalFunc< MOEOT > &_eval, moeoVariableWeightStrategy &_wstrat): - algo(_algorithm),cont(_continue), select(_select), weights(defaultWeights), eval(_eval), wstrat(defaultWstrat), refPoint(defaultRefPoint), rstrat(defaultRstrat) + algo(_algorithm),cont(_continue), select(_select), weights(defaultWeights), eval(_eval), refPoint(defaultRefPoint), wstrat(defaultWstrat), rstrat(defaultRstrat) { weights.resize(MOEOT::ObjectiveVector::nObjectives(),1.0/MOEOT::ObjectiveVector::nObjectives()); } @@ -127,7 +125,6 @@ class moeoVFAS:public moeoPopAlgo < typename M::EOType > moeoObjectiveVectorNormalizer norm(_pop); moeoAggregationFitnessAssignment fitness(weights,eval); bool res=false; - int iteration=0; fitness(_pop); MOEOT moeot(select(_pop)); wstrat(weights,moeot); @@ -151,9 +148,9 @@ class moeoVFAS:public moeoPopAlgo < typename M::EOType > moeoSelectOne &select; std::vector &weights; std::vector defaultWeights; + eoEvalFunc &eval; ObjectiveVector &refPoint; ObjectiveVector defaultRefPoint; - eoEvalFunc &eval; moeoVariableWeightStrategy &wstrat; moeoVariableRefPointStrategy &rstrat; moeoDummyRefPointStrategy defaultRstrat; diff --git a/trunk/paradiseo-moeo/src/archive/moeoIndexedArchive.h b/trunk/paradiseo-moeo/src/archive/moeoIndexedArchive.h index 44ea7a4e0..940941b3d 100755 --- a/trunk/paradiseo-moeo/src/archive/moeoIndexedArchive.h +++ b/trunk/paradiseo-moeo/src/archive/moeoIndexedArchive.h @@ -37,7 +37,6 @@ class moeoIndexedArchive : public moeoArchive < MOEOT > * @param _moeo the given individual */ bool operator()(const MOEOT & _moeo){ - bool added=false; std::pair::modif> > res=index(_moeo); if (!(res.first)){ return false; diff --git a/trunk/paradiseo-moeo/src/archive/moeoQuadTree.h b/trunk/paradiseo-moeo/src/archive/moeoQuadTree.h index 358df79fd..b159a1c6d 100755 --- a/trunk/paradiseo-moeo/src/archive/moeoQuadTree.h +++ b/trunk/paradiseo-moeo/src/archive/moeoQuadTree.h @@ -238,7 +238,7 @@ public: unsigned int k_succ(const ObjectiveVector& _objVec1, const ObjectiveVector& _objVec2){ unsigned int res=0; if(!(*comparator)(_objVec2, _objVec1)){ - for(int i=0; i < ObjectiveVector::nObjectives(); i++){ + for(unsigned int i=0; i < ObjectiveVector::nObjectives(); i++){ if( (ObjectiveVector::minimizing(i) && ((_objVec1[i] - _objVec2[i]) >= (-1.0 * 1e-6 ))) || (ObjectiveVector::maximizing(i) && ((_objVec1[i] - _objVec2[i]) <= 1e-6 ))){ res+=pow(2,ObjectiveVector::nObjectives()-i-1); diff --git a/trunk/paradiseo-moeo/src/fitness/moeoAchievementScalarizingFunctionMetricFitnessAssignment.h b/trunk/paradiseo-moeo/src/fitness/moeoAchievementScalarizingFunctionMetricFitnessAssignment.h index 17382fa77..185d625a0 100644 --- a/trunk/paradiseo-moeo/src/fitness/moeoAchievementScalarizingFunctionMetricFitnessAssignment.h +++ b/trunk/paradiseo-moeo/src/fitness/moeoAchievementScalarizingFunctionMetricFitnessAssignment.h @@ -74,7 +74,7 @@ class moeoAchievementScalarizingFunctionMetricFitnessAssignment : public moeoSin * @param _weight the weights applied to the objectives * @param _eval a evalFunc to regenerate the objectiveVector if needed */ - moeoAchievementScalarizingFunctionMetricFitnessAssignment(unsigned int _rho, ObjectiveVector& _reference, const ObjectiveVector& _weight, eoEvalFunc& _eval): eval(_eval), normalizer(defaultNormalizer), distance(_rho, _weight), metric( distance, _reference, defaultNormalizer){} + moeoAchievementScalarizingFunctionMetricFitnessAssignment(unsigned int _rho, ObjectiveVector& _reference, const ObjectiveVector& _weight, eoEvalFunc& _eval): normalizer(defaultNormalizer), eval(_eval), distance(_rho, _weight), metric( distance, _reference, defaultNormalizer){} /** * ctor with an evaluing fonction, applied if give moeot is invalid, and a noramlizer, applied to ObjectiveVectors @@ -92,7 +92,7 @@ class moeoAchievementScalarizingFunctionMetricFitnessAssignment : public moeoSin * @param _reference the reference point * @param _weight the weights applied to the objectives */ - moeoAchievementScalarizingFunctionMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight) : eval(defaultEval), normalizer(defaultNormalizer), distance(_rho, _weight), metric(distance, _reference, defaultNormalizer){} + moeoAchievementScalarizingFunctionMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight) : normalizer(defaultNormalizer), eval(defaultEval), distance(_rho, _weight), metric(distance, _reference, defaultNormalizer){} /** * Sets the fitness values for a moeot @@ -131,16 +131,18 @@ class moeoAchievementScalarizingFunctionMetricFitnessAssignment : public moeoSin private: - moeoObjectiveVectorNormalizer defaultNormalizer; - moeoAchievementScalarizingFunctionDistance distance; - moeoDistanceMetric metric; - eoEvalFunc &eval; - moeoObjectiveVectorNormalizer &normalizer; - class DummyEval: public eoEvalFunc{ void operator()(MOEOT &moeo){ } } defaultEval; + + moeoObjectiveVectorNormalizer &normalizer; + moeoObjectiveVectorNormalizer defaultNormalizer; + eoEvalFunc &eval; + moeoAchievementScalarizingFunctionDistance distance; + moeoDistanceMetric metric; + + }; #endif /*moeoAugmentedScalarizingFunctionMetricFitnessASSIGNMENT_H_*/ diff --git a/trunk/paradiseo-moeo/src/fitness/moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h b/trunk/paradiseo-moeo/src/fitness/moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h index 9775c7592..ff654aa7f 100644 --- a/trunk/paradiseo-moeo/src/fitness/moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h +++ b/trunk/paradiseo-moeo/src/fitness/moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h @@ -78,7 +78,7 @@ class moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment : publi * @param _reference the reference point * @param _weight the weights applied to the objectives */ - moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector &_reference,const ObjectiveVector &_weight,eoEvalFunc &_eval) : eval(_eval),normalizer(defaultNormalizer), distance(_rho,_weight), metric(distance,_reference,normalizer) + moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector &_reference,const ObjectiveVector &_weight,eoEvalFunc &_eval) : normalizer(defaultNormalizer), eval(_eval), distance(_rho,_weight), metric(distance,_reference,normalizer) {} /** * ctor with an evaluing fonction, applied if give moeot is invalid, and a noramlizer, applied to ObjectiveVectors @@ -96,7 +96,7 @@ class moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment : publi * @param _reference the reference point * @param _weight the weights applied to the objectives */ - moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector &_reference,const ObjectiveVector &_weight) : eval(defaultEval),normalizer(defaultNormalizer), distance(_rho,_weight), metric(distance,_reference,normalizer) + moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector &_reference,const ObjectiveVector &_weight) : normalizer(defaultNormalizer), eval(defaultEval), distance(_rho,_weight), metric(distance,_reference,normalizer) {} /** @@ -145,16 +145,17 @@ class moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment : publi private: - moeoObjectiveVectorNormalizer defaultNormalizer; - moeoAugmentedAchievementScalarizingFunctionDistance distance; - moeoObjectiveVectorNormalizer &normalizer; - moeoDistanceMetric metric; - eoEvalFunc &eval; class DummyEval: public eoEvalFunc{ void operator()(MOEOT &moeo){ } } defaultEval; + moeoObjectiveVectorNormalizer defaultNormalizer; + moeoObjectiveVectorNormalizer &normalizer; + eoEvalFunc &eval; + moeoAugmentedAchievementScalarizingFunctionDistance distance; + moeoDistanceMetric metric; + }; #endif /*moeoAugmentedScalarizingFunctionMetricFitnessASSIGNMENT_H_*/ diff --git a/trunk/paradiseo-moeo/src/fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h b/trunk/paradiseo-moeo/src/fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h index 37748a4b4..356ac2144 100644 --- a/trunk/paradiseo-moeo/src/fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h +++ b/trunk/paradiseo-moeo/src/fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h @@ -72,7 +72,7 @@ class moeoAugmentedWeightedChebychevMetricFitnessAssignment : public moeoSingleO * @param _weight the weights applied to the objectives * @param _eval a evalFunc to regenerate the objectiveVector if needed */ - moeoAugmentedWeightedChebychevMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight, eoEvalFunc& _eval) : eval(_eval), normalizer(defaultNormalizer), distance(_rho, _weight), metric(distance, _reference, normalizer){} + moeoAugmentedWeightedChebychevMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight, eoEvalFunc& _eval) : normalizer(defaultNormalizer), eval(_eval), distance(_rho, _weight), metric(distance, _reference, normalizer){} /** * ctor with an evaluation fonction, applied if give moeot is invalid, and a noramlizer, applied to ObjectiveVectors @@ -90,7 +90,7 @@ class moeoAugmentedWeightedChebychevMetricFitnessAssignment : public moeoSingleO * @param _reference the reference point * @param _weight the weights applied to the objectives */ - moeoAugmentedWeightedChebychevMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight) : eval(defaultEval), normalizer(defaultNormalizer), distance(_rho, _weight), metric(distance, _reference, normalizer){} + moeoAugmentedWeightedChebychevMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight) : normalizer(defaultNormalizer), eval(defaultEval), distance(_rho, _weight), metric(distance, _reference, normalizer){} /** * Sets the fitness values for a moeot @@ -133,11 +133,12 @@ class moeoAugmentedWeightedChebychevMetricFitnessAssignment : public moeoSingleO } } defaultEval; - moeoAugmentedWeightedChebychevDistance distance; moeoObjectiveVectorNormalizer defaultNormalizer; moeoObjectiveVectorNormalizer &normalizer; - moeoDistanceMetric metric; eoEvalFunc &eval; + moeoAugmentedWeightedChebychevDistance distance; + moeoDistanceMetric metric; + }; diff --git a/trunk/paradiseo-moeo/src/fitness/moeoConstraintFitnessAssignment.h b/trunk/paradiseo-moeo/src/fitness/moeoConstraintFitnessAssignment.h index c48eee9d9..c87ee3514 100644 --- a/trunk/paradiseo-moeo/src/fitness/moeoConstraintFitnessAssignment.h +++ b/trunk/paradiseo-moeo/src/fitness/moeoConstraintFitnessAssignment.h @@ -99,7 +99,7 @@ class moeoConstraintFitnessAssignment : public moeoSingleObjectivization < MOEOT } else{ for(unsigned int l=0; l& _eval) : eval(_eval), normalizer(defaultNormalizer), distance(_rho, _weight), metric(distance, _reference, normalizer){} + moeoWeightedChebychevMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight, eoEvalFunc& _eval) : normalizer(defaultNormalizer), eval(_eval), distance(_rho, _weight), metric(distance, _reference, normalizer){} /** * ctor with an evaluation fonction, applied if give moeot is invalid, and a noramlizer, applied to ObjectiveVectors @@ -94,7 +94,7 @@ class moeoWeightedChebychevMetricFitnessAssignment : public moeoSingleObjectiviz * @param _reference the reference point * @param _weight the weights applied to the objectives */ - moeoWeightedChebychevMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight) : eval(defaultEval), normalizer(defaultNormalizer), distance(_rho, _weight), metric(distance, _reference, normalizer){} + moeoWeightedChebychevMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight) : normalizer(defaultNormalizer), eval(defaultEval), distance(_rho, _weight), metric(distance, _reference, normalizer){} /** * Sets the fitness values for a moeot @@ -133,17 +133,16 @@ class moeoWeightedChebychevMetricFitnessAssignment : public moeoSingleObjectiviz private: - moeoWeightedChebychevDistance distance; - moeoObjectiveVectorNormalizer defaultNormalizer; - moeoObjectiveVectorNormalizer& normalizer; - moeoDistanceMetric metric; - eoEvalFunc &eval; - class DummyEval: public eoEvalFunc{ void operator()(MOEOT &moeo){ } } defaultEval; + moeoObjectiveVectorNormalizer defaultNormalizer; + moeoObjectiveVectorNormalizer& normalizer; + eoEvalFunc &eval; + moeoWeightedChebychevDistance distance; + moeoDistanceMetric metric; }; #endif /*moeoWeightedChebychevMetricFitnessASSIGNMENT_H_*/ diff --git a/trunk/paradiseo-moeo/src/metric/moeoDistanceMetric.h b/trunk/paradiseo-moeo/src/metric/moeoDistanceMetric.h index fc5626982..13c642acd 100644 --- a/trunk/paradiseo-moeo/src/metric/moeoDistanceMetric.h +++ b/trunk/paradiseo-moeo/src/metric/moeoDistanceMetric.h @@ -77,10 +77,10 @@ class moeoDistanceMetric : public moeoUnaryMetric < typename MOEOT::ObjectiveVec } private: - moeoObjectiveVectorNormalizer defaultNormalizer; - moeoObjectiveVectorNormalizer& normalizer; moeoObjSpaceDistance& distance; const ObjectiveVector& reference; + moeoObjectiveVectorNormalizer defaultNormalizer; + moeoObjectiveVectorNormalizer& normalizer; }; #endif diff --git a/trunk/paradiseo-moeo/src/selection/moeoDetArchiveSelect.h b/trunk/paradiseo-moeo/src/selection/moeoDetArchiveSelect.h index a786f60a1..81e09e36c 100644 --- a/trunk/paradiseo-moeo/src/selection/moeoDetArchiveSelect.h +++ b/trunk/paradiseo-moeo/src/selection/moeoDetArchiveSelect.h @@ -67,20 +67,20 @@ class moeoDetArchiveSelect : public eoSelect unsigned int archive_size = archive.size(); _dest.resize(0); if ((archive_size >= min) && (archive_size <= max)){ - for (int i=0; i max){ UF_random_generator rndGen; std::vector permutation; - for(int i=0; i < archive_size; i++) + for(unsigned int i=0; i < archive_size; i++) permutation.push_back(i); random_shuffle(permutation.begin(), permutation.end(), rndGen); - for (int i=0; i &_weights){ _weights.clear(); _weights.resize(dim,0); - int max=dim-1; for (unsigned int i=0;i1 && _weights[nums[i]]==depth) { diff --git a/trunk/paradiseo-moeo/src/utils/moeoDummyWeightStrategy.h b/trunk/paradiseo-moeo/src/utils/moeoDummyWeightStrategy.h index 3db57a2e2..3b93dd077 100755 --- a/trunk/paradiseo-moeo/src/utils/moeoDummyWeightStrategy.h +++ b/trunk/paradiseo-moeo/src/utils/moeoDummyWeightStrategy.h @@ -52,7 +52,6 @@ class moeoDummyWeightStrategy: public moeoVariableWeightStrategy * @param _moeot not used */ void operator()(std::vector &_weights,const MOEOT &_moeot){ - double sum=0; for (unsigned int i=0;i<_weights.size();i++){ _weights[i]=(1.0/_weights.size()); } diff --git a/trunk/paradiseo-moeo/test/t-moeoASEEA.cpp b/trunk/paradiseo-moeo/test/t-moeoASEEA.cpp index d3bd43045..9c97f0f6b 100644 --- a/trunk/paradiseo-moeo/test/t-moeoASEEA.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoASEEA.cpp @@ -93,7 +93,7 @@ int main() eoRealInitBounded < Solution > init(bounds); eoPop < Solution > pop(20, init); - for(int i=0; i transform(xover, 0.1, mutation, 0.1); diff --git a/trunk/paradiseo-moeo/test/t-moeoASFAMetric.cpp b/trunk/paradiseo-moeo/test/t-moeoASFAMetric.cpp index a1a576a67..482edb158 100755 --- a/trunk/paradiseo-moeo/test/t-moeoASFAMetric.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoASFAMetric.cpp @@ -74,8 +74,6 @@ class DummyEval: public eoEvalFunc{ int main() { - int res=EXIT_SUCCESS; - std::cout << "[moeoChebyshevMetric] => "; // objective vectors diff --git a/trunk/paradiseo-moeo/test/t-moeoASFAOrMetric.cpp b/trunk/paradiseo-moeo/test/t-moeoASFAOrMetric.cpp index 658fdaae7..b8e019429 100755 --- a/trunk/paradiseo-moeo/test/t-moeoASFAOrMetric.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoASFAOrMetric.cpp @@ -74,8 +74,6 @@ class DummyEval: public eoEvalFunc{ int main() { - int res=EXIT_SUCCESS; - std::cout << "[moeoChebyshevMetric] => "; // objective vectors diff --git a/trunk/paradiseo-moeo/test/t-moeoAggregationFitnessAssignment.cpp b/trunk/paradiseo-moeo/test/t-moeoAggregationFitnessAssignment.cpp index 9e48d6c6e..c81e5ec1c 100755 --- a/trunk/paradiseo-moeo/test/t-moeoAggregationFitnessAssignment.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoAggregationFitnessAssignment.cpp @@ -70,8 +70,6 @@ typedef MOEO < ObjectiveVector, double, double > Solution; int main() { - int res=EXIT_SUCCESS; - std::cout << "[moeoAggregationFitnessAssignment] => "; // objective vectors diff --git a/trunk/paradiseo-moeo/test/t-moeoChebyshevMetric.cpp b/trunk/paradiseo-moeo/test/t-moeoChebyshevMetric.cpp index a14a845ea..ec1be5f96 100755 --- a/trunk/paradiseo-moeo/test/t-moeoChebyshevMetric.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoChebyshevMetric.cpp @@ -74,8 +74,6 @@ class DummyEval: public eoEvalFunc{ int main() { - int res=EXIT_SUCCESS; - std::cout << "[moeoChebyshevMetric] => "; // objective vectors diff --git a/trunk/paradiseo-moeo/test/t-moeoChebyshevOrientedMetric.cpp b/trunk/paradiseo-moeo/test/t-moeoChebyshevOrientedMetric.cpp index 659af28f0..30afece5c 100755 --- a/trunk/paradiseo-moeo/test/t-moeoChebyshevOrientedMetric.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoChebyshevOrientedMetric.cpp @@ -74,8 +74,6 @@ class DummyEval: public eoEvalFunc{ int main() { - int res=EXIT_SUCCESS; - std::cout << "[moeoChebyshevMetric] => "; // objective vectors diff --git a/trunk/paradiseo-moeo/test/t-moeoConstraintFitnessAssignment.cpp b/trunk/paradiseo-moeo/test/t-moeoConstraintFitnessAssignment.cpp index f8a280604..f6f063d44 100755 --- a/trunk/paradiseo-moeo/test/t-moeoConstraintFitnessAssignment.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoConstraintFitnessAssignment.cpp @@ -74,8 +74,6 @@ class DummyEval: public eoEvalFunc{ int main() { - int res=EXIT_SUCCESS; - std::cout << "[moeoAggregationFitnessAssignment] => "; // objective vectors diff --git a/trunk/paradiseo-moeo/test/t-moeoDetArchiveSelect.cpp b/trunk/paradiseo-moeo/test/t-moeoDetArchiveSelect.cpp index 7f9482ee1..b85085d58 100644 --- a/trunk/paradiseo-moeo/test/t-moeoDetArchiveSelect.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoDetArchiveSelect.cpp @@ -102,7 +102,7 @@ int main() // test with max > archive size moeoDetArchiveSelect select1(archive, 10); select1(source, dest); - for(int i=0; i< archive.size(); i++){ + for(unsigned int i=0; i< archive.size(); i++){ assert(dest[i].objectiveVector()[0]==archive[i].objectiveVector()[0]); assert(dest[i].objectiveVector()[1]==archive[i].objectiveVector()[1]); } diff --git a/trunk/paradiseo-moeo/test/t-moeoHC.cpp b/trunk/paradiseo-moeo/test/t-moeoHC.cpp index f6e20549d..a2b42da86 100644 --- a/trunk/paradiseo-moeo/test/t-moeoHC.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoHC.cpp @@ -266,7 +266,6 @@ class selectMove: public moMoveSelect int main() { std::string test_result; - int return_value; Solution solution; diff --git a/trunk/paradiseo-moeo/test/t-moeoTS.cpp b/trunk/paradiseo-moeo/test/t-moeoTS.cpp index 9f4b791ce..b8c6e310c 100644 --- a/trunk/paradiseo-moeo/test/t-moeoTS.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoTS.cpp @@ -246,7 +246,6 @@ class solutionSingler : public moeoSingleObjectivization int main() { std::string test_result; - int return_value; Solution solution; diff --git a/trunk/paradiseo-moeo/test/t-moeoVFAS.cpp b/trunk/paradiseo-moeo/test/t-moeoVFAS.cpp index 951ddd22e..c5e2f5079 100644 --- a/trunk/paradiseo-moeo/test/t-moeoVFAS.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoVFAS.cpp @@ -277,7 +277,6 @@ class selectMove: public moMoveSelect int main() { std::string test_result; - int return_value; Solution solution;