ILS v1 :)
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1727 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
6de0a60f27
commit
6bb2a4a822
2 changed files with 330 additions and 60 deletions
|
|
@ -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
|
||||
|
|
|
|||
43
trunk/paradiseo-mo/src/perturb/moPerturbation.h
Normal file
43
trunk/paradiseo-mo/src/perturb/moPerturbation.h
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
/*
|
||||
<moPertubation.h>
|
||||
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
|
||||
|
||||
Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau
|
||||
|
||||
This software is governed by the CeCILL license under French law and
|
||||
abiding by the rules of distribution of free software. You can ue,
|
||||
modify and/ or redistribute the software under the terms of the CeCILL
|
||||
license as circulated by CEA, CNRS and INRIA at the following URL
|
||||
"http://www.cecill.info".
|
||||
|
||||
In this respect, the user's attention is drawn to the risks associated
|
||||
with loading, using, modifying and/or developing or reproducing the
|
||||
software by the user in light of its specific status of free software,
|
||||
that may mean that it is complicated to manipulate, and that also
|
||||
therefore means that it is reserved for developers and experienced
|
||||
professionals having in-depth computer knowledge. Users are therefore
|
||||
encouraged to load and test the software's suitability as regards their
|
||||
requirements in conditions enabling the security of their systems and/or
|
||||
data to be ensured and, more generally, to use and operate it in the
|
||||
same conditions as regards security.
|
||||
The fact that you are presently reading this means that you have had
|
||||
knowledge of the CeCILL license and that you accept its terms.
|
||||
|
||||
ParadisEO WebSite : http://paradiseo.gforge.inria.fr
|
||||
Contact: paradiseo-help@lists.gforge.inria.fr
|
||||
*/
|
||||
|
||||
#ifndef _moPertubation_h
|
||||
#define _moPertubation_h
|
||||
|
||||
#include <eoOp.h>
|
||||
#include <memory/moMemory.h>
|
||||
|
||||
/**
|
||||
* Abstract class for Perturbation operator
|
||||
*/
|
||||
template< class Neighbor >
|
||||
class moPerturbation : public eoMonOp<typename Neighbor::EOT>, virtual public moMemory<Neighbor> {
|
||||
};
|
||||
|
||||
#endif
|
||||
Loading…
Reference in a new issue