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

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;
}