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

ILS v1 :)

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1727 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-03-29 15:58:25 +00:00
commit 6bb2a4a822
21 changed files with 330 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

9
trunk/paradiseo-mo/src/perturb/moMonOpPerturb.h
View file

@ -30,8 +30,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moMonOpPerturb_h
#define _moMonOpPerturb_h
#include <eoEvalFunc.h>
#include <eoOp.h>
#include <perturb/moPerturbation.h>
#include <memory/moDummyMemory.h>
/**
* Perturbation operator using only a eoMonOp
@ -46,7 +48,7 @@ public:
* Default Constructor
* @param _monOp an eoMonOp (pertubation operator)
*/
moMonOpPerturb(eoMonOp<EOT>& _monOp):monOp(_monOp){}
moMonOpPerturb(eoMonOp<EOT>& _monOp, eoEvalFunc<EOT>& _fullEval):monOp(_monOp), fullEval(_fullEval){}
/**
* Apply monOp on the solution
@ -54,12 +56,15 @@ public:
* @return value of monOp
*/
bool operator()(EOT& _solution){
return monOp(_solution);
bool res = monOp(_solution);
fullEval(_solution);
return res;
}
private:
/** monOp */
eoMonOp<EOT>& monOp;
eoEvalFunc<EOT>& fullEval;
};
#endif