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@1549 331e1502-861f-0410-8da2-ba01fb791d7f

Browse source
This commit is contained in:
jhumeau 2009-03-13 16:51:34 +00:00
commit 6afb4bf073
8 changed files with 254 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
contribution/branches/MOLS/src2/moeoExhaustiveUnvisitedSelect.h
View file

@ -41,14 +41,14 @@
#include <eo>
#include <moeo>
#include <moeoUnvisitedSelect.h>
/**
* TODO
*/
template < class Move >
class moeoExhaustiveUnvisitedSelect : public moeoUnvisitedSelect < Move >
template < class MOEOT >
class moeoExhaustiveUnvisitedSelect : public moeoUnvisitedSelect < MOEOT >
{
typedef typename Move::EOType MOEOT;
public:

5
contribution/branches/MOLS/src2/moeoNumberUnvisitedSelect.h
View file

@ -45,10 +45,9 @@
/**
* TODO
*/
template < class Move >
class moeoNumberUnvisitedSelect : public moeoUnvisitedSelect < Move >
template < class MOEOT >
class moeoNumberUnvisitedSelect : public moeoUnvisitedSelect < MOEOT >
{
typedef typename Move::EOType MOEOT;
public:

2
contribution/branches/MOLS/src2/moeoRestartLS.h
View file

@ -59,7 +59,7 @@ public:
eoEvalFunc < MOEOT > & _eval,
eoContinue < MOEOT > & _continuator,
moeoPopNeighborhoodExplorer < Move > & _explorer,
moeoUnvisitedSelect < Move > & _select,
moeoUnvisitedSelect < MOEOT > & _select,
moeoArchive < MOEOT > & _globalArchive,
std::string _fileName) :
init(_init), eval(_eval), continuator(_continuator), ls(continuator, _eval, internalArchive, _explorer, _select), globalArchive(_globalArchive), fileName(_fileName), count(0) {}

4
contribution/branches/MOLS/src2/moeoUnifiedDominanceBasedLS.h
View file

@ -58,7 +58,7 @@ public:
eoEvalFunc < MOEOT > & _eval,
moeoArchive < MOEOT > & _archive,
moeoPopNeighborhoodExplorer < Move > & _explorer,
moeoUnvisitedSelect < Move > & _select) :
moeoUnvisitedSelect < MOEOT > & _select) :
continuator(_continuator), loopEval(_eval), popEval(loopEval), archive(_archive), explorer(_explorer), select(_select) {}
@ -96,7 +96,7 @@ protected:
eoPopEvalFunc < MOEOT > & popEval;
moeoArchive < MOEOT > & archive;
moeoPopNeighborhoodExplorer < Move > & explorer;
moeoUnvisitedSelect < Move > & select;
moeoUnvisitedSelect < MOEOT > & select;
class moeoContinue : public eoUF < eoPop < MOEOT > &, bool >
{

4
contribution/branches/MOLS/src2/moeoUnvisitedSelect.h
View file

@ -45,7 +45,7 @@
/**
* TODO
*/
template < class Move >
class moeoUnvisitedSelect: public eoUF < eoPop < typename Move::EOType> &, std::vector< unsigned int > >{};
template < class MOEOT >
class moeoUnvisitedSelect: public eoUF < eoPop < MOEOT > &, std::vector< unsigned int > >{};
#endif /*MOEOUNVISITEDSELECT_H_*/