Subject: [Boost-commit] svn:boost r68444 - in trunk: boost/random libs/random/test
From: steven_at_[hidden]
Date: 2011-01-25 15:08:14
Author: steven_watanabe
Date: 2011-01-25 15:08:07 EST (Tue, 25 Jan 2011)
New Revision: 68444
URL: http://svn.boost.org/trac/boost/changeset/68444
Log:
Add uniform_real_distribution to match C++0x.
Added:
trunk/boost/random/uniform_real_distribution.hpp (contents, props changed)
trunk/libs/random/test/test_uniform_real.cpp (contents, props changed)
trunk/libs/random/test/test_uniform_real_distribution.cpp (contents, props changed)
Text files modified:
trunk/libs/random/test/Jamfile.v2 | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
Added: trunk/boost/random/uniform_real_distribution.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/random/uniform_real_distribution.hpp 2011-01-25 15:08:07 EST (Tue, 25 Jan 2011)
@@ -0,0 +1,239 @@
+/* boost random/uniform_real_distribution.hpp header file
+ *
+ * Copyright Jens Maurer 2000-2001
+ * Copyright Steven Watanabe 2011
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ *
+ * See http://www.boost.org for most recent version including documentation.
+ *
+ * $Id$
+ *
+ */
+
+#ifndef BOOST_RANDOM_UNIFORM_REAL_DISTRIBUTION_HPP
+#define BOOST_RANDOM_UNIFORM_REAL_DISTRIBUTION_HPP
+
+#include <cassert>
+#include <iosfwd>
+#include <ios>
+#include <istream>
+#include <boost/config.hpp>
+#include <boost/random/detail/config.hpp>
+#include <boost/random/detail/operators.hpp>
+#include <boost/random/detail/signed_unsigned_tools.hpp>
+#include <boost/type_traits/is_integral.hpp>
+
+namespace boost {
+namespace random {
+namespace detail {
+
+template<class Engine, class T>
+T generate_uniform_real(
+ Engine& eng, T min_value, T max_value,
+ boost::mpl::false_ /** is_integral<Engine::result_type> */)
+{
+ for(;;) {
+ typedef T result_type;
+ typedef typename Engine::result_type base_result;
+ result_type numerator = static_cast<T>(eng() - (eng.min)());
+ result_type divisor = static_cast<T>((eng.max)() - (eng.min)());
+ assert(divisor > 0);
+ assert(numerator >= 0 && numerator <= divisor);
+ T result = numerator / divisor * (max_value - min_value) + min_value;
+ if(result < max_value) return result;
+ }
+}
+
+template<class Engine, class T>
+T generate_uniform_real(
+ Engine& eng, T min_value, T max_value,
+ boost::mpl::true_ /** is_integral<Engine::result_type> */)
+{
+ for(;;) {
+ typedef T result_type;
+ typedef typename Engine::result_type base_result;
+ result_type numerator = static_cast<T>(subtract<base_result>()(eng(), (eng.min)()));
+ result_type divisor = static_cast<T>(subtract<base_result>()((eng.max)(), (eng.min)())) + 1;
+ assert(divisor > 0);
+ assert(numerator >= 0 && numerator <= divisor);
+ T result = numerator / divisor * (max_value - min_value) + min_value;
+ if(result < max_value) return result;
+ }
+}
+
+template<class Engine, class T>
+inline T generate_uniform_real(Engine& eng, T min_value, T max_value)
+{
+ typedef typename Engine::result_type base_result;
+ return generate_uniform_real(eng, min_value, max_value,
+ boost::is_integral<base_result>());
+}
+
+}
+
+/**
+ * The class template uniform_real_distribution models a \random_distribution.
+ * On each invocation, it returns a random floating-point value uniformly
+ * distributed in the range [min..max).
+ */
+template<class RealType = double>
+class uniform_real_distribution
+{
+public:
+ typedef RealType input_type;
+ typedef RealType result_type;
+
+ class param_type
+ {
+ public:
+
+ typedef uniform_real_distribution distribution_type;
+
+ /**
+ * Constructs the parameters of a uniform_real_distribution.
+ *
+ * Requires min <= max
+ */
+ explicit param_type(RealType min_arg = RealType(0.0),
+ RealType max_arg = RealType(1.0))
+ : _min(min_arg), _max(max_arg)
+ {
+ assert(_min <= _max);
+ }
+
+ /** Returns the minimum value of the distribution. */
+ RealType a() const { return _min; }
+ /** Returns the maximum value of the distribution. */
+ RealType b() const { return _max; }
+
+ /** Writes the parameters to a @c std::ostream. */
+ BOOST_RANDOM_DETAIL_OSTREAM_OPERATOR(os, param_type, parm)
+ {
+ os << parm._min << " " << parm._max;
+ return os;
+ }
+
+ /** Reads the parameters from a @c std::istream. */
+ BOOST_RANDOM_DETAIL_ISTREAM_OPERATOR(is, param_type, parm)
+ {
+ RealType min_in, max_in;
+ if(is >> min_in >> std::ws >> max_in) {
+ if(min_in <= max_in) {
+ parm._min = min_in;
+ parm._max = max_in;
+ } else {
+ is.setstate(std::ios_base::failbit);
+ }
+ }
+ return is;
+ }
+
+ /** Returns true if the two sets of parameters are equal. */
+ BOOST_RANDOM_DETAIL_EQUALITY_OPERATOR(param_type, lhs, rhs)
+ { return lhs._min == rhs._min && lhs._max == rhs._max; }
+
+ /** Returns true if the two sets of parameters are different. */
+ BOOST_RANDOM_DETAIL_INEQUALITY_OPERATOR(param_type)
+
+ private:
+
+ RealType _min;
+ RealType _max;
+ };
+
+ /**
+ * Constructs a uniform_real_distribution. @c min and @c max are
+ * the parameters of the distribution.
+ *
+ * Requires: min <= max
+ */
+ explicit uniform_real_distribution(
+ RealType min_arg = RealType(0.0),
+ RealType max_arg = RealType(1.0))
+ : _min(min_arg), _max(max_arg)
+ {
+ assert(min_arg <= max_arg);
+ }
+ /** Constructs a uniform_real_distribution from its parameters. */
+ explicit uniform_real_distribution(const param_type& parm)
+ : _min(parm.a()), _max(parm.b()) {}
+
+ /** Returns the minimum value of the distribution */
+ RealType min BOOST_PREVENT_MACRO_SUBSTITUTION () const { return _min; }
+ /** Returns the maximum value of the distribution */
+ RealType max BOOST_PREVENT_MACRO_SUBSTITUTION () const { return _max; }
+
+ /** Returns the minimum value of the distribution */
+ RealType a() const { return _min; }
+ /** Returns the maximum value of the distribution */
+ RealType b() const { return _max; }
+
+ /** Returns the parameters of the distribution. */
+ param_type param() const { return param_type(_min, _max); }
+ /** Sets the parameters of the distribution. */
+ void param(const param_type& parm)
+ {
+ _min = parm.a();
+ _max = parm.b();
+ }
+
+ /**
+ * Effects: Subsequent uses of the distribution do not depend
+ * on values produced by any engine prior to invoking reset.
+ */
+ void reset() { }
+
+ /** Returns a value uniformly distributed in the range [min, max). */
+ template<class Engine>
+ result_type operator()(Engine& eng) const
+ { return detail::generate_uniform_real(eng, _min, _max); }
+
+ /**
+ * Returns a value uniformly distributed in the range
+ * [param.a(), param.b()).
+ */
+ template<class Engine>
+ result_type operator()(Engine& eng, const param_type& parm) const
+ { return detail::generate_uniform_real(eng, parm.a(), parm.b()); }
+
+ /** Writes the distribution to a @c std::ostream. */
+ BOOST_RANDOM_DETAIL_OSTREAM_OPERATOR(os, uniform_real_distribution, ud)
+ {
+ os << ud.param();
+ return os;
+ }
+
+ /** Reads the distribution from a @c std::istream. */
+ BOOST_RANDOM_DETAIL_ISTREAM_OPERATOR(is, uniform_real_distribution, ud)
+ {
+ param_type parm;
+ if(is >> parm) {
+ ud.param(parm);
+ }
+ return is;
+ }
+
+ /**
+ * Returns true if the two distributions will produce identical sequences
+ * of values given equal generators.
+ */
+ BOOST_RANDOM_DETAIL_EQUALITY_OPERATOR(uniform_real_distribution, lhs, rhs)
+ { return lhs._min == rhs._min && lhs._max == rhs._max; }
+
+ /**
+ * Returns true if the two distributions may produce different sequences
+ * of values given equal generators.
+ */
+ BOOST_RANDOM_DETAIL_INEQUALITY_OPERATOR(uniform_real_distribution)
+
+private:
+ RealType _min;
+ RealType _max;
+};
+
+} // namespace random
+} // namespace boost
+
+#endif // BOOST_RANDOM_UNIFORM_INT_HPP
Modified: trunk/libs/random/test/Jamfile.v2
==============================================================================
--- trunk/libs/random/test/Jamfile.v2 (original)
+++ trunk/libs/random/test/Jamfile.v2 2011-01-25 15:08:07 EST (Tue, 25 Jan 2011)
@@ -87,6 +87,8 @@
run test_triangle_distribution.cpp /boost//unit_test_framework ;
run test_uniform_int.cpp ;
run test_uniform_int_distribution.cpp /boost//unit_test_framework ;
+run test_uniform_real.cpp ;
+run test_uniform_real_distribution.cpp /boost//unit_test_framework ;
# run nondet_random_speed.cpp ;
# run random_device.cpp ;
Added: trunk/libs/random/test/test_uniform_real.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/random/test/test_uniform_real.cpp 2011-01-25 15:08:07 EST (Tue, 25 Jan 2011)
@@ -0,0 +1,26 @@
+/* test_uniform_real.cpp
+ *
+ * Copyright Steven Watanabe 2011
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ *
+ * $Id$
+ *
+ */
+
+#include <boost/random/uniform_real_distribution.hpp>
+#include <boost/random/uniform_real.hpp>
+#include <boost/math/distributions/uniform.hpp>
+
+#define BOOST_RANDOM_DISTRIBUTION boost::random::uniform_real_distribution<>
+#define BOOST_RANDOM_DISTRIBUTION_NAME uniform_int
+#define BOOST_MATH_DISTRIBUTION boost::math::uniform
+#define BOOST_RANDOM_ARG1_TYPE double
+#define BOOST_RANDOM_ARG1_NAME b
+#define BOOST_RANDOM_ARG1_DEFAULT 1000
+#define BOOST_RANDOM_ARG1_DISTRIBUTION(n) boost::uniform_real<>(0, n)
+#define BOOST_RANDOM_DISTRIBUTION_INIT (0, b)
+#define BOOST_MATH_DISTRIBUTION_INIT (0, b)
+
+#include "test_real_distribution.ipp"
Added: trunk/libs/random/test/test_uniform_real_distribution.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/random/test/test_uniform_real_distribution.cpp 2011-01-25 15:08:07 EST (Tue, 25 Jan 2011)
@@ -0,0 +1,38 @@
+/* test_uniform_real_distribution.cpp
+ *
+ * Copyright Steven Watanabe 2011
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ *
+ * $Id$
+ *
+ */
+
+#include <boost/random/uniform_real_distribution.hpp>
+#include <limits>
+
+#define BOOST_RANDOM_DISTRIBUTION boost::random::uniform_real_distribution<>
+#define BOOST_RANDOM_ARG1 a
+#define BOOST_RANDOM_ARG2 b
+#define BOOST_RANDOM_ARG1_DEFAULT 0.0
+#define BOOST_RANDOM_ARG2_DEFAULT 1.0
+#define BOOST_RANDOM_ARG1_VALUE -0.5
+#define BOOST_RANDOM_ARG2_VALUE 1.5
+
+#define BOOST_RANDOM_DIST0_MIN 0.0
+#define BOOST_RANDOM_DIST0_MAX 1.0
+#define BOOST_RANDOM_DIST1_MIN -0.5
+#define BOOST_RANDOM_DIST1_MAX 1.0
+#define BOOST_RANDOM_DIST2_MIN -0.5
+#define BOOST_RANDOM_DIST2_MAX 1.5
+
+#define BOOST_RANDOM_TEST1_PARAMS (-1.0, 0.0)
+#define BOOST_RANDOM_TEST1_MIN -1.0
+#define BOOST_RANDOM_TEST1_MAX 0.0
+
+#define BOOST_RANDOM_TEST2_PARAMS
+#define BOOST_RANDOM_TEST2_MIN 0.0
+#define BOOST_RANDOM_TEST2_MAX 1.0
+
+#include "test_distribution.ipp"