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

rename files

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1754 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-04-28 15:50:22 +00:00
commit 0720d5f05d
14 changed files with 144 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/paradiseo-mo/src/algo/moFirstImprHC.h
View file

@ -31,7 +31,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#define _moFirstImprHC_h
#include <algo/moLocalSearch.h>
#include <explorer/moFirstImprExplorer.h>
#include <explorer/moFirstImprHCexplorer.h>
#include <continuator/moTrueContinuator.h>
#include <eval/moEval.h>
#include <eoEvalFunc.h>
@ -88,7 +88,7 @@ private:
// compare the fitness values of the solution and the neighbor: true if strictly greater
moSolNeighborComparator<Neighbor> defaultSolNeighborComp;
// the explorer of the first improvement HC
moFirstImprExplorer<Neighbor> explorer;
moFirstImprHCexplorer<Neighbor> explorer;
};
#endif

4
trunk/paradiseo-mo/src/algo/moRandomBestHC.h
View file

@ -31,7 +31,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#define _moRandomBestHC_h
#include <algo/moLocalSearch.h>
#include <explorer/moRandomBestHCExplorer.h>
#include <explorer/moRandomBestHCexplorer.h>
#include <continuator/moTrueContinuator.h>
#include <eval/moEval.h>
#include <eoEvalFunc.h>
@ -88,7 +88,7 @@ private:
// compare the fitness values of the solution and the neighbor: true if strictly greater
moSolNeighborComparator<Neighbor> defaultSolNeighborComp;
// the explorer of the HC with random choice of the best solution
moRandomBestHCExplorer<Neighbor> explorer;
moRandomBestHCexplorer<Neighbor> explorer;
};
#endif

14
trunk/paradiseo-mo/src/coolingSchedule/moDynSpanCoolingSchedule.h
View file

