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

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1454 331e1502-861f-0410-8da2-ba01fb791d7f

Browse source
This commit is contained in:
jhumeau 2009-02-19 16:35:36 +00:00
commit 69574c293a
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
contribution/branches/MOLS/src/eoTenTimeContinue.h
View file

@ -29,13 +29,13 @@
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <fstream> #include <cfstream>
#include <eoContinue.h> #include <eoContinue.h>
/** /**
Timed continuator: continues until a number of seconds is used Timed continuator: continues until a number of seconds is used
*/ */
template< class EOT> template< class EOT>
class eotenTimeContinue: public eoContinue<EOT> class eoTenTimeContinue: public eoContinue<EOT>
{ {
public: public:
@ -51,7 +51,7 @@ public:
//traitement //traitement
std::ostringstream os; std::ostringstream os;
os << fileName << "." << id; os << fileName << "." << id;
ofstream outfile(os.str(), ios::app); ofstream outfile(os.str(), ios::app);
for(unsigned int i=0 ; i < _pop.size(); i++){ for(unsigned int i=0 ; i < _pop.size(); i++){
for(unsigned int j=0 ; j<EOT::ObjectiveVector::nObjectives(); j++){ for(unsigned int j=0 ; j<EOT::ObjectiveVector::nObjectives(); j++){

4
contribution/branches/MOLS/src/moeoOneSolOneNeighborExpl.h
View file

@ -73,7 +73,7 @@ public:
while(_src[i].flag() != 0) while(_src[i].flag() != 0)
i++; i++;
moveInit(move, _src[i]); moveInit(move, _src[i]);
_src[i].flag()=-1; _src[i].flag(-1);
} }
else else
{ {
@ -85,7 +85,7 @@ public:
while(_src[i].flag() != 0) while(_src[i].flag() != 0)
i++; i++;
moveInit(move, _src[i]); moveInit(move, _src[i]);
_src[i].flag()=-1; _src[i].flag(-1);
} }
} }
// ttt // ttt

2
contribution/branches/MOLS/src/moeoUnifiedDominanceBasedLS.h
View file

@ -43,7 +43,6 @@
#include <moeo> #include <moeo>
#include <moeoPopNeighborhoodExplorer.h> #include <moeoPopNeighborhoodExplorer.h>
#include <moeoPopLS.h> #include <moeoPopLS.h>
#include <eoTenTimeContinue.h>
/** /**
* An easy class to design multi-objective evolutionary algorithms. * An easy class to design multi-objective evolutionary algorithms.
@ -93,7 +92,6 @@ protected:
eoContinue < MOEOT > & continuator; eoContinue < MOEOT > & continuator;
template<class MOEOT>
class moeoContinue : public eoUF < eoPop < MOEOT > &, bool > class moeoContinue : public eoUF < eoPop < MOEOT > &, bool >
{ {
public: public: