Big source code update: simplification, accessibility, include, date, ... All .h have been verified and updated
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@877 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jboisson
parent
ff55f03920
commit
a94380fadb
39 changed files with 3045 additions and 3155 deletions
|
|
@ -1,107 +1,102 @@
|
|||
/*
|
||||
* <moItRandNextMove.h>
|
||||
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
|
||||
* (C) OPAC Team, LIFL, 2002-2007
|
||||
*
|
||||
* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
|
||||
*
|
||||
* This software is governed by the CeCILL license under French law and
|
||||
* abiding by the rules of distribution of free software. You can use,
|
||||
* 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".
|
||||
*
|
||||
* As a counterpart to the access to the source code and rights to copy,
|
||||
* modify and redistribute granted by the license, users are provided only
|
||||
* with a limited warranty and the software's author, the holder of the
|
||||
* economic rights, and the successive licensors have only limited liability.
|
||||
*
|
||||
* 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
|
||||
*
|
||||
<moItRandNextMove.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)
|
||||
|
||||
This software is governed by the CeCILL license under French law and
|
||||
abiding by the rules of distribution of free software. You can use,
|
||||
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".
|
||||
|
||||
As a counterpart to the access to the source code and rights to copy,
|
||||
modify and redistribute granted by the license, users are provided only
|
||||
with a limited warranty and the software's author, the holder of the
|
||||
economic rights, and the successive licensors have only limited liability.
|
||||
|
||||
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
|
||||
*/
|
||||
|
||||
#ifndef __moItRandNextMove_h
|
||||
#define __moItRandNextMove_h
|
||||
#ifndef _moItRandNextMove_h
|
||||
#define _moItRandNextMove_h
|
||||
|
||||
#include "moNextMove.h"
|
||||
#include "moRandMove.h"
|
||||
#include <moNextMove.h>
|
||||
#include <moRandMove.h>
|
||||
|
||||
//! One of the possible moNextMove.
|
||||
/*!
|
||||
This class is a move (moMove) generator with a bound for the maximum number of iterations.
|
||||
*/
|
||||
template < class M > class moItRandNextMove:public moNextMove < M >
|
||||
{
|
||||
template < class M >
|
||||
class moItRandNextMove:public moNextMove < M >
|
||||
{
|
||||
//! Alias for the type.
|
||||
typedef typename M::EOType EOT;
|
||||
|
||||
//! Alias for the type.
|
||||
typedef typename M::EOType EOT;
|
||||
public:
|
||||
|
||||
public:
|
||||
//! The constructor.
|
||||
/*!
|
||||
Parameters only for initialising the attributes.
|
||||
|
||||
//! The constructor.
|
||||
/*!
|
||||
Parameters only for initialising the attributes.
|
||||
|
||||
\param __rand_move the random move generator.
|
||||
\param __max_iter the iteration maximum number.
|
||||
*/
|
||||
moItRandNextMove (moRandMove < M > &__rand_move,
|
||||
unsigned int __max_iter):rand_move (__rand_move),
|
||||
max_iter (__max_iter), num_iter (0)
|
||||
\param _random_move_generator The random move generator.
|
||||
\param _iteration_maximum_number The iteration maximum number.
|
||||
*/
|
||||
moItRandNextMove (moRandMove < M > & _random_move_generator, unsigned int _iteration_maximum_number):
|
||||
random_move_generator(_random_move_generator), iteration_maximum_number(_iteration_maximum_number), iteration_number(0)
|
||||
{}
|
||||
|
||||
//! Generation of a new move
|
||||
/*!
|
||||
If the maximum number is not already reached, the current move is forgotten and remplaced by another one.
|
||||
//! Generation of a new move
|
||||
/*!
|
||||
If the maximum number is not already reached, the current move is forgotten and remplaced by another one.
|
||||
|
||||
\param __move the current move.
|
||||
\param __sol the current solution.
|
||||
\return FALSE if the maximum number of iteration is reached, else TRUE.
|
||||
*/
|
||||
bool operator () (M & __move, const EOT & __sol)
|
||||
{
|
||||
\param _move the current move.
|
||||
\param _solution the current solution.
|
||||
\return false if the maximum number of iteration is reached, else true.
|
||||
*/
|
||||
bool operator () (M & _move, const EOT & _solution)
|
||||
{
|
||||
//code only used to avoid warning because _solution is not used in this function.
|
||||
EOT solution=(EOT)_solution;
|
||||
|
||||
if (iteration_number++ > iteration_maximum_number)
|
||||
{
|
||||
iteration_number = 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
random_move_generator (_move);
|
||||
iteration_number++;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
if (num_iter++ > max_iter)
|
||||
{
|
||||
private:
|
||||
|
||||
num_iter = 0;
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
//! A move generator (generally randomly).
|
||||
moRandMove < M > & random_move_generator;
|
||||
|
||||
/* The given solution is discarded here */
|
||||
rand_move (__move);
|
||||
num_iter++;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
//! Iteration maximum number.
|
||||
unsigned int iteration_maximum_number;
|
||||
|
||||
private:
|
||||
|
||||
//! A move generator (generally randomly).
|
||||
moRandMove < M > &rand_move;
|
||||
|
||||
//! Iteration maximum number.
|
||||
unsigned int max_iter;
|
||||
|
||||
//! Iteration current number.
|
||||
unsigned int num_iter;
|
||||
|
||||
};
|
||||
//! Iteration current number.
|
||||
unsigned int iteration_number;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue