update lesson1 new version
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@268 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
5df71ee73a
commit
97b9338bef
14 changed files with 454 additions and 689 deletions
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
//-----------------------------------------------------------------------------
|
||||
// FlowShopOpMutationShift.h
|
||||
// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006
|
||||
// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2007
|
||||
/*
|
||||
This library...
|
||||
|
||||
|
|
@ -10,33 +10,29 @@
|
|||
*/
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#ifndef _FlowShopOpMutationShift_h
|
||||
#define _FlowShopOpMutationShift_h
|
||||
#ifndef FLOWSHOPOPMUTATIONSHIFT_H_
|
||||
#define FLOWSHOPOPMUTATIONSHIFT_H_
|
||||
|
||||
#include <eoOp.h>
|
||||
|
||||
#include "FlowShop.h"
|
||||
|
||||
/**
|
||||
* Functor
|
||||
* Shift mutation operator for flow-shop
|
||||
*/
|
||||
class FlowShopOpMutationShift:public eoMonOp < FlowShop >
|
||||
{
|
||||
class FlowShopOpMutationShift: public eoMonOp<FlowShop> {
|
||||
|
||||
public:
|
||||
|
||||
|
||||
/**
|
||||
* default constructor
|
||||
*/
|
||||
FlowShopOpMutationShift ()
|
||||
{
|
||||
}
|
||||
|
||||
FlowShopOpMutationShift() {}
|
||||
|
||||
/**
|
||||
* the class name (used to display statistics)
|
||||
*/
|
||||
string className () const
|
||||
{
|
||||
string className() const {
|
||||
return "FlowShopOpMutationShift";
|
||||
}
|
||||
|
||||
|
|
@ -44,49 +40,42 @@ public:
|
|||
* modifies the parent with a shift mutation
|
||||
* @param FlowShop & _genotype the parent genotype (will be modified)
|
||||
*/
|
||||
bool operator () (FlowShop & _genotype)
|
||||
{
|
||||
bool operator()(FlowShop & _genotype) {
|
||||
bool isModified;
|
||||
int direction;
|
||||
unsigned tmp;
|
||||
|
||||
|
||||
// schedulings
|
||||
vector < unsigned >initScheduling = _genotype.getScheduling ();
|
||||
vector < unsigned >resultScheduling = initScheduling;
|
||||
|
||||
vector<unsigned> initScheduling = _genotype.getScheduling();
|
||||
vector<unsigned> resultScheduling = initScheduling;
|
||||
|
||||
// computation of the 2 random points
|
||||
unsigned point1, point2;
|
||||
do
|
||||
{
|
||||
point1 = rng.random (resultScheduling.size ());
|
||||
point2 = rng.random (resultScheduling.size ());
|
||||
}
|
||||
while (point1 == point2);
|
||||
|
||||
do {
|
||||
point1 = rng.random(resultScheduling.size());
|
||||
point2 = rng.random(resultScheduling.size());
|
||||
} while (point1 == point2);
|
||||
|
||||
// direction
|
||||
if (point1 < point2)
|
||||
direction = 1;
|
||||
else
|
||||
direction = -1;
|
||||
if (point1 < point2) direction = 1;
|
||||
else direction = -1;
|
||||
// mutation
|
||||
tmp = resultScheduling[point1];
|
||||
for (unsigned i = point1; i != point2; i += direction)
|
||||
resultScheduling[i] = resultScheduling[i + direction];
|
||||
for(unsigned i=point1 ; i!=point2 ; i+=direction)
|
||||
resultScheduling[i] = resultScheduling[i+direction];
|
||||
resultScheduling[point2] = tmp;
|
||||
|
||||
|
||||
// update (if necessary)
|
||||
if (resultScheduling != initScheduling)
|
||||
{
|
||||
// update
|
||||
_genotype.setScheduling (resultScheduling);
|
||||
// the genotype has been modified
|
||||
isModified = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
// the genotype has not been modified
|
||||
isModified = false;
|
||||
}
|
||||
if (resultScheduling != initScheduling) {
|
||||
// update
|
||||
_genotype.setScheduling(resultScheduling);
|
||||
// the genotype has been modified
|
||||
isModified = true;
|
||||
}
|
||||
else {
|
||||
// the genotype has not been modified
|
||||
isModified = false;
|
||||
}
|
||||
|
||||
// return 'true' if the genotype has been modified
|
||||
return isModified;
|
||||
|
|
@ -94,4 +83,4 @@ public:
|
|||
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif /*FLOWSHOPOPMUTATIONSHIFT_H_*/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue