Commit 50f8f5c2 authored by Jean-Baptiste Mouret's avatar Jean-Baptiste Mouret
Browse files

move the random_generator to its own file

parent 5eda59e6
......@@ -4,7 +4,7 @@
#include <Eigen/Core>
#include <limbo/tools/macros.hpp>
#include <limbo/tools/math.hpp>
#include <limbo/tools/random_generator.hpp>
namespace limbo {
namespace defaults {
......
......@@ -4,6 +4,7 @@
#include <Eigen/Core>
#include <limbo/tools/macros.hpp>
#include <limbo/tools/random_generator.hpp>
namespace limbo {
namespace defaults {
......
......@@ -5,5 +5,6 @@
#include <limbo/tools/parallel.hpp>
#include <limbo/tools/math.hpp>
#include <limbo/tools/sys.hpp>
#include <limbo/tools/random_generator.hpp>
#endif
//| This file is a part of the sferes2 framework.
//| This file is a part of the limbo framework.
//| Copyright 2009, ISIR / Universite Pierre et Marie Curie (UPMC)
//| Main contributor(s): Jean-Baptiste Mouret, mouret@isir.fr
//|
......@@ -48,32 +46,6 @@
namespace limbo {
namespace tools {
// usage :
// rgen_double_t(0.0, 1.0);
// double r = rgen.rand();
template<typename D>
class RandomGenerator {
public:
using result_type = typename D::result_type;
RandomGenerator(result_type min, result_type max) :
_dist(min, max), _rgen(std::random_device()()) {}
result_type rand()
{
std::lock_guard<std::mutex> lock(_mutex);
return _dist(_rgen);
}
private:
D _dist;
std::mt19937 _rgen;
std::mutex _mutex;
};
using rdist_double_t = std::uniform_real_distribution<double>;
using rdist_int_t = std::uniform_int_distribution<int>;
using rgen_double_t = RandomGenerator<rdist_double_t>;
using rgen_int_t = RandomGenerator<rdist_int_t>;
// get sign of number
template <typename T>
inline constexpr int signum(T x, std::false_type is_signed)
......
//| This file is a part of the limbo framework.
//| Copyright 2014, Universite Pierre et Marie Curie (UPMC) / Inria
//|
//| This software is a computer program whose purpose is to facilitate
//| experiments in evolutionary computation and evolutionary robotics.
//|
//| 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.
#ifndef LIMBO_TOOLS_RANDOM_GENERATOR_HPP
#define LIMBO_TOOLS_RANDOM_GENERATOR_HPP
#include <cstdlib>
#include <cmath>
#include <ctime>
#include <list>
#include <stdlib.h>
#include <random>
#include <utility>
#include <mutex>
namespace limbo {
namespace tools {
// usage :
// rgen_double_t(0.0, 1.0);
// double r = rgen.rand();
template<typename D>
class RandomGenerator {
public:
using result_type = typename D::result_type;
RandomGenerator(result_type min, result_type max) :
_dist(min, max), _rgen(std::random_device()()) {}
result_type rand()
{
std::lock_guard<std::mutex> lock(_mutex);
return _dist(_rgen);
}
private:
D _dist;
std::mt19937 _rgen;
std::mutex _mutex;
};
using rdist_double_t = std::uniform_real_distribution<double>;
using rdist_int_t = std::uniform_int_distribution<int>;
using rgen_double_t = RandomGenerator<rdist_double_t>;
using rgen_int_t = RandomGenerator<rdist_int_t>;
}
}
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment