nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minor modifications for GCC 4.3.0 compatibility

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1239 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jboisson 2008-09-23 21:36:40 +00:00
commit 33f3b82974
14 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/paradiseo-moeo/src/algo/moeoEasyEA.h
View file

@ -169,14 +169,20 @@ class moeoEasyEA: public moeoEA < MOEOT >
unsigned int pSize = _pop.size();
offspring.clear(); // new offspring
// fitness and diversity assignment (if you want to or if it is the first generation)
//std::cout << "eval ou first time" << std::endl;
if (evalFitAndDivBeforeSelection || firstTime)
{
firstTime = false;
//std::cout << "fitness eval" << std::endl;
fitnessEval(_pop);
//std::cout << "diversity eval" << std::endl;
diversityEval(_pop);
}
//std::cout << "breed" << std::endl;
breed(_pop, offspring);
//std::cout << "pop eval" << std::endl;
popEval(_pop, offspring); // eval of parents + offspring if necessary
//std::cout << "replace" << std::endl;
replace(_pop, offspring); // after replace, the new pop. is in _pop
if (pSize > _pop.size())
{

2
trunk/paradiseo-moeo/src/do/make_checkpoint_moeo.h
View file

@ -38,6 +38,7 @@
#ifndef MAKE_CHECKPOINT_MOEO_H_
#define MAKE_CHECKPOINT_MOEO_H_
#include <limits.h>
#include <stdlib.h>
#include <sstream>
#include <eoContinue.h>
@ -52,6 +53,7 @@
#include <utils/moeoArchiveObjectiveVectorSavingUpdater.h>
#include <utils/moeoBinaryMetricSavingUpdater.h>
bool testDirRes(std::string _dirName, bool _erase);
/**