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

AUTHORS modification

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@152 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
liefooga 2007-01-15 13:22:55 +00:00
commit 4c21c72510
137 changed files with 2356 additions and 2369 deletions
Download patch file Download diff file Expand all files Collapse all files

27
trunk/paradiseo-moeo/tutorials/lesson1/FlowShop.h
View file

@ -1,25 +1,14 @@
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
// "FlowShop.h"
//-----------------------------------------------------------------------------
// FlowShop.h
// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006
/*
This library...
// (c) OPAC Team, LIFL, April 2006
/* This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Contact: Arnaud.Liefooghe@lifl.fr
*/
Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr
*/
//-----------------------------------------------------------------------------
#ifndef _FlowShop_h
#define _FlowShop_h

41
trunk/paradiseo-moeo/tutorials/lesson1/FlowShopBenchmarkParser.h
View file

@ -1,25 +1,14 @@
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
// "FlowShopBenchmarkParser.h"
//-----------------------------------------------------------------------------
// FlowShopBenchmarkParser.h
// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006
/*
This library...
// (c) OPAC Team, LIFL, March 2006
/* This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Contact: Arnaud.Liefooghe@lifl.fr
*/
Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr
*/
//-----------------------------------------------------------------------------
#ifndef _FlowShopBenchmarkParser_h
#define _FlowShopBenchmarkParser_h
@ -38,7 +27,8 @@ const static
* Class to handle parameters of a flow-shop instance from a benchmark file
* benchmark files are available at www.lifl.fr/~basseur/BenchsUncertain/
*/
class FlowShopBenchmarkParser
class
FlowShopBenchmarkParser
{
public:
@ -74,7 +64,8 @@ public:
* the processing times
*/
const
std::vector < std::vector < unsigned > >
std::vector <
std::vector < unsigned > >
getP ()
{
return p;
@ -144,9 +135,11 @@ private:
void
init (const string _benchmarkFileName)
{
string buffer;
string
buffer;
string::size_type start, end;
ifstream inputFile (_benchmarkFileName.data (), ios::in);
ifstream
inputFile (_benchmarkFileName.data (), ios::in);
// opening of the benchmark file
if (!inputFile)
cerr << "*** ERROR : Unable to open the benchmark file '" <<
@ -161,7 +154,7 @@ private:
getline (inputFile, buffer, '\n');
// processing times and due-dates
p = std::vector < std::vector < unsigned > > (M, N);
d = std::vector < unsigned > (N);
d = std::vector < unsigned >(N);
// for each job...
for (unsigned j = 0; j < N; j++)
{

28
trunk/paradiseo-moeo/tutorials/lesson1/FlowShopEA.cpp
View file

@ -1,26 +1,14 @@
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
// "FlowShopEA.cpp"
// (c) OPAC Team, LIFL, October 2006
/* This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Contact: Arnaud.Liefooghe@lifl.fr
*/
//-----------------------------------------------------------------------------
// FlowShopEA.cpp
// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006
/*
This library...
Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr
*/
//-----------------------------------------------------------------------------
// Miscilaneous include and declaration
using namespace std;

43
trunk/paradiseo-moeo/tutorials/lesson1/FlowShopEval.h
View file

@ -1,25 +1,14 @@
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
// "FlowShopEval.h"
//-----------------------------------------------------------------------------
// FlowShopEval.h
// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006
/*
This library...
// (c) OPAC Team, LIFL, March 2006
/* This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Contact: Arnaud.Liefooghe@lifl.fr
*/
Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr
*/
//-----------------------------------------------------------------------------
#ifndef _FlowShopEval_h
#define _FlowShopEval_h
@ -63,7 +52,7 @@ public:
* computation of the multi-objective evaluation of an eoFlowShop object
* @param FlowShop & _eo the FlowShop object to evaluate
*/
void operator () (FlowShop & _eo)
void operator () (FlowShop & _eo)
{
FlowShopFitness fitness;
fitness[0] = tardiness (_eo);
@ -82,9 +71,9 @@ private:
/** number of jobs */
unsigned N;
/** p[i][j] = processing time of job j on machine i */
std::vector < std::vector < unsigned > > p;
std::vector < std::vector < unsigned > >p;
/** d[j] = due-date of the job j */
std::vector < unsigned > d;
std::vector < unsigned >d;
@ -98,7 +87,7 @@ private:
vector < unsigned >scheduling = _eo.getScheduling ();
// completion times computation for each job on each machine
// C[i][j] = completion of the jth job of the scheduling on the ith machine
std::vector < std::vector < unsigned > > C = completionTime (_eo);
std::vector < std::vector < unsigned > >C = completionTime (_eo);
// fitness == C[M-1][scheduling[N-1]];
return C[M - 1][scheduling[N - 1]];
}
@ -115,7 +104,7 @@ private:
vector < unsigned >scheduling = _eo.getScheduling ();
// completion times computation for each job on each machine
// C[i][j] = completion of the jth job of the scheduling on the ith machine
std::vector < std::vector < unsigned > > C = completionTime (_eo);
std::vector < std::vector < unsigned > >C = completionTime (_eo);
// tardiness computation
unsigned long sum = 0;
for (unsigned j = 0; j < N; j++)
@ -134,10 +123,10 @@ private:
* C[i][j] = completion of the jth job of the scheduling on the ith machine
* @param const FlowShop _eo the genotype to evaluate
*/
std::vector < std::vector < unsigned > > completionTime (FlowShop _eo)
std::vector < std::vector < unsigned > >completionTime (FlowShop _eo)
{
vector < unsigned > scheduling = _eo.getScheduling ();
std::vector < std::vector < unsigned > > C (M, N);
vector < unsigned >scheduling = _eo.getScheduling ();
std::vector < std::vector < unsigned > >C (M, N);
C[0][scheduling[0]] = p[0][scheduling[0]];
for (unsigned j = 1; j < N; j++)
C[0][scheduling[j]] = C[0][scheduling[j - 1]] + p[0][scheduling[j]];

27
trunk/paradiseo-moeo/tutorials/lesson1/FlowShopFitness.h
View file

@ -1,25 +1,14 @@
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
// "FlowShopFitness.h"
//-----------------------------------------------------------------------------
// FlowShopFitness.h
// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006
/*
This library...
// (c) OPAC Team, LIFL, March 2006
/* This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Contact: Arnaud.Liefooghe@lifl.fr
*/
Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr
*/
//-----------------------------------------------------------------------------
#ifndef _FlowShopFitness_h
#define _FlowShopFitness_h

29
trunk/paradiseo-moeo/tutorials/lesson1/FlowShopInit.h
View file

@ -1,25 +1,14 @@
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
// "FlowShopInit.h"
//-----------------------------------------------------------------------------
// FlowShopInit.h
// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006
/*
This library...
// (c) OPAC Team, LIFL, March 2006
/* This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Contact: Arnaud.Liefooghe@lifl.fr
*/
Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr
*/
//-----------------------------------------------------------------------------
#ifndef _FlowShopInit_h
#define _FlowShopInit_h
@ -49,7 +38,7 @@ public:
* randomize a genotype
* @param FlowShop & _genotype a genotype that has been default-constructed
*/
void operator () (FlowShop & _genotype)
void operator () (FlowShop & _genotype)
{
// scheduling vector
vector < unsigned >scheduling (N);

29
trunk/paradiseo-moeo/tutorials/lesson1/FlowShopOpCrossoverQuad.h
View file

@ -1,25 +1,14 @@
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
// "FlowShopOpCrossoverQuad.h"
//-----------------------------------------------------------------------------
// FlowShopOpCrossoverQuad.h
// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006
/*
This library...
// (c) OPAC Team, LIFL, April 2006
/* This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Contact: Arnaud.Liefooghe@lifl.fr
*/
Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr
*/
//-----------------------------------------------------------------------------
#ifndef _FlowShopOpCrossoverQuad_h
#define _FlowShopOpCrossoverQuad_h
@ -55,7 +44,7 @@ public:
* @param FlowShop & _genotype1 the first parent
* @param FlowShop & _genotype2 the second parent
*/
bool operator () (FlowShop & _genotype1, FlowShop & _genotype2)
bool operator () (FlowShop & _genotype1, FlowShop & _genotype2)
{
bool oneAtLeastIsModified;

29
trunk/paradiseo-moeo/tutorials/lesson1/FlowShopOpMutationExchange.h
View file

@ -1,25 +1,14 @@
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
// "FlowShopOpMutationExchange.h"
//-----------------------------------------------------------------------------
// FlowShopOpMutationExchange.h
// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006
/*
This library...
// (c) OPAC Team, LIFL, March 2006
/* This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Contact: Arnaud.Liefooghe@lifl.fr
*/
Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr
*/
//-----------------------------------------------------------------------------
#ifndef _FlowShopOpMutationExchange_h
#define _FlowShopOpMutationExchange_h
@ -55,7 +44,7 @@ public:
* modifies the parent with an exchange mutation
* @param FlowShop & _genotype the parent genotype (will be modified)
*/
bool operator () (FlowShop & _genotype)
bool operator () (FlowShop & _genotype)
{
bool isModified;

29
trunk/paradiseo-moeo/tutorials/lesson1/FlowShopOpMutationShift.h
View file

@ -1,25 +1,14 @@
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
// "FlowShopOpMutationShift.h"
//-----------------------------------------------------------------------------
// FlowShopOpMutationShift.h
// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006
/*
This library...
// (c) OPAC Team, LIFL, March 2006
/* This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Contact: Arnaud.Liefooghe@lifl.fr
*/
Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr
*/
//-----------------------------------------------------------------------------
#ifndef _FlowShopOpMutationShift_h
#define _FlowShopOpMutationShift_h
@ -55,7 +44,7 @@ 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;

29
trunk/paradiseo-moeo/tutorials/lesson1/make_eval_FlowShop.h
View file

@ -1,25 +1,14 @@
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
// "make_eval_FlowShop.h"
//-----------------------------------------------------------------------------
// make_eval_FlowShop.h
// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006
/*
This library...
// (c) OPAC Team, LIFL, March 2006
/* This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Contact: Arnaud.Liefooghe@lifl.fr
*/
Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr
*/
//-----------------------------------------------------------------------------
#ifndef _make_eval_FlowShop_h
#define _make_eval_FlowShop_h
@ -59,7 +48,7 @@ eoEvalFuncCounter < FlowShop > &do_make_eval (eoParser & _parser,
FlowShopBenchmarkParser fParser (benchmarkFileName);
unsigned M = fParser.getM ();
unsigned N = fParser.getN ();
std::vector < std::vector < unsigned > > p = fParser.getP ();
std::vector < std::vector < unsigned > >p = fParser.getP ();
std::vector < unsigned >d = fParser.getD ();
// build of the initializer (a pointer, stored in the eoState)

27
trunk/paradiseo-moeo/tutorials/lesson1/make_genotype_FlowShop.h
View file

@ -1,25 +1,14 @@
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
// "make_genotype_FlowShop.h"
//-----------------------------------------------------------------------------
// make_genotype_FlowShop.h
// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006
/*
This library...
// (c) OPAC Team, LIFL, March 2006
/* This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Contact: Arnaud.Liefooghe@lifl.fr
*/
Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr
*/
//-----------------------------------------------------------------------------
#ifndef _make_genotype_FlowShop_h
#define _make_genotype_FlowShop_h

27
trunk/paradiseo-moeo/tutorials/lesson1/make_op_FlowShop.h
View file

@ -1,25 +1,14 @@
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
// "make_op_FlowShop.h"
//-----------------------------------------------------------------------------
// make_op_FlowShop.h
// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006
/*
This library...
// (c) OPAC Team, LIFL, March 2006
/* This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Contact: Arnaud.Liefooghe@lifl.fr
*/
Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr
*/
//-----------------------------------------------------------------------------
#ifndef _make_op_FlowShop_h
#define _make_op_FlowShop_h