@ -53,7 +53,7 @@ public:
* @param _spanNoMove maximum number of no improvement with equal temperature
* @param _nbSpan maximum number of span with no improvmement before stopping the search
*/
moDynSpanCoolingSchedule(double _initT, double _alpha, unsigned _spanMove, unsigned _spanNoMove, unsigned _nbSpan) : initT(_initT), alpha(_alpha), spanMove(_spanMove), spanNoMove(_spanNoMove), nbSpan(_nbSpan) {
moDynSpanCoolingSchedule(double _initT, double _alpha, unsigned int _spanMove, unsigned int _spanNoMove, unsigned int _nbSpan) : initT(_initT), alpha(_alpha), spanMove(_spanMove), spanNoMove(_spanNoMove), nbSpan(_nbSpan) {
}
/**
@ -101,12 +101,22 @@ public:
private:
// initial temperature
double initT;
// coefficient of decrease
double alpha;
//
unsigned int spanMove;
//
unsigned int spanNoMove;
// maximum number of iterations at the same temperature
unsigned int span;
unsigned int nbSpan;
// threshold temperature
double finalT;
// number of steps with the same temperature
unsigned int step;
};

12
trunk/paradiseo-mo/src/explorer/moFirstImprExplorer.h → trunk/paradiseo-mo/src/explorer/moFirstImprHCexplorer.h
View file

@ -1,5 +1,5 @@
/*
<moFirstImprExplorer.h>
<moFirstImprHCexplorer.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau
@ -32,8 +32,8 @@
Contact: paradiseo-help@lists.gforge.inria.fr
*/
#ifndef _moFirstImprexplorer_h
#define _moFirstImprexplorer_h
#ifndef _moFirstImprHCexplorer_h
#define _moFirstImprHCexplorer_h
#include <explorer/moNeighborhoodExplorer.h>
#include <comparator/moNeighborComparator.h>
@ -44,7 +44,7 @@
* Explorer for a first imporvement heuristic
*/
template< class Neighbor>
class moFirstImprExplorer : public moNeighborhoodExplorer<Neighbor>
class moFirstImprHCexplorer : public moNeighborhoodExplorer<Neighbor>
{
public:
typedef typename Neighbor::EOT EOT ;
@ -60,7 +60,7 @@ public:
* @param _neighborComparator a neighbor comparator
* @param _solNeighborComparator a solution vs neighbor comparator
*/
moFirstImprExplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval, moNeighborComparator<Neighbor>& _neighborComparator, moSolNeighborComparator<Neighbor>& _solNeighborComparator) : moNeighborhoodExplorer<Neighbor>(_neighborhood, _eval), neighborComparator(_neighborComparator), solNeighborComparator(_solNeighborComparator) {
moFirstImprHCexplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval, moNeighborComparator<Neighbor>& _neighborComparator, moSolNeighborComparator<Neighbor>& _solNeighborComparator) : moNeighborhoodExplorer<Neighbor>(_neighborhood, _eval), neighborComparator(_neighborComparator), solNeighborComparator(_solNeighborComparator) {
isAccept = false;
current=new Neighbor();
}
@ -68,7 +68,7 @@ public:
/**
* Destructor
*/
~moFirstImprExplorer() {
~moFirstImprHCexplorer() {
delete current;
}

32
trunk/paradiseo-mo/src/explorer/moNeutralHCexplorer.h
View file

@ -1,5 +1,5 @@
/*
<moHCneutralExplorer.h>
<moNeutralHCexplorer.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau
@ -32,10 +32,10 @@
Contact: paradiseo-help@lists.gforge.inria.fr
*/
#ifndef _moHCneutralExplorer_h
#define _moHCneutralExplorer_h
#ifndef _moNeutralHCexplorer_h
#define _moNeutralHCexplorer_h
#include <explorer/moRandomBestHCExplorer.h>
#include <explorer/moRandomBestHCexplorer.h>
#include <comparator/moNeighborComparator.h>
#include <comparator/moSolNeighborComparator.h>
#include <neighborhood/moNeighborhood.h>
@ -44,18 +44,18 @@
* Explorer for a neutral Hill-climbing
*/
template< class Neighbor >
class moHCneutralExplorer : public moRandomBestHCExplorer<Neighbor>
class moNeutralHCexplorer : public moRandomBestHCexplorer<Neighbor>
{
public:
typedef typename Neighbor::EOT EOT ;
typedef moNeighborhood<Neighbor> Neighborhood ;
using moNeighborhoodExplorer<Neighbor>::neighborhood;
using moRandomBestHCExplorer<Neighbor>::solNeighborComparator;
using moRandomBestHCExplorer<Neighbor>::isAccept;
using moRandomBestHCExplorer<Neighbor>::bestVector;
using moRandomBestHCExplorer<Neighbor>::initParam;
using moRandomBestHCExplorer<Neighbor>::updateParam;
using moRandomBestHCexplorer<Neighbor>::solNeighborComparator;
using moRandomBestHCexplorer<Neighbor>::isAccept;
using moRandomBestHCexplorer<Neighbor>::bestVector;
using moRandomBestHCexplorer<Neighbor>::initParam;
using moRandomBestHCexplorer<Neighbor>::updateParam;
/**
* Constructor
@ -65,30 +65,30 @@ public:
* @param _solNeighborComparator a solution vs neighbor comparator
* @param _nbStep maximum step to do
*/
moHCneutralExplorer(Neighborhood& _neighborhood,
moNeutralHCexplorer(Neighborhood& _neighborhood,
moEval<Neighbor>& _eval,
moNeighborComparator<Neighbor>& _neighborComparator,
moSolNeighborComparator<Neighbor>& _solNeighborComparator,
unsigned _nbStep) :
moRandomBestHCExplorer<Neighbor>(_neighborhood, _eval, _neighborComparator, _solNeighborComparator),
moRandomBestHCexplorer<Neighbor>(_neighborhood, _eval, _neighborComparator, _solNeighborComparator),
nbStep(_nbStep) {
//Some cycle is possible with equals fitness solutions if the neighborhood is not random
if (!neighborhood.isRandom()) {
std::cout << "moHCneutralExplorer::Warning -> the neighborhood used is not random" << std::endl;
std::cout << "moNeutralHCexplorer::Warning -> the neighborhood used is not random" << std::endl;
}
}
/**
* Destructor
*/
~moHCneutralExplorer() {
~moNeutralHCexplorer() {
}
/**
* initial number of step
*/
virtual void initParam(EOT & solution) {
moRandomBestHCExplorer<Neighbor>::initParam(solution);
moRandomBestHCexplorer<Neighbor>::initParam(solution);
step = 0;
};
@ -97,7 +97,7 @@ public:
* one more step
*/
virtual void updateParam(EOT & solution) {
moRandomBestHCExplorer<Neighbor>::updateParam(solution);
moRandomBestHCexplorer<Neighbor>::updateParam(solution);
step++;
};

12
trunk/paradiseo-mo/src/explorer/moRandomBestHCExplorer.h → trunk/paradiseo-mo/src/explorer/moRandomBestHCexplorer.h
View file

@ -1,5 +1,5 @@
/*
<moRandomBestHCExplorer.h>
<moRandomBestHCexplorer.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Sebastien Verel, Arnaud Liefooghe, Jeremie Humeau
@ -32,8 +32,8 @@
Contact: paradiseo-help@lists.gforge.inria.fr
*/
#ifndef _moRandomBestHCExplorer_h
#define _moRandomBestHCExplorer_h
#ifndef _moRandomBestHCexplorer_h
#define _moRandomBestHCexplorer_h
#include <explorer/moNeighborhoodExplorer.h>
#include <comparator/moNeighborComparator.h>
@ -47,7 +47,7 @@
* which choose randomly one of the best solution in the neighborhood at each iteration
*/
template< class Neighbor >
class moRandomBestHCExplorer : public moNeighborhoodExplorer<Neighbor>
class moRandomBestHCexplorer : public moNeighborhoodExplorer<Neighbor>
{
public:
typedef typename Neighbor::EOT EOT ;
@ -63,7 +63,7 @@ public:
* @param _neighborComparator a neighbor comparator
* @param _solNeighborComparator solution vs neighbor comparator
*/
moRandomBestHCExplorer(Neighborhood& _neighborhood,
moRandomBestHCexplorer(Neighborhood& _neighborhood,
moEval<Neighbor>& _eval,
moNeighborComparator<Neighbor>& _neighborComparator,
moSolNeighborComparator<Neighbor>& _solNeighborComparator) :
@ -77,7 +77,7 @@ public:
/**
* Destructor
*/
~moRandomBestHCExplorer() {
~moRandomBestHCexplorer() {
delete current;
}

12
trunk/paradiseo-mo/src/explorer/moTSExplorer.h → trunk/paradiseo-mo/src/explorer/moTSexplorer.h
View file

@ -1,5 +1,5 @@
/*
<moTSExplorer.h>
<moTSexplorer.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau
@ -32,8 +32,8 @@
Contact: paradiseo-help@lists.gforge.inria.fr
*/
#ifndef _moTSExplorer_h
#define _moTSExplorer_h
#ifndef _moTSexplorer_h
#define _moTSexplorer_h
#include <explorer/moNeighborhoodExplorer.h>
#include <comparator/moNeighborComparator.h>
@ -48,7 +48,7 @@
* Explorer for a Tabu Search
*/
template< class Neighbor >
class moTSExplorer : public moNeighborhoodExplorer<Neighbor>
class moTSexplorer : public moNeighborhoodExplorer<Neighbor>
{
public:
typedef typename Neighbor::EOT EOT ;
@ -65,7 +65,7 @@ public:
* @param _diversification the diversification box
* @param _aspiration the aspiration criteria
*/
moTSExplorer(Neighborhood& _neighborhood,
moTSexplorer(Neighborhood& _neighborhood,
moEval<Neighbor>& _eval,
moNeighborComparator<Neighbor>& _neighborComparator,
moSolNeighborComparator<Neighbor>& _solNeighborComparator,
@ -85,7 +85,7 @@ public:
/**
* Destructor
*/
~moTSExplorer() {
~moTSexplorer() {
delete current;
delete best;
}

8
trunk/paradiseo-mo/src/mo.h
View file

@ -70,15 +70,15 @@
#include <eval/moFullEvalByModif.h>
#include <eval/moDummyEval.h>
#include <explorer/moFirstImprExplorer.h>
#include <explorer/moHCneutralExplorer.h>
#include <explorer/moFirstImprHCexplorer.h>
#include <explorer/moNeutralHCexplorer.h>
#include <explorer/moMetropolisHastingExplorer.h>
#include <explorer/moNeighborhoodExplorer.h>
#include <explorer/moRandomNeutralWalkExplorer.h>
#include <explorer/moRandomWalkExplorer.h>
#include <explorer/moSimpleHCexplorer.h>
#include <explorer/moRandomBestHCExplorer.h>
#include <explorer/moTSExplorer.h>
#include <explorer/moRandomBestHCexplorer.h>
#include <explorer/moTSexplorer.h>
#include <explorer/moILSexplorer.h>
#include <explorer/moSAexplorer.h>

9
trunk/paradiseo-mo/test/CMakeLists.txt
View file

@ -51,13 +51,13 @@ SET (TEST_LIST
t-moSolVectorTabuList
t-moBestImprAspiration
t-moSimpleHCexplorer
t-moSimpleHCneutralExplorer
t-moHCneutralExplorer
t-moFirstImprExplorer
t-moRandomBestHCexplorer
t-moNeutralHCexplorer
t-moFirstImprHCexplorer
t-moRandomWalkExplorer
t-moMetropolisHastingExplorer
t-moRandomNeutralWalkExplorer
t-moTSExplorer
t-moTSexplorer
t-moForwardVariableNeighborhood
t-moSolComparator
t-moDummyEval
@ -74,6 +74,7 @@ SET (TEST_LIST
t-moSA
t-moLocalSearch
t-moILSexplorer
t-moSimpleHC
)
FOREACH (test ${TEST_LIST})

8
trunk/paradiseo-mo/test/t-moFirstImprExplorer.cpp → trunk/paradiseo-mo/test/t-moFirstImprHCexplorer.cpp
View file

@ -29,7 +29,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <comparator/moNeighborComparator.h>
#include <comparator/moSolNeighborComparator.h>
#include <explorer/moFirstImprExplorer.h>
#include <explorer/moFirstImprHCexplorer.h>
#include "moTestClass.h"
#include <iostream>
@ -38,7 +38,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
int main() {
std::cout << "[t-moFirstImprExplorer] => START" << std::endl;
std::cout << "[t-moFirstImprHCexplorer] => START" << std::endl;
//Instanciation
eoBit<eoMinimizingFitness> sol(4, true);
@ -48,7 +48,7 @@ int main() {
moNeighborComparator<bitNeighbor> ncomp;
moSolNeighborComparator<bitNeighbor> sncomp;
moFirstImprExplorer<bitNeighbor> test(nh, eval, ncomp, sncomp);
moFirstImprHCexplorer<bitNeighbor> test(nh, eval, ncomp, sncomp);
//on verifie qu'on améliore peut continuer à explorer tant qu'on améliore la solution
@ -86,7 +86,7 @@ int main() {
assert(sol.fitness()==0);
assert(!test.isContinue(sol));
std::cout << "[t-moFirstImprExplorer] => OK" << std::endl;
std::cout << "[t-moFirstImprHCexplorer] => OK" << std::endl;
return EXIT_SUCCESS;
}

10
trunk/paradiseo-mo/test/t-moHCneutralExplorer.cpp → trunk/paradiseo-mo/test/t-moNeutralHCexplorer.cpp
View file

@ -1,5 +1,5 @@
/*
<t-moHCneutralExplorer.cpp>
<t-moNeutralHCexplorer.cpp>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau
@ -29,7 +29,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <comparator/moNeighborComparator.h>
#include <comparator/moSolNeighborComparator.h>
#include <explorer/moHCneutralExplorer.h>
#include <explorer/moNeutralHCexplorer.h>
#include "moTestClass.h"
#include <iostream>
@ -38,7 +38,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
int main() {
std::cout << "[t-moHCneutralExplorer] => START" << std::endl;
std::cout << "[t-moNeutralHCexplorer] => START" << std::endl;
//Instanciation
eoBit<eoMinimizingFitness> sol(4, true);
@ -48,7 +48,7 @@ int main() {
moNeighborComparator<bitNeighbor> ncomp;
moSolNeighborComparator<bitNeighbor> sncomp;
moHCneutralExplorer<bitNeighbor> test(nh, eval, ncomp, sncomp,3);
moNeutralHCexplorer<bitNeighbor> test(nh, eval, ncomp, sncomp,3);
//on verifie qu'on ameliore bien la solution et que l'exploration dure 3 itérations
@ -85,7 +85,7 @@ int main() {
std::cout << "[t-moHCneutralExplorer] => OK" << std::endl;
std::cout << "[t-moNeutralHCexplorer] => OK" << std::endl;
return EXIT_SUCCESS;
}

8
trunk/paradiseo-mo/test/t-moSimpleHCneutralExplorer.cpp → trunk/paradiseo-mo/test/t-moRandomBestHCexplorer.cpp
View file

@ -29,7 +29,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <comparator/moNeighborComparator.h>
#include <comparator/moSolNeighborComparator.h>
#include <explorer/moRandomBestHCExplorer.h>
#include <explorer/moRandomBestHCexplorer.h>
#include "moTestClass.h"
#include <iostream>
@ -38,7 +38,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
int main() {
std::cout << "[t-moRandomBestHCExplorer] => START" << std::endl;
std::cout << "[t-moRandomBestHCexplorer] => START" << std::endl;
//instanciation
eoBit<eoMinimizingFitness> sol(4, true);
@ -48,7 +48,7 @@ int main() {
moNeighborComparator<bitNeighbor> ncomp;
moSolNeighborComparator<bitNeighbor> sncomp;
moRandomBestHCExplorer<bitNeighbor> test(nh, eval, ncomp, sncomp);
moRandomBestHCexplorer<bitNeighbor> test(nh, eval, ncomp, sncomp);
//test qu'on ameliore bien a chaque itération
test.initParam(sol);
@ -94,7 +94,7 @@ int main() {
test.updateParam(sol);
std::cout << "[t-moRandomBestHCExplorer] => OK" << std::endl;
std::cout << "[t-moRandomBestHCexplorer] => OK" << std::endl;
return EXIT_SUCCESS;
}

65
trunk/paradiseo-mo/test/t-moSimpleHC.cpp Normal file
View file

@ -0,0 +1,65 @@
/*
<t-moSimpleHC.cpp>
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
*/
#include <iostream>
#include <cstdlib>
#include <cassert>
#include <algo/moSimpleHC.h>
#include "moTestClass.h"
#include <problems/eval/oneMaxFullEval.h>
#include <continuator/moTrueContinuator.h>
#include <comparator/moSolNeighborComparator.h>
int main(){
std::cout << "[t-moSimpleHC] => START" << std::endl;
bitNeighborhood nh(4);
oneMaxFullEval<bitVector> fullEval;
evalOneMax eval(4);
//test first constructor
moSimpleHC<bitNeighbor> test1(nh, fullEval, eval);
//test second constructor
moTrueContinuator<bitNeighbor> cont;
moSimpleHC<bitNeighbor> test2(nh, fullEval, eval, cont);
//test third constructor
moSolNeighborComparator<bitNeighbor> sncomp;
moNeighborComparator<bitNeighbor> ncomp;
moSimpleHC<bitNeighbor> test3(nh, fullEval, eval, cont, ncomp, sncomp);
std::cout << "[t-moSimpleHC] => OK" << std::endl;
return EXIT_SUCCESS;
}

14
trunk/paradiseo-mo/test/t-moTSExplorer.cpp → trunk/paradiseo-mo/test/t-moTSexplorer.cpp
View file

@ -1,5 +1,5 @@
/*
<t-moTSExplorer.cpp>
<t-moTSexplorer.cpp>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau
@ -31,7 +31,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <memory/moDummyIntensification.h>
#include <memory/moDummyDiversification.h>
#include <memory/moBestImprAspiration.h>
#include <explorer/moTSExplorer.h>
#include <explorer/moTSexplorer.h>
#include "moTestClass.h"
#include <iostream>
@ -40,7 +40,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
int main() {
std::cout << "[t-moTSExplorer] => START" << std::endl;
std::cout << "[t-moTSexplorer] => START" << std::endl;
//instansiation
eoBit<eoMinimizingFitness> sol(4, true);
@ -55,8 +55,8 @@ int main() {
moSolVectorTabuList<bitNeighbor> tabuList(4,0);
moBestImprAspiration<bitNeighbor> aspir;
moTSExplorer<bitNeighbor> test(nh, eval, ncomp, sncomp, tabuList, intens, diver, aspir);
moTSExplorer<bitNeighbor> test2(emptyNH, eval, ncomp, sncomp, tabuList, intens, diver, aspir);
moTSexplorer<bitNeighbor> test(nh, eval, ncomp, sncomp, tabuList, intens, diver, aspir);
moTSexplorer<bitNeighbor> test2(emptyNH, eval, ncomp, sncomp, tabuList, intens, diver, aspir);
//test d'un voisinage vide
test2.initParam(sol);
@ -130,7 +130,7 @@ int main() {
bitNeighborhood nh2(2);
evalOneMax eval2(2);
moTSExplorer<bitNeighbor> test3(nh2, eval2, ncomp, sncomp, tabuList, intens, diver, aspir);
moTSexplorer<bitNeighbor> test3(nh2, eval2, ncomp, sncomp, tabuList, intens, diver, aspir);
test3.initParam(sol2);
test3(sol2);
@ -158,7 +158,7 @@ int main() {
assert(!test3.accept(sol2));
std::cout << "[t-moTSExplorer] => OK" << std::endl;
std::cout << "[t-moTSexplorer] => OK" << std::endl;
return EXIT_SUCCESS;
}