Merge ba19b29a22 into 5b39705a20
This commit is contained in:
commit
f13f737430
51 changed files with 3330 additions and 626 deletions
2
eo/NEWS
2
eo/NEWS
|
|
@ -1,4 +1,6 @@
|
||||||
* current release:
|
* current release:
|
||||||
|
- added an EOT& parameter to the moCoolingSchedule::update interface method because some cooling schedules need it
|
||||||
|
- eoMonitor's are no more executed in moCheckpoint::init to prevent access to uninitialized data
|
||||||
|
|
||||||
* release 1.3.1 (2012-07-27)
|
* release 1.3.1 (2012-07-27)
|
||||||
- the eo::mpi modules is no longer dependent from boost::mpi
|
- the eo::mpi modules is no longer dependent from boost::mpi
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,7 @@
|
||||||
// general purpose
|
// general purpose
|
||||||
#include <utils/eoData.h>
|
#include <utils/eoData.h>
|
||||||
#include <eoObject.h>
|
#include <eoObject.h>
|
||||||
|
#include <eoOptional.h>
|
||||||
#include <eoPrintable.h>
|
#include <eoPrintable.h>
|
||||||
#include <eoPersistent.h>
|
#include <eoPersistent.h>
|
||||||
#include <eoScalarFitness.h>
|
#include <eoScalarFitness.h>
|
||||||
|
|
|
||||||
130
eo/src/eoOptional.h
Normal file
130
eo/src/eoOptional.h
Normal file
|
|
@ -0,0 +1,130 @@
|
||||||
|
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
|
||||||
|
|
||||||
|
/*
|
||||||
|
(c) Thales group, 2013
|
||||||
|
|
||||||
|
This library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Lesser General Public
|
||||||
|
License as published by the Free Software Foundation;
|
||||||
|
version 2 of the License.
|
||||||
|
|
||||||
|
This library is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with this library; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
|
||||||
|
Contact: http://eodev.sourceforge.net
|
||||||
|
|
||||||
|
Authors:
|
||||||
|
Lionel Parreaux <lionel.parreaux@gmail.com>
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
|
||||||
|
A utility class for wrapping non-const references and use them as default arguments in functions.
|
||||||
|
This especially is useful for avoiding constructor multiplication.
|
||||||
|
|
||||||
|
For example, this is not valid C++98 code:
|
||||||
|
|
||||||
|
\code
|
||||||
|
struct MyClass {
|
||||||
|
MyClass(T& my_T = default_T)
|
||||||
|
: actual_T(my_T)
|
||||||
|
{ }
|
||||||
|
private:
|
||||||
|
T default_T;
|
||||||
|
T& actual_T;
|
||||||
|
};
|
||||||
|
\endcode
|
||||||
|
|
||||||
|
This is the same code using eoOptional, which is valid:
|
||||||
|
|
||||||
|
\code
|
||||||
|
struct MyClass {
|
||||||
|
MyClass(eoOptional<T> my_T = NULL)
|
||||||
|
: actual_T(my_T.getOr(default_T))
|
||||||
|
{ }
|
||||||
|
private:
|
||||||
|
T default_T;
|
||||||
|
T& actual_T;
|
||||||
|
};
|
||||||
|
\endcode
|
||||||
|
|
||||||
|
And from the point of view of the user, it is transparent:
|
||||||
|
|
||||||
|
\code
|
||||||
|
// Three ways of using MyClass:
|
||||||
|
MyClass mc1;
|
||||||
|
MyClass mc2(NULL);
|
||||||
|
T t;
|
||||||
|
MyClass mc3(t);
|
||||||
|
\endcode
|
||||||
|
|
||||||
|
|
||||||
|
@ingroup Utilities
|
||||||
|
@{
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _EOOPTIONAL_H
|
||||||
|
#define _EOOPTIONAL_H
|
||||||
|
|
||||||
|
#include <stdexcept>
|
||||||
|
#include <eoObject.h>
|
||||||
|
//#include <eoExceptions.h>
|
||||||
|
|
||||||
|
|
||||||
|
template< class T >
|
||||||
|
class eoOptional {
|
||||||
|
public:
|
||||||
|
static const eoOptional<T> null; // = eoOptional<T>();
|
||||||
|
|
||||||
|
eoOptional (T& init)
|
||||||
|
: _val(&init)
|
||||||
|
{ }
|
||||||
|
|
||||||
|
// used mainly for converting NULL to this class
|
||||||
|
eoOptional (T* init)
|
||||||
|
: _val(init)
|
||||||
|
{ }
|
||||||
|
|
||||||
|
bool hasValue() const
|
||||||
|
{
|
||||||
|
return _val != NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
T& get () const
|
||||||
|
{
|
||||||
|
if (!hasValue())
|
||||||
|
throw std::runtime_error("Cannot get a reference from a eoOptional wrapper with no value");
|
||||||
|
//throw eoEx;
|
||||||
|
return *_val;
|
||||||
|
}
|
||||||
|
|
||||||
|
T& getOr (T& defaultValue) const
|
||||||
|
{
|
||||||
|
return hasValue()? *_val: defaultValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected:
|
||||||
|
eoOptional ()
|
||||||
|
: _val(NULL)
|
||||||
|
{ }
|
||||||
|
|
||||||
|
private:
|
||||||
|
T* _val;
|
||||||
|
};
|
||||||
|
|
||||||
|
template< class T >
|
||||||
|
const eoOptional<T> eoOptional<T>::null = eoOptional<T>();
|
||||||
|
|
||||||
|
|
||||||
|
#endif // _EOOPTIONAL_H
|
||||||
|
|
||||||
|
|
||||||
|
/** @} */
|
||||||
|
|
||||||
|
|
@ -73,14 +73,16 @@ eoMonitor& eoFileMonitor::operator()(void)
|
||||||
|
|
||||||
eoMonitor& eoFileMonitor::operator()(std::ostream& os)
|
eoMonitor& eoFileMonitor::operator()(std::ostream& os)
|
||||||
{
|
{
|
||||||
|
if (vec.size() > 0)
|
||||||
iterator it = vec.begin();
|
|
||||||
|
|
||||||
os << (*it)->getValue();
|
|
||||||
|
|
||||||
for(++it; it != vec.end(); ++it)
|
|
||||||
{
|
{
|
||||||
os << delim.c_str() << (*it)->getValue();
|
iterator it = vec.begin();
|
||||||
|
|
||||||
|
os << (*it)->getValue();
|
||||||
|
|
||||||
|
for(++it; it != vec.end(); ++it)
|
||||||
|
{
|
||||||
|
os << delim.c_str() << (*it)->getValue();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
os << std::endl;
|
os << std::endl;
|
||||||
|
|
|
||||||
90
eo/src/utils/eoGetterUpdater.h
Normal file
90
eo/src/utils/eoGetterUpdater.h
Normal file
|
|
@ -0,0 +1,90 @@
|
||||||
|
/*
|
||||||
|
|
||||||
|
(c) Thales group, 2010
|
||||||
|
|
||||||
|
This library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Lesser General Public
|
||||||
|
License as published by the Free Software Foundation;
|
||||||
|
version 2 of the License.
|
||||||
|
|
||||||
|
This library is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with this library; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
|
||||||
|
Contact: http://eodev.sourceforge.net
|
||||||
|
|
||||||
|
Authors:
|
||||||
|
Lionel Parreaux <lionel.parreaux@gmail.com>
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _eoGetterUpdater_h
|
||||||
|
#define _eoGetterUpdater_h
|
||||||
|
|
||||||
|
#include <utils/eoUpdater.h>
|
||||||
|
|
||||||
|
template <class EOT> class eoCheckPoint;
|
||||||
|
|
||||||
|
/**
|
||||||
|
eoGetterUpdater is an eoUpdater
|
||||||
|
TODO
|
||||||
|
|
||||||
|
@ingroup Utilities
|
||||||
|
*/
|
||||||
|
template <class T, class V = double>
|
||||||
|
class eoGetterUpdater : public eoUpdater, public eoValueParam<V>
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
using eoValueParam<V>::value;
|
||||||
|
|
||||||
|
virtual std::string className(void) const { return "eoGetterUpdater"; }
|
||||||
|
|
||||||
|
typedef V (T::*MethodType)();
|
||||||
|
|
||||||
|
// Overload to accept const getter methods; safely casts them to non-const
|
||||||
|
eoGetterUpdater(T& _instance, V (T::*_method)() const)
|
||||||
|
//eoGetterUpdater(T& _instance, V (T::*_method)()=&T::value)
|
||||||
|
//: instance(_instance), method(static_cast<V (T::*_method)()>(_method))
|
||||||
|
//: instance(_instance), method(const_cast<MethodType>(_method))
|
||||||
|
: instance(_instance), method((MethodType)_method)
|
||||||
|
{ }
|
||||||
|
|
||||||
|
//eoGetterUpdater(T& _instance, V (T::*_method)())
|
||||||
|
eoGetterUpdater(T& _instance, MethodType _method)
|
||||||
|
//eoGetterUpdater(T& _instance, V (T::*_method)()=&T::value)
|
||||||
|
: instance(_instance), method(_method)
|
||||||
|
{ }
|
||||||
|
|
||||||
|
virtual void operator()()
|
||||||
|
{
|
||||||
|
value() = (instance.*method)();
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
T& instance;
|
||||||
|
V (T::*method)();
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -37,14 +37,20 @@ Caner Candan <caner.candan@thalesgroup.com>
|
||||||
#include <cstdio> // used to define EOF
|
#include <cstdio> // used to define EOF
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
#include <algorithm> // std::find
|
||||||
|
|
||||||
#include "eoLogger.h"
|
#include "eoLogger.h"
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef USE_SET
|
||||||
|
typedef std::set<std::ostream*>::iterator StreamIter;
|
||||||
|
#else
|
||||||
|
typedef std::vector<std::ostream*>::iterator StreamIter;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
void eoLogger::_init()
|
void eoLogger::_init()
|
||||||
{
|
{
|
||||||
_standard_io_streams[&std::cout] = 1;
|
|
||||||
_standard_io_streams[&std::clog] = 2;
|
|
||||||
_standard_io_streams[&std::cerr] = 2;
|
|
||||||
|
|
||||||
// /!\ If you want to add a level dont forget to add it at the header file in the enumerator Levels
|
// /!\ If you want to add a level dont forget to add it at the header file in the enumerator Levels
|
||||||
|
|
||||||
|
|
@ -55,6 +61,7 @@ void eoLogger::_init()
|
||||||
addLevel("logging", eo::logging);
|
addLevel("logging", eo::logging);
|
||||||
addLevel("debug", eo::debug);
|
addLevel("debug", eo::debug);
|
||||||
addLevel("xdebug", eo::xdebug);
|
addLevel("xdebug", eo::xdebug);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
eoLogger::eoLogger() :
|
eoLogger::eoLogger() :
|
||||||
|
|
@ -66,33 +73,17 @@ eoLogger::eoLogger() :
|
||||||
|
|
||||||
_selectedLevel(eo::progress),
|
_selectedLevel(eo::progress),
|
||||||
_contextLevel(eo::quiet),
|
_contextLevel(eo::quiet),
|
||||||
_fd(2),
|
_obuf(_contextLevel, _selectedLevel)
|
||||||
_obuf(_fd, _contextLevel, _selectedLevel)
|
|
||||||
{
|
{
|
||||||
std::ostream::init(&_obuf);
|
std::ostream::init(&_obuf);
|
||||||
_init();
|
_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
eoLogger::eoLogger(eo::file file) :
|
|
||||||
std::ostream(NULL),
|
|
||||||
|
|
||||||
_verbose("quiet", "verbose", "Set the verbose level", 'v'),
|
|
||||||
_printVerboseLevels(false, "print-verbose-levels", "Print verbose levels", 'l'),
|
|
||||||
_output("", "output", "Redirect a standard output to a file", 'o'),
|
|
||||||
|
|
||||||
_selectedLevel(eo::progress),
|
|
||||||
_contextLevel(eo::quiet),
|
|
||||||
_fd(2),
|
|
||||||
_obuf(_fd, _contextLevel, _selectedLevel)
|
|
||||||
{
|
|
||||||
std::ostream::init(&_obuf);
|
|
||||||
_init();
|
|
||||||
*this << file;
|
|
||||||
}
|
|
||||||
|
|
||||||
eoLogger::~eoLogger()
|
eoLogger::~eoLogger()
|
||||||
{
|
{
|
||||||
if (_fd > 2) { ::close(_fd); }
|
if (_obuf._ownedFileStream != NULL) {
|
||||||
|
delete _obuf._ownedFileStream;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void eoLogger::_createParameters( eoParser& parser )
|
void eoLogger::_createParameters( eoParser& parser )
|
||||||
|
|
@ -110,19 +101,21 @@ void eoLogger::_createParameters( eoParser& parser )
|
||||||
|
|
||||||
|
|
||||||
//------------------------------------------------------------------
|
//------------------------------------------------------------------
|
||||||
// we're gonna redirect the log to the given filename if -o is used.
|
// we redirect the log to the given filename if -o is used.
|
||||||
//------------------------------------------------------------------
|
//------------------------------------------------------------------
|
||||||
|
|
||||||
if ( ! _output.value().empty() )
|
if ( ! _output.value().empty() )
|
||||||
{
|
{
|
||||||
eo::log << eo::file( _output.value() );
|
redirect(_output.value());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//------------------------------------------------------------------
|
//------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
//------------------------------------------------------------------
|
//------------------------------------------------------------------
|
||||||
// we're gonna print the list of levels if -l parameter is used.
|
// we print the list of levels if -l parameter is used.
|
||||||
//------------------------------------------------------------------
|
//------------------------------------------------------------------
|
||||||
|
|
||||||
if ( _printVerboseLevels.value() )
|
if ( _printVerboseLevels.value() )
|
||||||
|
|
@ -163,12 +156,6 @@ eoLogger& operator<<(eoLogger& l, const eo::Levels lvl)
|
||||||
return l;
|
return l;
|
||||||
}
|
}
|
||||||
|
|
||||||
eoLogger& operator<<(eoLogger& l, eo::file f)
|
|
||||||
{
|
|
||||||
l._fd = ::open(f._f.c_str(), O_WRONLY | O_APPEND | O_CREAT, 0644);
|
|
||||||
return l;
|
|
||||||
}
|
|
||||||
|
|
||||||
eoLogger& operator<<(eoLogger& l, eo::setlevel v)
|
eoLogger& operator<<(eoLogger& l, eo::setlevel v)
|
||||||
{
|
{
|
||||||
l._selectedLevel = (v._lvl < 0 ? l._levels[v._v] : v._lvl);
|
l._selectedLevel = (v._lvl < 0 ? l._levels[v._v] : v._lvl);
|
||||||
|
|
@ -177,37 +164,106 @@ eoLogger& operator<<(eoLogger& l, eo::setlevel v)
|
||||||
|
|
||||||
eoLogger& operator<<(eoLogger& l, std::ostream& os)
|
eoLogger& operator<<(eoLogger& l, std::ostream& os)
|
||||||
{
|
{
|
||||||
if (l._standard_io_streams.find(&os) != l._standard_io_streams.end())
|
#warning deprecated
|
||||||
{
|
l.addRedirect(os);
|
||||||
l._fd = l._standard_io_streams[&os];
|
|
||||||
}
|
|
||||||
return l;
|
return l;
|
||||||
}
|
}
|
||||||
|
|
||||||
eoLogger::outbuf::outbuf(const int& fd,
|
void eoLogger::redirect(std::ostream& os)
|
||||||
const eo::Levels& contexlvl,
|
{
|
||||||
|
doRedirect(&os);
|
||||||
|
}
|
||||||
|
|
||||||
|
void eoLogger::doRedirect(std::ostream* os)
|
||||||
|
{
|
||||||
|
if (_obuf._ownedFileStream != NULL) {
|
||||||
|
delete _obuf._ownedFileStream;
|
||||||
|
_obuf._ownedFileStream = NULL;
|
||||||
|
}
|
||||||
|
_obuf._outStreams.clear();
|
||||||
|
if (os != NULL)
|
||||||
|
#ifdef USE_SET
|
||||||
|
_obuf._outStreams.insert(os);
|
||||||
|
#else
|
||||||
|
_obuf._outStreams.push_back(os);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void eoLogger::addRedirect(std::ostream& os)
|
||||||
|
{
|
||||||
|
bool already_there = tryRemoveRedirect(&os);
|
||||||
|
#ifdef USE_SET
|
||||||
|
_obuf._outStreams.insert(&os);
|
||||||
|
#else
|
||||||
|
_obuf._outStreams.push_back(&os);
|
||||||
|
#endif
|
||||||
|
if (already_there)
|
||||||
|
eo::log << eo::warnings << "Cannot redirect the logger to a stream it is already redirected to." << std::endl;
|
||||||
|
}
|
||||||
|
|
||||||
|
void eoLogger::removeRedirect(std::ostream& os)
|
||||||
|
{
|
||||||
|
if (!tryRemoveRedirect(&os))
|
||||||
|
eo::log << eo::warnings << "Cannot remove from the logger a stream it was not redirected to.";
|
||||||
|
}
|
||||||
|
|
||||||
|
bool eoLogger::tryRemoveRedirect(std::ostream* os)
|
||||||
|
{
|
||||||
|
StreamIter it = find(_obuf._outStreams.begin(), _obuf._outStreams.end(), os);
|
||||||
|
if (it == _obuf._outStreams.end())
|
||||||
|
return false;
|
||||||
|
_obuf._outStreams.erase(it);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void eoLogger::redirect(const char * filename)
|
||||||
|
{
|
||||||
|
std::ofstream * os;
|
||||||
|
if (filename == NULL) {
|
||||||
|
os = NULL;
|
||||||
|
} else {
|
||||||
|
os = new std::ofstream(filename);
|
||||||
|
}
|
||||||
|
doRedirect(os);
|
||||||
|
_obuf._ownedFileStream = os;
|
||||||
|
}
|
||||||
|
|
||||||
|
void eoLogger::redirect(const std::string& filename)
|
||||||
|
{
|
||||||
|
redirect(filename.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
eoLogger::outbuf::outbuf(const eo::Levels& contexlvl,
|
||||||
const eo::Levels& selectedlvl)
|
const eo::Levels& selectedlvl)
|
||||||
: _fd(fd), _contextLevel(contexlvl), _selectedLevel(selectedlvl)
|
:
|
||||||
{}
|
#ifndef USE_SET
|
||||||
|
_outStreams(1, &std::cout),
|
||||||
|
#endif
|
||||||
|
_ownedFileStream(NULL), _contextLevel(contexlvl), _selectedLevel(selectedlvl)
|
||||||
|
{
|
||||||
|
#ifdef USE_SET
|
||||||
|
_outStreams.insert(&std::cout);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
int eoLogger::outbuf::overflow(int_type c)
|
int eoLogger::outbuf::overflow(int_type c)
|
||||||
{
|
{
|
||||||
if (_selectedLevel >= _contextLevel)
|
if (_selectedLevel >= _contextLevel)
|
||||||
{
|
{
|
||||||
if (_fd >= 0 && c != EOF)
|
for (StreamIter it = _outStreams.begin(); it != _outStreams.end(); it++)
|
||||||
{
|
{
|
||||||
::write(_fd, &c, 1);
|
if (c != EOF)
|
||||||
}
|
{
|
||||||
}
|
(**it) << (char) c;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace eo
|
namespace eo
|
||||||
{
|
{
|
||||||
file::file(const std::string f)
|
|
||||||
: _f(f)
|
|
||||||
{}
|
|
||||||
|
|
||||||
setlevel::setlevel(const std::string v)
|
setlevel::setlevel(const std::string v)
|
||||||
: _v(v), _lvl((Levels)-1)
|
: _v(v), _lvl((Levels)-1)
|
||||||
{}
|
{}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
|
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
||||||
(c) Thales group, 2010
|
(c) Thales group, 2010
|
||||||
|
|
||||||
This library is free software; you can redistribute it and/or
|
This library is free software; you can redistribute it and/or
|
||||||
|
|
@ -30,56 +31,7 @@ Caner Candan <caner.candan@thalesgroup.com>
|
||||||
|
|
||||||
Global logger for EO.
|
Global logger for EO.
|
||||||
|
|
||||||
Here's an example explaning how to use eoLogger:
|
For an example explaning how to use eoLogger, please refer to paradiseo/eo/test/t-eoLogger.cpp
|
||||||
\code
|
|
||||||
#include <eo>
|
|
||||||
|
|
||||||
int main(int ac, char** av)
|
|
||||||
{
|
|
||||||
// We are declaring the usual eoParser class
|
|
||||||
eoParser parser(ac, av);
|
|
||||||
|
|
||||||
// This call is important to allow -v parameter to change user level.
|
|
||||||
make_verbose(parser);
|
|
||||||
|
|
||||||
// At this time we are switching to warning message and messages
|
|
||||||
// which are going to follow it are going to be warnings message too.
|
|
||||||
// These messages can be displayed only if the user level (sets with
|
|
||||||
// eo::setlevel function) is set to eo::warnings.
|
|
||||||
eo::log << eo::warnings;
|
|
||||||
|
|
||||||
// With the following eo::file function we are defining that
|
|
||||||
// all future logs are going to this new file resource which is
|
|
||||||
// test.txt
|
|
||||||
eo::log << eo::file("test.txt") << "In FILE" << std::endl;
|
|
||||||
|
|
||||||
// Now we are changing again the resources destination to cout which
|
|
||||||
// is the standard output.
|
|
||||||
eo::log << std::cout << "In COUT" << std::endl;
|
|
||||||
|
|
||||||
// Here are 2 differents examples of how to set the errors user level
|
|
||||||
// in using either a string or an identifier.
|
|
||||||
eo::log << eo::setlevel("errors");
|
|
||||||
eo::log << eo::setlevel(eo::errors);
|
|
||||||
|
|
||||||
// Now we are writting a message, that will be displayed only if we are above the "quiet" level
|
|
||||||
eo::log << eo::quiet << "1) Must be in quiet mode to see that" << std::endl;
|
|
||||||
|
|
||||||
// And so on...
|
|
||||||
eo::log << eo::setlevel(eo::warnings) << eo::warnings << "2) Must be in warnings mode to see that" << std::endl;
|
|
||||||
|
|
||||||
eo::log << eo::setlevel(eo::logging);
|
|
||||||
|
|
||||||
eo::log << eo::errors;
|
|
||||||
eo::log << "3) Must be in errors mode to see that";
|
|
||||||
eo::log << std::endl;
|
|
||||||
|
|
||||||
eo::log << eo::debug << 4 << ')'
|
|
||||||
<< " Must be in debug mode to see that\n";
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
\endcode
|
|
||||||
|
|
||||||
@{
|
@{
|
||||||
*/
|
*/
|
||||||
|
|
@ -91,10 +43,23 @@ Caner Candan <caner.candan@thalesgroup.com>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <iosfwd>
|
#include <iosfwd>
|
||||||
|
#include <fstream>
|
||||||
|
|
||||||
#include "eoObject.h"
|
#include "eoObject.h"
|
||||||
#include "eoParser.h"
|
#include "eoParser.h"
|
||||||
|
|
||||||
|
#define USE_SET // defines if a set is to be used instead of a vector for storing streams the logger is redirected to
|
||||||
|
#undef USE_SET
|
||||||
|
/* expriments have shown that here a vector is by far faster than a set even if O(n),
|
||||||
|
* because it needs less dynamic allocations, uses less memory and less instructions
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef USE_SET
|
||||||
|
#include <set>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
namespace eo
|
namespace eo
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
|
|
@ -110,16 +75,6 @@ namespace eo
|
||||||
debug,
|
debug,
|
||||||
xdebug};
|
xdebug};
|
||||||
|
|
||||||
/**
|
|
||||||
* file
|
|
||||||
* this structure combined with the friend operator<< below is an easy way to select a file as output.
|
|
||||||
*/
|
|
||||||
struct file
|
|
||||||
{
|
|
||||||
explicit file(const std::string f);
|
|
||||||
const std::string _f;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* setlevel
|
* setlevel
|
||||||
* this structure combined with the friend operator<< below is an easy way to set a verbose level.
|
* this structure combined with the friend operator<< below is an easy way to set a verbose level.
|
||||||
|
|
@ -146,7 +101,7 @@ public:
|
||||||
eoLogger();
|
eoLogger();
|
||||||
|
|
||||||
//! overidded ctor in order to instanciate a logger with a file define in parameter
|
//! overidded ctor in order to instanciate a logger with a file define in parameter
|
||||||
eoLogger(eo::file file);
|
//eoLogger(eo::file file);
|
||||||
|
|
||||||
//! dtor
|
//! dtor
|
||||||
~eoLogger();
|
~eoLogger();
|
||||||
|
|
@ -181,6 +136,12 @@ private:
|
||||||
//! used by the set of ctors to initiate some useful variables
|
//! used by the set of ctors to initiate some useful variables
|
||||||
void _init();
|
void _init();
|
||||||
|
|
||||||
|
//! helper function regrouping redirection operations; takes a pointer because can be given NULL
|
||||||
|
void doRedirect(std::ostream*);
|
||||||
|
|
||||||
|
//! helper function searching for a stream and removing it, returning true if successful, false otherwise
|
||||||
|
bool tryRemoveRedirect(std::ostream*);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/**
|
/**
|
||||||
* outbuf
|
* outbuf
|
||||||
|
|
@ -189,11 +150,19 @@ private:
|
||||||
class outbuf : public std::streambuf
|
class outbuf : public std::streambuf
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
outbuf(const int& fd, const eo::Levels& contexlvl, const eo::Levels& selectedlvl);
|
outbuf(const eo::Levels& contexlvl, const eo::Levels& selectedlvl);
|
||||||
|
//std::ostream * _outStream;
|
||||||
|
|
||||||
|
#ifdef USE_SET
|
||||||
|
std::set<std::ostream*> _outStreams;
|
||||||
|
#else
|
||||||
|
std::vector<std::ostream*> _outStreams;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
std::ofstream * _ownedFileStream;
|
||||||
protected:
|
protected:
|
||||||
virtual int overflow(int_type c);
|
virtual int overflow(int_type c);
|
||||||
private:
|
private:
|
||||||
const int& _fd;
|
|
||||||
const eo::Levels& _contextLevel;
|
const eo::Levels& _contextLevel;
|
||||||
const eo::Levels& _selectedLevel;
|
const eo::Levels& _selectedLevel;
|
||||||
};
|
};
|
||||||
|
|
@ -211,12 +180,6 @@ public:
|
||||||
//! in order to use stream style to define the context verbose level where the following logs will be saved
|
//! in order to use stream style to define the context verbose level where the following logs will be saved
|
||||||
friend eoLogger& operator<<(eoLogger&, const eo::Levels);
|
friend eoLogger& operator<<(eoLogger&, const eo::Levels);
|
||||||
|
|
||||||
/**
|
|
||||||
* operator<< used there to set a filename through the class file.
|
|
||||||
*/
|
|
||||||
//! in order to use stream style to define a file to dump instead the standart output
|
|
||||||
friend eoLogger& operator<<(eoLogger&, eo::file);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* operator<< used there to set a verbose level through the class setlevel.
|
* operator<< used there to set a verbose level through the class setlevel.
|
||||||
*/
|
*/
|
||||||
|
|
@ -224,12 +187,39 @@ public:
|
||||||
friend eoLogger& operator<<(eoLogger&, eo::setlevel);
|
friend eoLogger& operator<<(eoLogger&, eo::setlevel);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* operator<< used there to be able to use std::cout to say that we wish to redirect back the buffer to a standard output.
|
* DEPRECATED: Use instead the redirect or addRedirect method; has the same effect as addRedirect
|
||||||
*/
|
*/
|
||||||
//! in order to use stream style to go back to a standart output defined by STL
|
|
||||||
//! and to get retro-compatibility
|
|
||||||
friend eoLogger& operator<<(eoLogger&, std::ostream&);
|
friend eoLogger& operator<<(eoLogger&, std::ostream&);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Redirects the logger to a given output stream.
|
||||||
|
* Closing the stream and returning its memory is at the charge of the caller,
|
||||||
|
* but should not be done while the log is still redirected to it.
|
||||||
|
* This resets all previous redirections set up with redirect and add_redirect.
|
||||||
|
*/
|
||||||
|
void redirect(std::ostream&);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds a redirection from the logger to a given output stream.
|
||||||
|
* Closing the stream and returning its memory is at the charge of the caller,
|
||||||
|
* but should not be done while the log is still redirected to it.
|
||||||
|
* This does not reset previous redirections, which remain active.
|
||||||
|
*/
|
||||||
|
void addRedirect(std::ostream&);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Removes a redirection from the logger to the given output stream.
|
||||||
|
* This only resets the redirection to the stream passed in argument.
|
||||||
|
*/
|
||||||
|
void removeRedirect(std::ostream&);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Redirects the logger to a file using a filename.
|
||||||
|
* Closing the file will be done automatically when the logger is redirected again or destroyed.
|
||||||
|
*/
|
||||||
|
void redirect(const char * filename);
|
||||||
|
void redirect(const std::string& filename);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
friend void make_verbose(eoParser&);
|
friend void make_verbose(eoParser&);
|
||||||
|
|
||||||
|
|
@ -244,13 +234,7 @@ private:
|
||||||
eo::Levels _contextLevel;
|
eo::Levels _contextLevel;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* _fd in storing the file descriptor at this place we can disable easily the buffer in
|
* _obuf std::ostream mandates to use a buffer. _obuf is a outbuf inheriting from std::streambuf.
|
||||||
* changing the value at -1. It is used by operator <<.
|
|
||||||
*/
|
|
||||||
int _fd;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* _obuf std::ostream mandates to use a buffer. _obuf is a outbuf inheriting of std::streambuf.
|
|
||||||
*/
|
*/
|
||||||
outbuf _obuf;
|
outbuf _obuf;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -78,3 +78,4 @@ protected :
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -224,7 +224,9 @@ public :
|
||||||
void setValue(const std::string& _value)
|
void setValue(const std::string& _value)
|
||||||
{
|
{
|
||||||
std::istringstream is(_value);
|
std::istringstream is(_value);
|
||||||
is >> repValue;
|
bool read = (is >> repValue);
|
||||||
|
if (!read)
|
||||||
|
throw std::runtime_error("Could not read value passed in eoValueParam::setValue");
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,29 @@ public:
|
||||||
eoUpdater& addTo(eoCheckPoint<EOT>& cp) { cp.add(*this); return *this; }
|
eoUpdater& addTo(eoCheckPoint<EOT>& cp) { cp.add(*this); return *this; }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
an eoUpdater that simply calls a function with no arguments
|
||||||
|
|
||||||
|
@ingroup Utilities
|
||||||
|
*/
|
||||||
|
class eoFunctionCaller : public eoUpdater
|
||||||
|
{public :
|
||||||
|
/** Default Ctor - requires a pointer to the function to call */
|
||||||
|
eoFunctionCaller(void (*_fct)())
|
||||||
|
: fct(_fct)
|
||||||
|
{ }
|
||||||
|
|
||||||
|
/** Simply increments */
|
||||||
|
virtual void operator()()
|
||||||
|
{
|
||||||
|
(*fct)();
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual std::string className(void) const { return "eoFunctionCaller"; }
|
||||||
|
private:
|
||||||
|
void (*fct)();
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
an eoUpdater that simply increments a counter
|
an eoUpdater that simply increments a counter
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -69,6 +69,7 @@ set (TEST_LIST
|
||||||
#t-openmp # does not work anymore since functions used in this test were removed from EO
|
#t-openmp # does not work anymore since functions used in this test were removed from EO
|
||||||
#t-eoDualFitness
|
#t-eoDualFitness
|
||||||
t-eoParser
|
t-eoParser
|
||||||
|
t-eoOptional
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,30 +3,78 @@
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
#include <eo>
|
#include <eo>
|
||||||
|
//#include <paradiseo/eo.h>
|
||||||
|
#include <fstream>
|
||||||
|
#include <sstream>
|
||||||
|
#include <string>
|
||||||
|
#include <cassert>
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
static void test();
|
||||||
|
|
||||||
int main(int ac, char** av)
|
int main(int ac, char** av)
|
||||||
{
|
{
|
||||||
eoParser parser(ac, av);
|
eoParser parser(ac, av);
|
||||||
|
|
||||||
if (parser.userNeedsHelp())
|
if (parser.userNeedsHelp())
|
||||||
{
|
{
|
||||||
parser.printHelp(std::cout);
|
parser.printHelp(std::cout);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
make_help(parser);
|
make_help(parser);
|
||||||
make_verbose(parser);
|
make_verbose(parser);
|
||||||
|
|
||||||
|
test();
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void test()
|
||||||
|
{
|
||||||
eo::log << eo::setlevel(eo::debug);
|
eo::log << eo::setlevel(eo::debug);
|
||||||
|
|
||||||
eo::log << eo::warnings;
|
eo::log << eo::warnings;
|
||||||
|
|
||||||
eo::log << "We are writing on the default output stream" << std::endl;
|
eo::log << "We are writing on the default output stream" << std::endl;
|
||||||
|
|
||||||
eo::log << eo::file("test.txt") << "In FILE" << std::endl;
|
{
|
||||||
eo::log << std::cout << "on COUT" << std::endl;
|
eo::log.redirect("logtest.txt");
|
||||||
|
eo::log << "In FILE" << std::endl;
|
||||||
|
std::ofstream ofs("logtest2.txt"); // closed and destroyed at the en of the scope
|
||||||
|
eo::log.addRedirect(ofs);
|
||||||
|
eo::log << "In FILE 2" << std::endl;
|
||||||
|
eo::log.removeRedirect(ofs); // must be removed because the associated stream is closed
|
||||||
|
}
|
||||||
|
|
||||||
|
std::ifstream ifs("logtest2.txt"); // stream to logtest2.txt is closed, we can start reading
|
||||||
|
std::string line;
|
||||||
|
assert(std::getline(ifs, line));
|
||||||
|
assert(line == "In FILE 2");
|
||||||
|
assert(!std::getline(ifs, line));
|
||||||
|
|
||||||
|
std::ostringstream oss;
|
||||||
|
eo::log.addRedirect(oss);
|
||||||
|
eo::log << "In STRINGSTREAM";
|
||||||
|
|
||||||
|
std::cout << "Content of ostringstream: " << oss.str() << std::endl;
|
||||||
|
assert(oss.str() == "In STRINGSTREAM");
|
||||||
|
|
||||||
|
eo::log.redirect(std::cout); // removes all previously redirected streams; closes the file logtest.txt
|
||||||
|
eo::log << "on COUT" << std::endl;
|
||||||
|
|
||||||
|
|
||||||
|
ifs.close();
|
||||||
|
ifs.open("logtest.txt");
|
||||||
|
assert(std::getline(ifs, line));
|
||||||
|
assert(line == "In FILE");
|
||||||
|
assert(std::getline(ifs, line));
|
||||||
|
assert(line == "In FILE 2");
|
||||||
|
assert(std::getline(ifs, line));
|
||||||
|
assert(line == "In STRINGSTREAM");
|
||||||
|
assert(!std::getline(ifs, line));
|
||||||
|
|
||||||
|
|
||||||
eo::log << eo::setlevel("errors");
|
eo::log << eo::setlevel("errors");
|
||||||
eo::log << eo::setlevel(eo::errors);
|
eo::log << eo::setlevel(eo::errors);
|
||||||
|
|
@ -42,9 +90,8 @@ int main(int ac, char** av)
|
||||||
eo::log << std::endl;
|
eo::log << std::endl;
|
||||||
|
|
||||||
eo::log << eo::debug << 4 << ')'
|
eo::log << eo::debug << 4 << ')'
|
||||||
<< "4) in debug mode\n";
|
<< "4) in debug mode\n";
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
|
||||||
30
eo/test/t-eoOptional.cpp
Normal file
30
eo/test/t-eoOptional.cpp
Normal file
|
|
@ -0,0 +1,30 @@
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// t-eoOptional.cpp
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#include "eoOptional.h"
|
||||||
|
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
typedef int T;
|
||||||
|
|
||||||
|
struct MyClass {
|
||||||
|
MyClass(eoOptional<T> my_T = NULL)
|
||||||
|
: default_T(42), actual_T(my_T.getOr(default_T))
|
||||||
|
{
|
||||||
|
std::cout << "Value " << actual_T << " was used for construction" << std::endl;
|
||||||
|
}
|
||||||
|
private:
|
||||||
|
T default_T;
|
||||||
|
T& actual_T;
|
||||||
|
};
|
||||||
|
|
||||||
|
int main(int ac, char** av)
|
||||||
|
{
|
||||||
|
// Three ways of using MyClass:
|
||||||
|
MyClass mc1;
|
||||||
|
MyClass mc2(NULL);
|
||||||
|
T t(666);
|
||||||
|
MyClass mc3(t);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -47,99 +47,109 @@
|
||||||
template<class Neighbor>
|
template<class Neighbor>
|
||||||
class moLocalSearch: public eoMonOp<typename Neighbor::EOT> {
|
class moLocalSearch: public eoMonOp<typename Neighbor::EOT> {
|
||||||
public:
|
public:
|
||||||
typedef moNeighborhood<Neighbor> Neighborhood;
|
typedef moNeighborhood<Neighbor> Neighborhood;
|
||||||
typedef moNeighborhoodExplorer<Neighbor> NeighborhoodExplorer;
|
typedef moNeighborhoodExplorer<Neighbor> NeighborhoodExplorer;
|
||||||
typedef typename Neighbor::EOT EOT;
|
typedef typename Neighbor::EOT EOT;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor of a moLocalSearch
|
* Constructor of a moLocalSearch
|
||||||
* @param _searchExpl a neighborhood explorer
|
* @param _searchExpl a neighborhood explorer
|
||||||
* @param _cont an external continuator (can be a checkpoint!)
|
* @param _cont an external continuator (can be a checkpoint!)
|
||||||
* @param _fullEval a full evaluation function
|
* @param _fullEval a full evaluation function
|
||||||
*/
|
*/
|
||||||
moLocalSearch(NeighborhoodExplorer& _searchExpl,
|
moLocalSearch(NeighborhoodExplorer& _searchExpl, moContinuator<Neighbor> & _cont, eoEvalFunc<EOT>& _fullEval)
|
||||||
moContinuator<Neighbor> & _cont, eoEvalFunc<EOT>& _fullEval) :
|
: searchExplorer(_searchExpl), cont(&_cont), fullEval(_fullEval), currentSolutionFitness(0)
|
||||||
searchExplorer(_searchExpl), cont(&_cont), fullEval(_fullEval) {
|
{ }
|
||||||
}
|
|
||||||
;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Run the local search on a solution
|
* Run the local search on a solution
|
||||||
* @param _solution the related solution
|
* @param _solution the related solution
|
||||||
*/
|
*/
|
||||||
virtual bool operator()(EOT & _solution) {
|
virtual bool operator()(EOT & _solution) {
|
||||||
|
|
||||||
if (_solution.invalid())
|
if (_solution.invalid())
|
||||||
fullEval(_solution);
|
fullEval(_solution);
|
||||||
|
|
||||||
// initialization of the parameter of the search (for example fill empty the tabu list)
|
// initialization of the parameter of the search (for example fill empty the tabu list)
|
||||||
searchExplorer.initParam(_solution);
|
searchExplorer.initParam(_solution);
|
||||||
|
|
||||||
// initialization of the external continuator (for example the time, or the number of generations)
|
// initialization of the external continuator (for example the time, or the number of generations)
|
||||||
cont->init(_solution);
|
cont->init(_solution);
|
||||||
|
|
||||||
bool b;
|
bool b;
|
||||||
do {
|
do {
|
||||||
// explore the neighborhood of the solution
|
currentSolutionFitness = _solution.fitness();
|
||||||
searchExplorer(_solution);
|
//std::cout << currentSolutionFitness << std::endl;
|
||||||
// if a solution in the neighborhood can be accepted
|
//std::cin.get();
|
||||||
if (searchExplorer.accept(_solution)) {
|
|
||||||
searchExplorer.move(_solution);
|
|
||||||
searchExplorer.moveApplied(true);
|
|
||||||
} else
|
|
||||||
searchExplorer.moveApplied(false);
|
|
||||||
|
|
||||||
// update the parameter of the search (for ex. Temperature of the SA)
|
// explore the neighborhood of the solution
|
||||||
searchExplorer.updateParam(_solution);
|
searchExplorer(_solution);
|
||||||
|
// if a solution in the neighborhood can be accepted
|
||||||
|
if (searchExplorer.accept(_solution)) {
|
||||||
|
searchExplorer.move(_solution);
|
||||||
|
searchExplorer.moveApplied(true);
|
||||||
|
} else
|
||||||
|
searchExplorer.moveApplied(false);
|
||||||
|
|
||||||
b = (*cont)(_solution);
|
// update the parameter of the search (for ex. Temperature of the SA)
|
||||||
} while (b && searchExplorer.isContinue(_solution));
|
searchExplorer.updateParam(_solution);
|
||||||
|
|
||||||
searchExplorer.terminate(_solution);
|
b = (*cont)(_solution);
|
||||||
|
} while (b && searchExplorer.isContinue(_solution));
|
||||||
|
|
||||||
cont->lastCall(_solution);
|
searchExplorer.terminate(_solution);
|
||||||
|
|
||||||
return true;
|
cont->lastCall(_solution);
|
||||||
}
|
|
||||||
;
|
|
||||||
|
|
||||||
/**
|
return true;
|
||||||
* Set an external continuator
|
}
|
||||||
* @param _cont the external continuator
|
|
||||||
*/
|
|
||||||
void setContinuator(moContinuator<Neighbor> & _cont) {
|
|
||||||
cont = &_cont;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* external continuator object
|
* Set an external continuator
|
||||||
*
|
* @param _cont the external continuator
|
||||||
* @overload
|
*/
|
||||||
* @return the external continuator
|
void setContinuator(moContinuator<Neighbor> & _cont) {
|
||||||
*/
|
cont = &_cont;
|
||||||
moContinuator<Neighbor>* getContinuator() const {
|
}
|
||||||
return cont;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* to get the neighborhood explorer
|
* external continuator object
|
||||||
*
|
*
|
||||||
* @overload
|
* @overload
|
||||||
* @return the neighborhood explorer
|
* @return the external continuator
|
||||||
*/
|
*/
|
||||||
moNeighborhoodExplorer<Neighbor> & getNeighborhoodExplorer() const {
|
moContinuator<Neighbor>* getContinuator() const {
|
||||||
return searchExplorer;
|
return cont;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* to get the neighborhood explorer
|
||||||
|
*
|
||||||
|
* @overload
|
||||||
|
* @return the neighborhood explorer
|
||||||
|
*/
|
||||||
|
moNeighborhoodExplorer<Neighbor> & getNeighborhoodExplorer() const {
|
||||||
|
return searchExplorer;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO doc
|
||||||
|
double getCurrentSolutionFitness() const {
|
||||||
|
return currentSolutionFitness;
|
||||||
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// make the exploration of the neighborhood according to a local search heuristic
|
// make the exploration of the neighborhood according to a local search heuristic
|
||||||
moNeighborhoodExplorer<Neighbor>& searchExplorer;
|
moNeighborhoodExplorer<Neighbor>& searchExplorer;
|
||||||
|
|
||||||
// external continuator
|
// external continuator
|
||||||
moContinuator<Neighbor> * cont;
|
moContinuator<Neighbor> * cont;
|
||||||
|
|
||||||
|
//full evaluation function
|
||||||
|
eoEvalFunc<EOT>& fullEval;
|
||||||
|
|
||||||
|
private:
|
||||||
|
double currentSolutionFitness;
|
||||||
|
|
||||||
//full evaluation function
|
|
||||||
eoEvalFunc<EOT>& fullEval;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
112
mo/src/algo/moMetropolisHastings.h
Normal file
112
mo/src/algo/moMetropolisHastings.h
Normal file
|
|
@ -0,0 +1,112 @@
|
||||||
|
/*
|
||||||
|
<moMetropolisHasting.h>
|
||||||
|
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
|
||||||
|
|
||||||
|
Sebastien Verel, Arnaud Liefooghe, Jeremie Humeau, Lionel Parreaux
|
||||||
|
|
||||||
|
This software is governed by the CeCILL license under French law and
|
||||||
|
abiding by the rules of distribution of free software. You can ue,
|
||||||
|
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".
|
||||||
|
|
||||||
|
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 _moMetropolisHastings_h
|
||||||
|
#define _moMetropolisHastings_h
|
||||||
|
|
||||||
|
#include <algo/moLocalSearch.h>
|
||||||
|
#include <explorer/moMetropolisHastingsExplorer.h>
|
||||||
|
#include <explorer/moSimpleMetropolisHastingsExplorer.h>
|
||||||
|
#include <continuator/moTrueContinuator.h>
|
||||||
|
#include <eval/moEval.h>
|
||||||
|
#include <eoEvalFunc.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Metropolis-Hasting local search
|
||||||
|
* Only the symetric case is considered when Q(x,y) = Q(y,x)
|
||||||
|
* Fitness must be > 0
|
||||||
|
*
|
||||||
|
* At each iteration,
|
||||||
|
* one of the random solution in the neighborhood is selected
|
||||||
|
* if the selected neighbor have higher or equal fitness than the current solution
|
||||||
|
* then the solution is replaced by the selected neighbor
|
||||||
|
* if a random number from [0,1] is lower than fitness(neighbor) / fitness(solution)
|
||||||
|
* then the solution is replaced by the selected neighbor
|
||||||
|
* the algorithm stops when the number of iterations is too large
|
||||||
|
*/
|
||||||
|
template<class Neighbor>
|
||||||
|
class moMetropolisHastings: public moLocalSearch<Neighbor>
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
typedef typename Neighbor::EOT EOT;
|
||||||
|
typedef moNeighborhood<Neighbor> Neighborhood ;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Basic constructor of the Metropolis-Hasting
|
||||||
|
* @param _neighborhood the neighborhood
|
||||||
|
* @param _fullEval the full evaluation function
|
||||||
|
* @param _eval neighbor's evaluation function
|
||||||
|
* @param _nbStep maximum step to do
|
||||||
|
*/
|
||||||
|
moMetropolisHastings(Neighborhood& _neighborhood, eoEvalFunc<EOT>& _fullEval, moEval<Neighbor>& _eval, unsigned int _nbStep):
|
||||||
|
moLocalSearch<Neighbor>(explorer, trueCont, _fullEval),
|
||||||
|
explorer(_neighborhood, _eval, defaultNeighborComp, defaultSolNeighborComp, _nbStep)
|
||||||
|
{}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Simple constructor of the Metropolis-Hasting
|
||||||
|
* @param _neighborhood the neighborhood
|
||||||
|
* @param _fullEval the full evaluation function
|
||||||
|
* @param _eval neighbor's evaluation function
|
||||||
|
* @param _nbStep maximum step to do
|
||||||
|
* @param _cont an external continuator
|
||||||
|
*/
|
||||||
|
moMetropolisHastings(Neighborhood& _neighborhood, eoEvalFunc<EOT>& _fullEval, moEval<Neighbor>& _eval, unsigned int _nbStep, moContinuator<Neighbor>& _cont):
|
||||||
|
moLocalSearch<Neighbor>(explorer, _cont, _fullEval),
|
||||||
|
explorer(_neighborhood, _eval, defaultNeighborComp, defaultSolNeighborComp, _nbStep)
|
||||||
|
{}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* General constructor of the Metropolis-Hasting
|
||||||
|
* @param _neighborhood the neighborhood
|
||||||
|
* @param _fullEval the full evaluation function
|
||||||
|
* @param _eval neighbor's evaluation function
|
||||||
|
* @param _nbStep maximum step to do
|
||||||
|
* @param _cont an external continuator
|
||||||
|
* @param _compN a neighbor vs neighbor comparator
|
||||||
|
* @param _compSN a solution vs neighbor comparator
|
||||||
|
*/
|
||||||
|
moMetropolisHastings(Neighborhood& _neighborhood, eoEvalFunc<EOT>& _fullEval, moEval<Neighbor>& _eval, unsigned int _nbStep, moContinuator<Neighbor>& _cont, moNeighborComparator<Neighbor>& _compN, moSolNeighborComparator<Neighbor>& _compSN):
|
||||||
|
moLocalSearch<Neighbor>(explorer, _cont, _fullEval),
|
||||||
|
explorer(_neighborhood, _eval, _compN, _compSN, _nbStep)
|
||||||
|
{}
|
||||||
|
|
||||||
|
private:
|
||||||
|
// always true continuator
|
||||||
|
moTrueContinuator<Neighbor> trueCont;
|
||||||
|
// compare the fitness values of neighbors
|
||||||
|
moNeighborComparator<Neighbor> defaultNeighborComp;
|
||||||
|
// compare the fitness values of the solution and the neighbor
|
||||||
|
moSolNeighborComparator<Neighbor> defaultSolNeighborComp;
|
||||||
|
// MetropolisHasting explorer
|
||||||
|
//moMetropolisHastingsExplorer<Neighbor> explorer;
|
||||||
|
moSimpleMetropolisHastingsExplorer<Neighbor> explorer;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
<moSA.h>
|
<moSA.h>
|
||||||
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
|
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
|
||||||
|
|
||||||
Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau
|
Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau, Lionel Parreaux
|
||||||
|
|
||||||
This software is governed by the CeCILL license under French law and
|
This software is governed by the CeCILL license under French law and
|
||||||
abiding by the rules of distribution of free software. You can ue,
|
abiding by the rules of distribution of free software. You can ue,
|
||||||
|
|
@ -31,12 +31,13 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
||||||
#define _moSA_h
|
#define _moSA_h
|
||||||
|
|
||||||
#include <algo/moLocalSearch.h>
|
#include <algo/moLocalSearch.h>
|
||||||
#include <explorer/moSAexplorer.h>
|
#include <explorer/moSAExplorer.h>
|
||||||
#include <coolingSchedule/moCoolingSchedule.h>
|
#include <coolingSchedule/moCoolingSchedule.h>
|
||||||
#include <coolingSchedule/moSimpleCoolingSchedule.h>
|
#include <coolingSchedule/moSimpleCoolingSchedule.h>
|
||||||
#include <continuator/moTrueContinuator.h>
|
#include <continuator/moTrueContinuator.h>
|
||||||
#include <eval/moEval.h>
|
#include <eval/moEval.h>
|
||||||
#include <eoEvalFunc.h>
|
#include <eoEvalFunc.h>
|
||||||
|
#include <eoOptional.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Simulated Annealing
|
* Simulated Annealing
|
||||||
|
|
@ -60,38 +61,64 @@ public:
|
||||||
* @param _span number of iteration with equal temperature for cooling schedule (default = 100)
|
* @param _span number of iteration with equal temperature for cooling schedule (default = 100)
|
||||||
* @param _finalT final temperature, threshold of the stopping criteria for cooling schedule (default = 0.01)
|
* @param _finalT final temperature, threshold of the stopping criteria for cooling schedule (default = 0.01)
|
||||||
*/
|
*/
|
||||||
moSA(Neighborhood& _neighborhood, eoEvalFunc<EOT>& _fullEval, moEval<Neighbor>& _eval, double _initT=10, double _alpha=0.9, unsigned _span=100, double _finalT=0.01):
|
/*moSA(Neighborhood& _neighborhood, eoEvalFunc<EOT>& _fullEval, moEval<Neighbor>& _eval, double _initT=10, double _alpha=0.9, unsigned _span=100, double _finalT=0.01)
|
||||||
moLocalSearch<Neighbor>(explorer, trueCont, _fullEval),
|
: defaultCool(_initT, _alpha, _span, _finalT),
|
||||||
defaultCool(_initT, _alpha, _span, _finalT),
|
explorer(_neighborhood, _eval, defaultSolNeighborComp, defaultCool),
|
||||||
explorer(_neighborhood, _eval, defaultSolNeighborComp, defaultCool)
|
moLocalSearch<Neighbor>(explorer, defaultContinuator, _fullEval)
|
||||||
{}
|
{ }*/
|
||||||
|
moSA(Neighborhood& _neighborhood, eoEvalFunc<EOT>& _fullEval, moEval<Neighbor>& _eval, double _initT=10, double _alpha=0.9, unsigned _span=100, double _finalT=0.01)
|
||||||
|
: moLocalSearch<Neighbor> (
|
||||||
|
*(explorer_ptr = defaultExplorer = new moSAExplorer<Neighbor>(_neighborhood, _eval, /*NULL,*/ *(defaultCool = new moSimpleCoolingSchedule<EOT>(_initT, _alpha, _span, _finalT)), NULL)),
|
||||||
|
*(defaultContinuator = new moTrueContinuator<Neighbor>()),
|
||||||
|
_fullEval ),
|
||||||
|
explorer(*explorer_ptr),
|
||||||
|
//defaultCool(),
|
||||||
|
defaultEval(NULL) // removed in C++11 with unique_ptr
|
||||||
|
//defaultSolNeighborComp(new moSolNeighborComparator<Neighbor>())
|
||||||
|
//explorer(_neighborhood, _eval, *defaultSolNeighborComp, *defaultCool)
|
||||||
|
{ }
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* Simple constructor for a simulated annealing
|
// * Simple constructor for a simulated annealing
|
||||||
* @param _neighborhood the neighborhood
|
// * @param _neighborhood the neighborhood
|
||||||
* @param _fullEval the full evaluation function
|
// * @param _fullEval the full evaluation function
|
||||||
* @param _eval neighbor's evaluation function
|
// * @param _eval neighbor's evaluation function
|
||||||
* @param _cool a cooling schedule
|
// * @param _cool a cooling schedule
|
||||||
*/
|
// */
|
||||||
moSA(Neighborhood& _neighborhood, eoEvalFunc<EOT>& _fullEval, moEval<Neighbor>& _eval, moCoolingSchedule<EOT>& _cool):
|
// moSA(Neighborhood& _neighborhood, eoEvalFunc<EOT>& _fullEval, moEval<Neighbor>& _eval, moCoolingSchedule<EOT>& _cool):
|
||||||
moLocalSearch<Neighbor>(explorer, trueCont, _fullEval),
|
// moLocalSearch<Neighbor>(explorer, defaultContinuator, _fullEval),
|
||||||
defaultCool(0, 0, 0, 0),
|
// defaultCool(0, 0, 0, 0),
|
||||||
explorer(_neighborhood, _eval, defaultSolNeighborComp, _cool)
|
// explorer(_neighborhood, _eval, defaultSolNeighborComp, _cool)
|
||||||
{}
|
// {}
|
||||||
|
//
|
||||||
/**
|
// /**
|
||||||
* General constructor for a simulated annealing
|
// * General constructor for a simulated annealing
|
||||||
* @param _neighborhood the neighborhood
|
// * @param _neighborhood the neighborhood
|
||||||
* @param _fullEval the full evaluation function
|
// * @param _fullEval the full evaluation function
|
||||||
* @param _eval neighbor's evaluation function
|
// * @param _eval neighbor's evaluation function
|
||||||
* @param _cool a cooling schedule
|
// * @param _cool a cooling schedule
|
||||||
* @param _cont an external continuator
|
// * @param _cont an external continuator
|
||||||
*/
|
// */
|
||||||
moSA(Neighborhood& _neighborhood, eoEvalFunc<EOT>& _fullEval, moEval<Neighbor>& _eval, moCoolingSchedule<EOT>& _cool, moContinuator<Neighbor>& _cont):
|
// moSA(Neighborhood& _neighborhood, eoEvalFunc<EOT>& _fullEval, moEval<Neighbor>& _eval, moCoolingSchedule<EOT>& _cool, moContinuator<Neighbor>& _cont):
|
||||||
moLocalSearch<Neighbor>(explorer, _cont, _fullEval),
|
// moLocalSearch<Neighbor>(explorer, _cont, _fullEval),
|
||||||
defaultCool(0, 0, 0, 0),
|
// defaultCool(0, 0, 0, 0),
|
||||||
explorer(_neighborhood, _eval, defaultSolNeighborComp, _cool)
|
// explorer(_neighborhood, _eval, defaultSolNeighborComp, _cool)
|
||||||
{}
|
// {}
|
||||||
|
//
|
||||||
|
// /**
|
||||||
|
// * General constructor for a simulated annealing
|
||||||
|
// * @param _neighborhood the neighborhood
|
||||||
|
// * @param _fullEval the full evaluation function
|
||||||
|
// * @param _eval neighbor's evaluation function
|
||||||
|
// * @param _cool a cooling schedule
|
||||||
|
// * @param _comp a solution vs neighbor comparator
|
||||||
|
// * @param _cont an external continuator
|
||||||
|
// */
|
||||||
|
// moSA(Neighborhood& _neighborhood, eoEvalFunc<EOT>& _fullEval, moEval<Neighbor>& _eval, moCoolingSchedule<EOT>& _cool, moSolNeighborComparator<Neighbor>& _comp, moContinuator<Neighbor>& _cont):
|
||||||
|
// moLocalSearch<Neighbor>(explorer, _cont, _fullEval),
|
||||||
|
// defaultCool(0, 0, 0, 0),
|
||||||
|
// explorer(_neighborhood, _eval, _comp, _cool)
|
||||||
|
// {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* General constructor for a simulated annealing
|
* General constructor for a simulated annealing
|
||||||
|
|
@ -102,19 +129,107 @@ public:
|
||||||
* @param _comp a solution vs neighbor comparator
|
* @param _comp a solution vs neighbor comparator
|
||||||
* @param _cont an external continuator
|
* @param _cont an external continuator
|
||||||
*/
|
*/
|
||||||
moSA(Neighborhood& _neighborhood, eoEvalFunc<EOT>& _fullEval, moEval<Neighbor>& _eval, moCoolingSchedule<EOT>& _cool, moSolNeighborComparator<Neighbor>& _comp, moContinuator<Neighbor>& _cont):
|
moSA (
|
||||||
moLocalSearch<Neighbor>(explorer, _cont, _fullEval),
|
Neighborhood& _neighborhood,
|
||||||
defaultCool(0, 0, 0, 0),
|
eoEvalFunc<EOT>& _fullEval,
|
||||||
explorer(_neighborhood, _eval, _comp, _cool)
|
moCoolingSchedule<EOT>& _cool,
|
||||||
{}
|
eoOptional< moEval<Neighbor> > _eval = NULL,
|
||||||
|
eoOptional< moContinuator<Neighbor> > _cont = NULL,
|
||||||
|
eoOptional< moSolNeighborComparator<Neighbor> > _comp = NULL
|
||||||
|
)
|
||||||
|
/*: moLocalSearch<Neighbor>(explorer, _cont.hasValue()? _cont.get(): *(defaultContinuator = new moTrueContinuator<Neighbor>()), _fullEval),
|
||||||
|
defaultCool(NULL), // removed in C++11 with unique_ptr
|
||||||
|
defaultEval(NULL), // removed in C++11 with unique_ptr
|
||||||
|
defaultSolNeighborComp(NULL), // removed in C++11 with unique_ptr
|
||||||
|
defaultContinuator(NULL), // removed in C++11 with unique_ptr
|
||||||
|
explorer (
|
||||||
|
_neighborhood,
|
||||||
|
_eval.hasValue()? _eval.get(): *(defaultEval = new moFullEvalByCopy<Neighbor>(_fullEval)),
|
||||||
|
// C++11: _eval.hasValue()? _eval.get(): defaultEval = new moFullEvalByCopy<Neighbor>(),
|
||||||
|
_comp.hasValue()? _comp.get(): *(defaultSolNeighborComp = new moSolNeighborComparator<Neighbor>()),
|
||||||
|
_cool )
|
||||||
|
{ }*/
|
||||||
|
: moLocalSearch<Neighbor> (
|
||||||
|
*(explorer_ptr = defaultExplorer = new moSAExplorer<Neighbor> (
|
||||||
|
_neighborhood,
|
||||||
|
//_eval, //_eval.hasValue()? _eval.get(): *(defaultEval = new moFullEvalByCopy<Neighbor>(_fullEval)),
|
||||||
|
_eval.hasValue()? defaultEval = NULL, _eval.get(): *(defaultEval = new moFullEvalByCopy<Neighbor>(_fullEval)),
|
||||||
|
// C++11: _eval.hasValue()? _eval.get(): defaultEval = new moFullEvalByCopy<Neighbor>(),
|
||||||
|
//_comp, //_comp.hasValue()? _comp.get(): *(defaultSolNeighborComp = new moSolNeighborComparator<Neighbor>()),
|
||||||
|
//_cool ),
|
||||||
|
_cool,
|
||||||
|
_comp )),
|
||||||
|
// ),
|
||||||
|
_cont.hasValue()? defaultContinuator = NULL, _cont.get(): *(defaultContinuator = new moTrueContinuator<Neighbor>()),
|
||||||
|
_fullEval ),
|
||||||
|
explorer(*explorer_ptr),
|
||||||
|
defaultCool(NULL) // removed in C++11 with unique_ptr
|
||||||
|
//defaultEval(NULL), // removed in C++11 with unique_ptr
|
||||||
|
//defaultContinuator(NULL) // removed in C++11 with unique_ptr
|
||||||
|
//defaultSolNeighborComp(NULL) // removed in C++11 with unique_ptr
|
||||||
|
{ }
|
||||||
|
|
||||||
|
|
||||||
|
moSA (
|
||||||
|
eoEvalFunc<EOT>& _fullEval,
|
||||||
|
moSAExplorer<Neighbor>& _explorer,
|
||||||
|
eoOptional< moContinuator<Neighbor> > _cont = NULL
|
||||||
|
)
|
||||||
|
: moLocalSearch<Neighbor> (
|
||||||
|
*(explorer_ptr = &_explorer),
|
||||||
|
_cont.hasValue()? defaultContinuator = NULL, _cont.get(): *(defaultContinuator = new moTrueContinuator<Neighbor>()), _fullEval ),
|
||||||
|
defaultEval(NULL), // removed in C++11 with unique_ptr
|
||||||
|
defaultExplorer(NULL), // removed in C++11 with unique_ptr
|
||||||
|
explorer(*explorer_ptr),
|
||||||
|
defaultCool(NULL) // removed in C++11 with unique_ptr
|
||||||
|
//defaultEval(NULL) // removed in C++11 with unique_ptr
|
||||||
|
//defaultContinuator(NULL) // removed in C++11 with unique_ptr
|
||||||
|
//defaultSolNeighborComp(NULL) // removed in C++11 with unique_ptr
|
||||||
|
{ }
|
||||||
|
|
||||||
|
/*
|
||||||
|
moSA (
|
||||||
|
eoEvalFunc<EOT>& _fullEval,
|
||||||
|
moSAExplorer<Neighbor>& _explorer,
|
||||||
|
moContinuator<Neighbor> _cont
|
||||||
|
)
|
||||||
|
: moLocalSearch<Neighbor> (
|
||||||
|
*(explorer = &_explorer),
|
||||||
|
_cont, _fullEval ),
|
||||||
|
defaultExplorer(NULL), // removed in C++11 with unique_ptr
|
||||||
|
defaultCool(NULL), // removed in C++11 with unique_ptr
|
||||||
|
//defaultEval(NULL), // removed in C++11 with unique_ptr
|
||||||
|
defaultContinuator(NULL) // removed in C++11 with unique_ptr
|
||||||
|
//defaultSolNeighborComp(NULL) // removed in C++11 with unique_ptr
|
||||||
|
{ }
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
virtual ~moSA ()
|
||||||
|
{
|
||||||
|
// Note: using unique_ptr would allow us to remove this explicit destructor, but they were only introduced in C++11
|
||||||
|
if (defaultContinuator != NULL)
|
||||||
|
delete defaultContinuator;
|
||||||
|
if (defaultExplorer != NULL)
|
||||||
|
delete defaultExplorer;
|
||||||
|
if (defaultEval != NULL)
|
||||||
|
delete defaultEval;
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
moTrueContinuator<Neighbor> trueCont;
|
moFullEvalByCopy<Neighbor>* defaultEval;
|
||||||
moSimpleCoolingSchedule<EOT> defaultCool;
|
moSAExplorer<Neighbor>* defaultExplorer;
|
||||||
moSolNeighborComparator<Neighbor> defaultSolNeighborComp;
|
moSAExplorer<Neighbor>* explorer_ptr; // Not NULL
|
||||||
moSAexplorer<Neighbor> explorer;
|
moSAExplorer<Neighbor>& explorer;
|
||||||
|
moSimpleCoolingSchedule<EOT>* defaultCool; // C++11: const std::unique_ptr<moSimpleCoolingSchedule<EOT>>
|
||||||
|
//moFullEvalByCopy<Neighbor>* defaultEval;
|
||||||
|
moTrueContinuator<Neighbor>* defaultContinuator;
|
||||||
|
//moSolNeighborComparator<Neighbor>* defaultSolNeighborComp;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -107,13 +107,22 @@ public :
|
||||||
virtual void init(EOT& _sol) {
|
virtual void init(EOT& _sol) {
|
||||||
for (unsigned i = 0; i < stats.size(); ++i)
|
for (unsigned i = 0; i < stats.size(); ++i)
|
||||||
stats[i]->init(_sol);
|
stats[i]->init(_sol);
|
||||||
counter=1;
|
counter = 1;
|
||||||
|
|
||||||
for (unsigned i = 0; i < moupdaters.size(); ++i)
|
for (unsigned i = 0; i < moupdaters.size(); ++i)
|
||||||
moupdaters[i]->init();
|
moupdaters[i]->init();
|
||||||
|
|
||||||
|
//for (unsigned i = 0; i < updaters.size(); ++i)
|
||||||
|
// updaters[i]->init();
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Removed because there was no reason for it to be done here
|
||||||
|
* It caused premature monitoring of eoParams with uninitialized values
|
||||||
|
* (eoUpdater's don't have a init function)
|
||||||
|
*
|
||||||
for (unsigned int i = 0; i < monitors.size(); ++i)
|
for (unsigned int i = 0; i < monitors.size(); ++i)
|
||||||
(*monitors[i])();
|
(*monitors[i])();
|
||||||
|
*/
|
||||||
|
|
||||||
for (unsigned i = 0; i < continuators.size(); ++i)
|
for (unsigned i = 0; i < continuators.size(); ++i)
|
||||||
continuators[i]->init(_sol);
|
continuators[i]->init(_sol);
|
||||||
|
|
|
||||||
|
|
@ -53,6 +53,10 @@ public :
|
||||||
monitors.push_back(&_mon);
|
monitors.push_back(&_mon);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
moCounterMonitorSaver(unsigned _interval)
|
||||||
|
: interval(_interval), counter(0)
|
||||||
|
{ }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* call monitors if interval is reach by a counter
|
* call monitors if interval is reach by a counter
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
110
mo/src/continuator/moFitnessMomentsStat.h
Normal file
110
mo/src/continuator/moFitnessMomentsStat.h
Normal file
|
|
@ -0,0 +1,110 @@
|
||||||
|
/*
|
||||||
|
|
||||||
|
(c) Thales group, 2010
|
||||||
|
|
||||||
|
This library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Lesser General Public
|
||||||
|
License as published by the Free Software Foundation;
|
||||||
|
version 2 of the License.
|
||||||
|
|
||||||
|
This library is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with this library; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
|
||||||
|
Contact: http://eodev.sourceforge.net
|
||||||
|
|
||||||
|
Authors:
|
||||||
|
Lionel Parreaux <lionel.parreaux@gmail.com>
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef moFitnessMomentsStat_h
|
||||||
|
#define moFitnessMomentsStat_h
|
||||||
|
|
||||||
|
#include <utility>
|
||||||
|
#include <continuator/moStat.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Statistic that saves the standard deviation of the fitness of the solutions during the search
|
||||||
|
*/
|
||||||
|
template <class EOT>
|
||||||
|
//class moFitnessMomentsStat : public moStat<EOT, std::pair<typename EOT::Fitness,typename EOT::Fitness> >
|
||||||
|
class moFitnessMomentsStat : public moStat<EOT, std::pair<double, double> >
|
||||||
|
{
|
||||||
|
public :
|
||||||
|
typedef typename EOT::Fitness Fitness;
|
||||||
|
//typedef std::pair<typename EOT::Fitness,typename EOT::Fitness> Pair;
|
||||||
|
typedef std::pair<double, double> Pair;
|
||||||
|
using moStat<EOT, Pair >::value;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Default Constructor
|
||||||
|
* @param _reInitSol when true the best so far is reinitialized
|
||||||
|
*/
|
||||||
|
moFitnessMomentsStat(bool _reInitSol = true)
|
||||||
|
: moStat<EOT, Pair>(Pair(Fitness(), 0.0), "moments (average and stdev)"),
|
||||||
|
reInitSol(_reInitSol), firstTime(true),
|
||||||
|
nbSolutionsEncountered(0), currentAvg(0), currentVar(0)
|
||||||
|
{ }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initialization of the best solution on the first one
|
||||||
|
* @param _sol the first solution
|
||||||
|
*/
|
||||||
|
virtual void init(EOT & _sol) {
|
||||||
|
if (reInitSol || firstTime)
|
||||||
|
{
|
||||||
|
value() = Pair(0.0,0.0);
|
||||||
|
nbSolutionsEncountered = currentAvg = currentVar = 0;
|
||||||
|
firstTime = false;
|
||||||
|
}
|
||||||
|
/*else if (firstTime)
|
||||||
|
{
|
||||||
|
value() = 0.0;
|
||||||
|
firstTime = false;
|
||||||
|
}*/
|
||||||
|
operator()(_sol);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update the best solution
|
||||||
|
* @param _sol the current solution
|
||||||
|
*/
|
||||||
|
virtual void operator()(EOT & _sol) {
|
||||||
|
++nbSolutionsEncountered;
|
||||||
|
double x = _sol.fitness();
|
||||||
|
double oldAvg = currentAvg;
|
||||||
|
currentAvg = oldAvg + (x - oldAvg)/nbSolutionsEncountered;
|
||||||
|
if (nbSolutionsEncountered > 1) // <- not really necessary
|
||||||
|
{
|
||||||
|
//value() = (value()/nbSolutionsEncountered + _sol.fitness())/(nbSolutionsEncountered+1);
|
||||||
|
double oldVar = currentVar;
|
||||||
|
currentVar = oldVar + (x - oldAvg) * (x - currentAvg);
|
||||||
|
value() = Pair(currentAvg, currentVar/nbSolutionsEncountered);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return name of the class
|
||||||
|
*/
|
||||||
|
virtual std::string className(void) const {
|
||||||
|
return "moFitnessVarianceStat";
|
||||||
|
}
|
||||||
|
|
||||||
|
protected:
|
||||||
|
bool reInitSol;
|
||||||
|
bool firstTime;
|
||||||
|
double
|
||||||
|
nbSolutionsEncountered
|
||||||
|
, currentAvg
|
||||||
|
, currentVar // actually the var * n
|
||||||
|
;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // moFitnessMomentsStat_h
|
||||||
97
mo/src/continuator/moFitnessVarianceStat.h
Normal file
97
mo/src/continuator/moFitnessVarianceStat.h
Normal file
|
|
@ -0,0 +1,97 @@
|
||||||
|
/*
|
||||||
|
|
||||||
|
(c) Thales group, 2010
|
||||||
|
|
||||||
|
This library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Lesser General Public
|
||||||
|
License as published by the Free Software Foundation;
|
||||||
|
version 2 of the License.
|
||||||
|
|
||||||
|
This library is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with this library; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
|
||||||
|
Contact: http://eodev.sourceforge.net
|
||||||
|
|
||||||
|
Authors:
|
||||||
|
Lionel Parreaux <lionel.parreaux@gmail.com>
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef moFitnessVarianceStat_h
|
||||||
|
#define moFitnessVarianceStat_h
|
||||||
|
|
||||||
|
#include <continuator/moStat.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Statistic that incrementally computes the variance of the fitness of the solutions during the search
|
||||||
|
*/
|
||||||
|
template <class EOT>
|
||||||
|
class moFitnessVarianceStat : public moStat<EOT, typename EOT::Fitness>
|
||||||
|
{
|
||||||
|
public :
|
||||||
|
typedef typename EOT::Fitness Fitness;
|
||||||
|
using moStat< EOT , typename EOT::Fitness >::value;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Default Constructor
|
||||||
|
* @param _reInitSol when true the best so far is reinitialized
|
||||||
|
*/
|
||||||
|
moFitnessVarianceStat(bool _reInitSol = true)
|
||||||
|
: moStat<EOT, typename EOT::Fitness>(Fitness(), "var"),
|
||||||
|
reInitSol(_reInitSol), firstTime(true),
|
||||||
|
nbSolutionsEncountered(0), currentAvg(0), currentVar(0)
|
||||||
|
{ }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initialization of the best solution on the first one
|
||||||
|
* @param _sol the first solution
|
||||||
|
*/
|
||||||
|
virtual void init(EOT & _sol) {
|
||||||
|
if (reInitSol || firstTime)
|
||||||
|
{
|
||||||
|
value() = 0.0;
|
||||||
|
nbSolutionsEncountered = currentAvg = currentVar = 0;
|
||||||
|
firstTime = false;
|
||||||
|
}
|
||||||
|
operator()(_sol);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update the best solution
|
||||||
|
* @param _sol the current solution
|
||||||
|
*/
|
||||||
|
virtual void operator()(EOT & _sol) {
|
||||||
|
++nbSolutionsEncountered;
|
||||||
|
double x = _sol.fitness();
|
||||||
|
double oldAvg = currentAvg;
|
||||||
|
currentAvg = oldAvg + (x - oldAvg)/nbSolutionsEncountered;
|
||||||
|
double oldVar = currentVar;
|
||||||
|
currentVar = oldVar + (x - oldAvg) * (x - currentAvg);
|
||||||
|
value() = currentVar/nbSolutionsEncountered;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return name of the class
|
||||||
|
*/
|
||||||
|
virtual std::string className(void) const {
|
||||||
|
return "moFitnessVarianceStat";
|
||||||
|
}
|
||||||
|
|
||||||
|
protected:
|
||||||
|
bool reInitSol;
|
||||||
|
bool firstTime;
|
||||||
|
double
|
||||||
|
nbSolutionsEncountered
|
||||||
|
, currentAvg
|
||||||
|
, currentVar // actually the var * n
|
||||||
|
;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // moFitnessVarianceStat_h
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue