Ajout de la statistic qui donne la solution courante
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1685 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
96cfa54589
commit
caf22e3ef8
2 changed files with 69 additions and 0 deletions
63
branches/newMo/src/continuator/moSolutionStat.h
Normal file
63
branches/newMo/src/continuator/moSolutionStat.h
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
/*
|
||||
<moSolutionStat.h>
|
||||
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 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 moSolutionStat_h
|
||||
#define moSolutionStat_h
|
||||
|
||||
#include <continuator/moStat.h>
|
||||
|
||||
/**
|
||||
* The statistic which only give the current solution
|
||||
* becarefull, the solution is given by copy
|
||||
*
|
||||
*/
|
||||
template <class EOT>
|
||||
class moSolutionStat : public moStat<EOT, EOT>
|
||||
{
|
||||
public :
|
||||
using moStat< EOT, EOT >::value;
|
||||
|
||||
moSolutionStat(std::string _description = "solution")
|
||||
: moStat<EOT, EOT>(EOT(), _description)
|
||||
{}
|
||||
|
||||
virtual void operator()(EOT & _sol)
|
||||
{
|
||||
value() = _sol;
|
||||
}
|
||||
|
||||
virtual std::string className(void) const { return "moSolutionStat"; }
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
@ -35,6 +35,7 @@ using namespace std;
|
|||
#include <explorer/moRandomWalkExplorer.h>
|
||||
#include <continuator/moCheckpoint.h>
|
||||
#include <continuator/moFitnessStat.h>
|
||||
#include <continuator/moSolutionStat.h>
|
||||
|
||||
|
||||
#include <utils/eoFileMonitor.h>
|
||||
|
|
@ -157,16 +158,21 @@ void main_function(int argc, char **argv)
|
|||
* ========================================================= */
|
||||
|
||||
moTrueContinuator<Neighborhood> continuator;//always continue
|
||||
|
||||
moFitnessStat<Indi, unsigned> fStat;
|
||||
moSolutionStat<Indi> solStat;
|
||||
|
||||
moCheckpoint<Neighborhood> checkpoint(continuator);
|
||||
eoFileMonitor outputfile("out.dat", " ");
|
||||
checkpoint.add(outputfile);
|
||||
checkpoint.add(fStat);
|
||||
checkpoint.add(solStat);
|
||||
eoValueParam<unsigned int> genCounter(-1,"Gen");
|
||||
eoIncrementor<unsigned int> increm(genCounter.value());
|
||||
checkpoint.add(increm);
|
||||
outputfile.add(genCounter);
|
||||
outputfile.add(fStat);
|
||||
outputfile.add(solStat);
|
||||
|
||||
moLocalSearch< moRandomWalkExplorer<Neighborhood> > localSearch(explorer, checkpoint, eval);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue