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

In the TSP, the fitness has to be minimized ... with all the needed modification (for example, moSA.h)

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@587 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jboisson 2007-08-03 14:28:06 +00:00
commit 1d94071693
170 changed files with 748 additions and 837 deletions
Download patch file Download diff file Expand all files Collapse all files

24
trunk/paradiseo-mo/src/moSteadyFitSolContinue.h
View file

@ -30,11 +30,10 @@ public:
/*!
\param __maxNumberOfIterations The number of iterations to reach before looking for the fitness.
\param __maxNumberOfIterationWithoutImprovement The number of iterations without fitness improvement to reach for stop.
\param __minimization Indicate if the the aim is to maximize or minimize the fitness.
*/
moSteadyFitSolContinue (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement, bool __minimization=true)
moSteadyFitSolContinue (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement)
: maxNumberOfIterations (__maxNumberOfIterations), maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement),
minimization(__minimization), maxNumberOfIterationsReached(false), firstFitnessSaved(true), counter(0)
maxNumberOfIterationsReached(false), firstFitnessSaved(true), counter(0)
{}
//! Function that activates the stopping criterion.
@ -71,8 +70,7 @@ public:
counter++;
if( ((minimization) && (__sol.fitness() < fitness)) ||
((!minimization) && (__sol.fitness() > fitness)) )
if( __sol.fitness() > fitness )
{
fitness=__sol.fitness();
counter=0;
@ -86,8 +84,15 @@ public:
}
//! Procedure which allows to initialise the stuff needed.
/*!
It can be also used to reinitialize the counter all the needed things.
*/
void init ()
{}
{
maxNumberOfIterationsReached=false;
counter=0;
firstFitnessSaved=true;
}
private:
@ -106,13 +111,6 @@ private:
//! Current Fitness.
Fitness fitness;
//! Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value.
/*!
It can be interesting to know this information because some solution-based metaheuristics can generate solution with a fitness that
is worse that the best known fitness (in this case, the counter is not reinitialized).
*/
bool minimization;
//! The iteration couter.
unsigned int counter;
};