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

minor changes

Browse source
This commit is contained in:
LPTK 2013-06-14 17:03:55 +02:00
commit 34dcdb181c
6 changed files with 127 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

43
mo/src/continuator/moFitnessVarianceStat.h
View file

@ -1,35 +1,26 @@
/* /*
<moBestFitnessStat.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau (c) Thales group, 2010
This software is governed by the CeCILL license under French law and This library is free software; you can redistribute it and/or
abiding by the rules of distribution of free software. You can use, modify it under the terms of the GNU Lesser General Public
modify and/ or redistribute the software under the terms of the CeCILL License as published by the Free Software Foundation;
license as circulated by CEA, CNRS and INRIA at the following URL version 2 of the License.
"http://www.cecill.info".
As a counterpart to the access to the source code and rights to copy, This library is distributed in the hope that it will be useful,
modify and redistribute granted by the license, users are provided only but WITHOUT ANY WARRANTY; without even the implied warranty of
with a limited warranty and the software's author, the holder of the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
economic rights, and the successive licensors have only limited liability. Lesser General Public License for more details.
In this respect, the user's attention is drawn to the risks associated You should have received a copy of the GNU Lesser General Public
with loading, using, modifying and/or developing or reproducing the License along with this library; if not, write to the Free Software
software by the user in light of its specific status of free software, Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
that may mean that it is complicated to manipulate, and that also
therefore means that it is reserved for developers and experienced Contact: http://eodev.sourceforge.net
professionals having in-depth computer knowledge. Users are therefore
encouraged to load and test the software's suitability as regards their Authors:
requirements in conditions enabling the security of their systems and/or Lionel Parreaux <lionel.parreaux@gmail.com>
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 moFitnessVarianceStat_h #ifndef moFitnessVarianceStat_h

46
mo/src/coolingSchedule/moTrikiCoolingSchedule.h
View file

@ -1,37 +1,27 @@
/* /*
<moTrikiCoolingSchedule.h>
Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
(C) OPAC Team, LIFL, 2002-2008
Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) (c) Thales group, 2010
This software is governed by the CeCILL license under French law and This library is free software; you can redistribute it and/or
abiding by the rules of distribution of free software. You can use, modify it under the terms of the GNU Lesser General Public
modify and/ or redistribute the software under the terms of the CeCILL License as published by the Free Software Foundation;
license as circulated by CEA, CNRS and INRIA at the following URL version 2 of the License.
"http://www.cecill.info".
As a counterpart to the access to the source code and rights to copy, This library is distributed in the hope that it will be useful,
modify and redistribute granted by the license, users are provided only but WITHOUT ANY WARRANTY; without even the implied warranty of
with a limited warranty and the software's author, the holder of the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
economic rights, and the successive licensors have only limited liability. Lesser General Public License for more details.
In this respect, the user's attention is drawn to the risks associated You should have received a copy of the GNU Lesser General Public
with loading, using, modifying and/or developing or reproducing the License along with this library; if not, write to the Free Software
software by the user in light of its specific status of free software, Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
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: http://eodev.sourceforge.net
Contact: paradiseo-help@lists.gforge.inria.fr
*/ Authors:
Lionel Parreaux <lionel.parreaux@gmail.com>
*/
#ifndef _moTrikiCoolingSchedule_h #ifndef _moTrikiCoolingSchedule_h
#define _moTrikiCoolingSchedule_h #define _moTrikiCoolingSchedule_h

14
mo/src/explorer/moMetropolisHastingExplorer.h
View file

@ -68,7 +68,17 @@ public:
* @param _solNeighborComparator a solution vs neighbor comparator * @param _solNeighborComparator a solution vs neighbor comparator
* @param _nbStep maximum number of step to do * @param _nbStep maximum number of step to do
*/ */
moMetropolisHastingExplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval, moNeighborComparator<Neighbor>& _neighborComparator, moSolNeighborComparator<Neighbor>& _solNeighborComparator, unsigned int _nbStep) : moNeighborhoodExplorer<Neighbor>(_neighborhood, _eval), neighborComparator(_neighborComparator), solNeighborComparator(_solNeighborComparator), nbStep(_nbStep) { moMetropolisHastingExplorer(
Neighborhood& _neighborhood,
moEval<Neighbor>& _eval,
moNeighborComparator<Neighbor>& _neighborComparator,
moSolNeighborComparator<Neighbor>& _solNeighborComparator,
unsigned int _nbStep
): moNeighborhoodExplorer<Neighbor>(_neighborhood, _eval),
neighborComparator(_neighborComparator),
solNeighborComparator(_solNeighborComparator),
nbStep(_nbStep)
{
isAccept = false; isAccept = false;
if (!neighborhood.isRandom()) { if (!neighborhood.isRandom()) {
std::cout << "moMetropolisHastingExplorer::Warning -> the neighborhood used is not random" << std::endl; std::cout << "moMetropolisHastingExplorer::Warning -> the neighborhood used is not random" << std::endl;
@ -140,7 +150,7 @@ public:
virtual bool accept(EOT & _solution) { virtual bool accept(EOT & _solution) {
double alpha=0.0; double alpha=0.0;
if (neighborhood.hasNeighbor(_solution)) { if (neighborhood.hasNeighbor(_solution)) {
if (solNeighborComparator(_solution, selectedNeighbor)) if (solNeighborComparator(_solution, selectedNeighbor))
isAccept = true; isAccept = true;
else { else {
if (_solution.fitness() != 0) { if (_solution.fitness() != 0) {

25
mo/src/sampling/moStdDevEstimator.h
View file

@ -1,3 +1,28 @@
/*
(c) Thales group, 2010
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;
version 2 of the License.
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: http://eodev.sourceforge.net
Authors:
Lionel Parreaux <lionel.parreaux@gmail.com>
*/
#ifndef __moStdDevEstimator_h__ #ifndef __moStdDevEstimator_h__
#define __moStdDevEstimator_h__ #define __moStdDevEstimator_h__

25
mo/test/t-moFitnessVarianceStat.cpp
View file

@ -1,3 +1,28 @@
/*
(c) Thales group, 2010
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;
version 2 of the License.
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: http://eodev.sourceforge.net
Authors:
Lionel Parreaux <lionel.parreaux@gmail.com>
*/
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// t-moFitnessNeighborStat.cpp // t-moFitnessNeighborStat.cpp
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

25
mo/test/t-moStdDevEstimator.cpp
View file

@ -1,3 +1,28 @@
/*
(c) Thales group, 2010
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;
version 2 of the License.
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: http://eodev.sourceforge.net
Authors:
Lionel Parreaux <lionel.parreaux@gmail.com>
*/
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// t-moStdDevEstimator.cpp // t-moStdDevEstimator.cpp
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------