misspelling errors have been corrected in some files. improvment -> improvement
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@584 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
bc6cbb56b5
commit
cba18441d6
130 changed files with 217 additions and 217 deletions
|
|
@ -37,7 +37,7 @@ public:
|
|||
|
||||
//!Function that indicates if the current move has not improved the fitness.
|
||||
/*!
|
||||
If the given fitness enables an improvment,
|
||||
If the given fitness enables an improvement,
|
||||
the move (moMove) and the fitness linked to this move are saved.
|
||||
|
||||
\param __move a move.
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
//! One possible moMoveSelect.
|
||||
/*!
|
||||
The neighborhood is explored until
|
||||
a move enables an improvment of the
|
||||
a move enables an improvement of the
|
||||
current solution.
|
||||
*/
|
||||
template < class M > class moFirstImprSelect:public moMoveSelect < M >
|
||||
|
|
@ -42,7 +42,7 @@ public:
|
|||
|
||||
//!Function that indicates if the current move has not improved the fitness.
|
||||
/*!
|
||||
If the given fitness enables an improvment,
|
||||
If the given fitness enables an improvement,
|
||||
the move (moMove) should be applied to the current solution.
|
||||
|
||||
\param __move a move.
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
//! One possible stop criterion for a solution-based heuristic.
|
||||
/*!
|
||||
The stop criterion corresponds to a maximum number of iterations without improvement.
|
||||
The stop criterion corresponds to a maximum number of iterations without improevement.
|
||||
*/
|
||||
template < class EOT > class moNoFitImprSolContinue:public moSolContinue < EOT >
|
||||
{
|
||||
|
|
@ -28,11 +28,11 @@ public:
|
|||
|
||||
//! Basic constructor.
|
||||
/*!
|
||||
\param __maxNumberOfIterationWithoutImprovment The number of iterations without fitness improvment to reach for stop.
|
||||
\param __maxNumberOfIterationWithoutImprovement The number of iterations without fitness improvement to reach for stop.
|
||||
\param __maximization Indicate if the the aim is to maximize or minimize the fitness.
|
||||
*/
|
||||
moNoFitImprSolContinue (unsigned int __maxNumberOfIterationWithoutImprovment, bool __maximization=true)
|
||||
: maxNumberOfIterationsWithoutImprovment(__maxNumberOfIterationWithoutImprovment),maximization(__maximization),
|
||||
moNoFitImprSolContinue (unsigned int __maxNumberOfIterationWithoutImprovement, bool __maximization=true)
|
||||
: maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement),maximization(__maximization),
|
||||
firstFitnessSaved(true), counter(0)
|
||||
{}
|
||||
|
||||
|
|
@ -66,11 +66,11 @@ public:
|
|||
counter=0;
|
||||
}
|
||||
|
||||
if(counter==maxNumberOfIterationsWithoutImprovment)
|
||||
if(counter==maxNumberOfIterationsWithoutImprovement)
|
||||
{
|
||||
std::cout << "moNoFitImrpSolContinue: Done [" << counter << "] iterations without improvement." << std::endl;
|
||||
}
|
||||
return counter!=maxNumberOfIterationsWithoutImprovment;
|
||||
return counter!=maxNumberOfIterationsWithoutImprovement;
|
||||
}
|
||||
|
||||
//! Procedure which allows to initialise all the stuff needed.
|
||||
|
|
@ -79,8 +79,8 @@ public:
|
|||
|
||||
private:
|
||||
|
||||
//! Maximum number of iterations without improvment allowed.
|
||||
unsigned int maxNumberOfIterationsWithoutImprovment;
|
||||
//! Maximum number of iterations without improvement allowed.
|
||||
unsigned int maxNumberOfIterationsWithoutImprovement;
|
||||
|
||||
//! Flag that this is the first time that the fitness is used.
|
||||
bool firstFitnessSaved;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
//! One of the possible moMove selector (moMoveSelect)
|
||||
/*!
|
||||
All the neighbors are considered.
|
||||
One of them that enables an improvment of the objective function is choosen.
|
||||
One of them that enables an improvement of the objective function is choosen.
|
||||
*/
|
||||
template < class M > class moRandImprSelect:public moMoveSelect < M >
|
||||
{
|
||||
|
|
|
|||
|
|
@ -29,11 +29,11 @@ public:
|
|||
//! Basic constructor.
|
||||
/*!
|
||||
\param __maxNumberOfIterations The number of iterations to reach before looking for the fitness.
|
||||
\param __maxNumberOfIterationWithoutImprovment The number of iterations without fitness improvment to reach for stop.
|
||||
\param __maxNumberOfIterationWithoutImprovement The number of iterations without fitness improvement to reach for stop.
|
||||
\param __maximization Indicate if the the aim is to maximize or minimize the fitness.
|
||||
*/
|
||||
moSteadyFitSolContinue (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovment, bool __maximization=true)
|
||||
: maxNumberOfIterations (__maxNumberOfIterations), maxNumberOfIterationsWithoutImprovment(__maxNumberOfIterationWithoutImprovment),
|
||||
moSteadyFitSolContinue (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement, bool __maximization=true)
|
||||
: maxNumberOfIterations (__maxNumberOfIterations), maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement),
|
||||
maximization(__maximization), maxNumberOfIterationsReached(false), firstFitnessSaved(true), counter(0)
|
||||
{}
|
||||
|
||||
|
|
@ -78,11 +78,11 @@ public:
|
|||
counter=0;
|
||||
}
|
||||
|
||||
if(counter==maxNumberOfIterationsWithoutImprovment)
|
||||
if(counter==maxNumberOfIterationsWithoutImprovement)
|
||||
{
|
||||
std::cout << "moSteadyFitSolContinue: Done [" << counter << "] iterations without improvement." << std::endl;
|
||||
}
|
||||
return counter!=maxNumberOfIterationsWithoutImprovment;
|
||||
return counter!=maxNumberOfIterationsWithoutImprovement;
|
||||
}
|
||||
|
||||
//! Procedure which allows to initialise the stuff needed.
|
||||
|
|
@ -94,8 +94,8 @@ private:
|
|||
//! Maximum number of iterations before considering the fitness.
|
||||
unsigned int maxNumberOfIterations;
|
||||
|
||||
//! Maximum number of iterations without improvment allowed.
|
||||
unsigned int maxNumberOfIterationsWithoutImprovment;
|
||||
//! Maximum number of iterations without improvement allowed.
|
||||
unsigned int maxNumberOfIterationsWithoutImprovement;
|
||||
|
||||
//! Flag that indicates that the maxNumberIteration have been reached.
|
||||
bool maxNumberOfIterationsReached;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue