[Boost-commit] svn:boost r68783 - in trunk: boost/random boost/random/detail libs/random/test

Subject: [Boost-commit] svn:boost r68783 - in trunk: boost/random boost/random/detail libs/random/test
From: steven_at_[hidden]
Date: 2011-02-11 14:16:42

Author: steven_watanabe
Date: 2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
New Revision: 68783
URL: http://svn.boost.org/trac/boost/changeset/68783

Log:
Move all generator tests to the new framework.
Added:
   trunk/libs/random/test/test_kreutzer1986.cpp   (contents, props changed)
   trunk/libs/random/test/test_minstd_rand.cpp   (contents, props changed)
   trunk/libs/random/test/test_minstd_rand0.cpp   (contents, props changed)
   trunk/libs/random/test/test_mt11213b.cpp   (contents, props changed)
   trunk/libs/random/test/test_mt19937_64.cpp   (contents, props changed)
   trunk/libs/random/test/test_rand48.cpp   (contents, props changed)
   trunk/libs/random/test/test_ranlux24.cpp   (contents, props changed)
   trunk/libs/random/test/test_ranlux3.cpp   (contents, props changed)
   trunk/libs/random/test/test_ranlux3_01.cpp   (contents, props changed)
   trunk/libs/random/test/test_ranlux4.cpp   (contents, props changed)
   trunk/libs/random/test/test_ranlux48.cpp   (contents, props changed)
   trunk/libs/random/test/test_ranlux4_01.cpp   (contents, props changed)
   trunk/libs/random/test/test_ranlux64_3.cpp   (contents, props changed)
   trunk/libs/random/test/test_ranlux64_3_01.cpp   (contents, props changed)
   trunk/libs/random/test/test_ranlux64_4.cpp   (contents, props changed)
   trunk/libs/random/test/test_ranlux64_4_01.cpp   (contents, props changed)
Removed:
   trunk/libs/random/test/instantiate.cpp
Text files modified: 
   trunk/boost/random/detail/seed_impl.hpp    |     2 +-                                      
   trunk/boost/random/mersenne_twister.hpp    |     6 +-----                                  
   trunk/boost/random/shuffle_order.hpp       |    10 +++++++++-                              
   trunk/boost/random/subtract_with_carry.hpp |     1 +                                       
   trunk/libs/random/test/Jamfile.v2          |    38 ++++++++++++++++----------------------  
   5 files changed, 28 insertions(+), 29 deletions(-)

Modified: trunk/boost/random/detail/seed_impl.hpp
==============================================================================
--- trunk/boost/random/detail/seed_impl.hpp	(original)
+++ trunk/boost/random/detail/seed_impl.hpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -105,7 +105,7 @@
                 if(begin == end) break;
             }
             remaining_bits = available_bits;
-            saved_bits = val;
+            saved_bits = static_cast<boost::uint32_t>(val);
         }
     }
 }

Modified: trunk/boost/random/mersenne_twister.hpp
==============================================================================
--- trunk/boost/random/mersenne_twister.hpp	(original)
+++ trunk/boost/random/mersenne_twister.hpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -196,11 +196,7 @@
     /** Fills a range with random values */
     template<class Iter>
     void generate(Iter first, Iter last)
-    {
-        for(; first != last; ++first) {
-            *first = (*this)();
-        }
-    }
+    { detail::generate_from_int(*this, first, last); }
 
 #ifndef BOOST_NO_LONG_LONG
     /**

Modified: trunk/boost/random/shuffle_order.hpp
==============================================================================
--- trunk/boost/random/shuffle_order.hpp	(original)
+++ trunk/boost/random/shuffle_order.hpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -112,7 +112,15 @@
      * Complexity: Exactly k+1 invocations of the base generator.
      */
     template<class T>
-    void seed(T s) { _rng.seed(s); init(); }
+    void seed(T& s) { _rng.seed(s); init(); }
+    /**
+     * Invokes the one-argument seed method of the base generator
+     * with the parameter seed and re-initializes the internal buffer array.
+     *
+     * Complexity: Exactly k+1 invocations of the base generator.
+     */
+    template<class T>
+    void seed(const T& s) { _rng.seed(s); init(); }
     template<class It> void seed(It& first, It last)
     { _rng.seed(first, last); init(); }
 

Modified: trunk/boost/random/subtract_with_carry.hpp
==============================================================================
--- trunk/boost/random/subtract_with_carry.hpp	(original)
+++ trunk/boost/random/subtract_with_carry.hpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -30,6 +30,7 @@
 #include <boost/random/detail/seed.hpp>
 #include <boost/random/detail/operators.hpp>
 #include <boost/random/detail/seed_impl.hpp>
+#include <boost/random/detail/generator_seed_seq.hpp>
 #include <boost/random/linear_congruential.hpp>
 
 

Modified: trunk/libs/random/test/Jamfile.v2
==============================================================================
--- trunk/libs/random/test/Jamfile.v2	(original)
+++ trunk/libs/random/test/Jamfile.v2	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -17,35 +17,29 @@
 run test_random_device.cpp /boost//random : : : <link>static : test_random_device ;
 run test_random_device.cpp /boost//random : : : <link>shared : test_random_device_dll ;
 
-local all-urngs = 
-    rand48
-    minstd_rand0
-    minstd_rand
-    kreutzer1986
-    mt11213b
-    mt19937_64
-    ranlux3
-    ranlux4
-    ranlux3_01
-    ranlux4_01
-    ranlux64_3_01
-    ranlux64_4_01
-    ranlux24
-    ranlux48
-;
-
-for urng in $(all-urngs)
-{
-    run instantiate.cpp : : : <define>BOOST_RANDOM_URNG_TEST=$(urng) : test_$(urng) ;
-}
-
+run test_minstd_rand0.cpp /boost//unit_test_framework ;
+run test_minstd_rand.cpp /boost//unit_test_framework ;
+run test_rand48.cpp /boost//unit_test_framework ;
+run test_mt11213b.cpp /boost//unit_test_framework ;
 run test_mt19937.cpp /boost//unit_test_framework ;
+run test_mt19937_64.cpp /boost//unit_test_framework ;
 run test_ecuyer1988.cpp /boost//unit_test_framework ;
 run test_hellekalek1995.cpp /boost//unit_test_framework ;
 run test_lagged_fibonacci.cpp /boost//unit_test_framework ;
 run test_lagged_fibonacci607.cpp /boost//unit_test_framework ;
 run test_linear_feedback_shift.cpp /boost//unit_test_framework ;
 run test_taus88.cpp /boost//unit_test_framework ;
+run test_kreutzer1986.cpp /boost//unit_test_framework ;
+run test_ranlux3.cpp /boost//unit_test_framework ;
+run test_ranlux4.cpp /boost//unit_test_framework ;
+run test_ranlux3_01.cpp /boost//unit_test_framework ;
+run test_ranlux4_01.cpp /boost//unit_test_framework ;
+run test_ranlux64_4.cpp /boost//unit_test_framework ;
+run test_ranlux64_3.cpp /boost//unit_test_framework ;
+run test_ranlux64_3_01.cpp /boost//unit_test_framework ;
+run test_ranlux64_4_01.cpp /boost//unit_test_framework ;
+run test_ranlux24.cpp /boost//unit_test_framework ;
+run test_ranlux48.cpp /boost//unit_test_framework ;
 
 run test_seed_seq.cpp /boost//unit_test_framework ;
 

Deleted: trunk/libs/random/test/instantiate.cpp
==============================================================================
--- trunk/libs/random/test/instantiate.cpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
+++ (empty file)
@@ -1,455 +0,0 @@
-/* boost validate.cpp
- *
- * Copyright Jens Maurer 2000
- * 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/config.hpp>
-
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
-#pragma warning( disable : 4786 )
-#endif
-
-#ifdef BOOST_MSVC
-// conversion warnings.  These are unavoidable, since we're
-// testing all possible implicit conversions.
-#pragma warning( disable : 4244 )
-#pragma warning( disable : 4305 )
-#endif
-
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <cmath>
-#include <iterator>
-#include <vector>
-#include <boost/random.hpp>
-#include <boost/config.hpp>
-#include <boost/preprocessor/stringize.hpp>
-
-#include <boost/test/test_tools.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
-
-#ifdef BOOST_NO_STDC_NAMESPACE
-  namespace std { using ::abs; using ::fabs; using ::pow; }
-#endif
-
-
-/*
- * General portability note:
- * MSVC mis-compiles explicit function template instantiations.
- * For example, f<A>() and f<B>() are both compiled to call f<A>().
- * BCC is unable to implicitly convert a "const char *" to a std::string
- * when using explicit function template instantiations.
- *
- * Therefore, avoid explicit function template instantiations.
- */
-
-/*
- * Check function signatures
- */
-
-#if BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x570) )
-#pragma warn -par
-#endif
-template<class URNG, class Dist>
-void instantiate_dist(URNG& urng, const char * name, const Dist& dist)
-{
-  std::cout << "Testing " << name << std::endl;
-  // this makes a copy of urng
-  boost::variate_generator<URNG, Dist> gen(urng, dist);
-
-  // this keeps a reference to urng
-  boost::variate_generator<URNG&, Dist> genref(urng, dist);
-
-  BOOST_CHECK(gen.engine() == genref.engine());
-
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-  // and here is a pointer to (a copy of) the urng
-  URNG copy = urng;
-  boost::variate_generator<URNG*, Dist> genptr(&copy, dist);
-#endif
-
-  for(int i = 0; i < 1000; ++i) {
-    (void) gen();
-    (void) genref();
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-    (void) genptr();
-#endif
-  }
-  // If the values are not exactly equal, we cannot
-  // rely on them being close...
-  typename Dist::result_type g = gen();
-  BOOST_CHECK_EQUAL(g, genref());
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-  BOOST_CHECK_EQUAL(g, genptr());
-#endif
-
-  (void) gen.engine();
-  gen.distribution().reset();
-
-  Dist d = dist;            // copy ctor
-  d = dist;                 // copy assignment
-
-#ifndef BOOST_RANDOM_NO_STREAM_OPERATORS
-  {
-    std::ostringstream file;
-    file << urng << std::endl;
-    file << d;
-    std::istringstream input(file.str());
-    // std::cout << file.str() << std::endl;
-    URNG restored_engine;
-    input >> restored_engine;
-    input >> std::ws;
-    Dist restored_dist;
-    input >> restored_dist;
-#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 // MSVC brokenness
-    boost::variate_generator<URNG, Dist> old(urng, d);
-    boost::variate_generator<URNG, Dist> restored(restored_engine, restored_dist);
-    // advance some more so that state is exercised
-    for(int i = 0; i < 1000; ++i) {
-      (void) old();
-      (void) restored();
-    }
-    BOOST_CHECK_MESSAGE((std::abs(old()-restored()) < 0.0001),
-                        (std::string(name) + " old == restored_dist"));
-#endif // BOOST_MSVC
-  }
-#endif // BOOST_RANDOM_NO_STREAM_OPERATORS
-}
-
-template<class URNG, class RealType>
-void instantiate_real_dist(URNG& urng, RealType /* ignored */)
-{
-  std::cout << "Testing real distributions with " << typeid(RealType).name() << std::endl;
-  instantiate_dist(urng, "uniform_01",
-                   boost::uniform_01<RealType>());
-  instantiate_dist(urng, "uniform_real",
-                   boost::uniform_real<RealType>(0, 2.1));
-  instantiate_dist(urng, "triangle_distribution",
-                   boost::triangle_distribution<RealType>(1, 1.5, 7));
-  instantiate_dist(urng, "exponential_distribution",
-                   boost::exponential_distribution<RealType>(5));
-  instantiate_dist(urng, "normal_distribution",
-                   boost::normal_distribution<RealType>());
-  instantiate_dist(urng, "lognormal_distribution",
-                   boost::lognormal_distribution<RealType>(1, 1));
-  instantiate_dist(urng, "cauchy_distribution",
-                   boost::cauchy_distribution<RealType>(1));
-  instantiate_dist(urng, "gamma_distribution",
-                   boost::gamma_distribution<RealType>(1));
-}
-
-template<class URNG, class T, class Converted>
-void test_seed_conversion(URNG & urng, const T & t, const Converted &) {
-    Converted c = static_cast<Converted>(t);
-    if(static_cast<T>(c) == t) {
-        URNG urng2(c);
-        std::ostringstream msg;
-        msg << "Testing seed: type " << typeid(Converted).name() << ", value " << c;
-        BOOST_CHECK_MESSAGE(urng == urng2, msg.str());
-        urng2.seed(c);
-        BOOST_CHECK_MESSAGE(urng == urng2, msg.str());
-    }
-}
-
-// rand48 uses non-standard seeding
-template<class T, class Converted>
-void test_seed_conversion(boost::rand48 & urng, const T & t, const Converted &) {
-    boost::rand48 urng2(t);
-    urng2.seed(t);
-}
-
-template<class URNG, class ResultType>
-void test_seed(const URNG &, const ResultType & value) {
-    URNG urng(value);
-
-    // integral types
-    test_seed_conversion(urng, value, static_cast<char>(0));
-    test_seed_conversion(urng, value, static_cast<signed char>(0));
-    test_seed_conversion(urng, value, static_cast<unsigned char>(0));
-    test_seed_conversion(urng, value, static_cast<short>(0));
-    test_seed_conversion(urng, value, static_cast<unsigned short>(0));
-    test_seed_conversion(urng, value, static_cast<int>(0));
-    test_seed_conversion(urng, value, static_cast<unsigned int>(0));
-    test_seed_conversion(urng, value, static_cast<long>(0));
-    test_seed_conversion(urng, value, static_cast<unsigned long>(0));
-#if !defined(BOOST_NO_INT64_T)
-    test_seed_conversion(urng, value, static_cast<boost::int64_t>(0));
-    test_seed_conversion(urng, value, static_cast<boost::uint64_t>(0));
-#endif
-
-    // floating point types
-    test_seed_conversion(urng, value, static_cast<float>(0));
-    test_seed_conversion(urng, value, static_cast<double>(0));
-    test_seed_conversion(urng, value, static_cast<long double>(0));
-}
-
-template<class URNG, class ResultType>
-void instantiate_seed(const URNG & urng, const ResultType &) {
-    {
-        URNG urng;
-        URNG urng2;
-        urng2.seed();
-        BOOST_CHECK(urng == urng2);
-    }
-    test_seed(urng, static_cast<ResultType>(0));
-    test_seed(urng, static_cast<ResultType>(127));
-    test_seed(urng, static_cast<ResultType>(539157235));
-    test_seed(urng, static_cast<ResultType>(~0u));
-}
-
-#if 0
-
-// ranlux uses int32_t for seeding instead of result_type
-template<class ResultType>
-void instantiate_seed(const boost::ranlux3 & urng, const ResultType &) {
-    instantiate_seed<boost::ranlux3, boost::uint32_t>(urng, ResultType());
-}
-template<class ResultType>
-void instantiate_seed(const boost::ranlux4 & urng, const ResultType &) {
-    instantiate_seed<boost::ranlux4, boost::uint32_t>(urng, ResultType());
-}
-template<class ResultType>
-void instantiate_seed(const boost::ranlux3_01 & urng, const ResultType &) {
-    instantiate_seed<boost::ranlux3_01, boost::uint32_t>(urng, ResultType());
-}
-template<class ResultType>
-void instantiate_seed(const boost::ranlux4_01 & urng, const ResultType &) {
-    instantiate_seed<boost::ranlux4_01, boost::uint32_t>(urng, ResultType());
-}
-#if !defined(BOOST_NO_INT64_T) && !defined(BOOST_NO_INTEGRAL_INT64_T)
-template<class ResultType>
-void instantiate_seed(const boost::ranlux64_3 & urng, const ResultType &) {
-    instantiate_seed<boost::ranlux64_3, boost::uint32_t>(urng, ResultType());
-}
-template<class ResultType>
-void instantiate_seed(const boost::ranlux64_4 & urng, const ResultType &) {
-    instantiate_seed<boost::ranlux64_3, boost::uint32_t>(urng, ResultType());
-}
-#endif
-template<class ResultType>
-void instantiate_seed(const boost::ranlux64_3_01 & urng, const ResultType &) {
-    instantiate_seed<boost::ranlux64_3_01, boost::uint32_t>(urng, ResultType());
-}
-template<class ResultType>
-void instantiate_seed(const boost::ranlux64_4_01 & urng, const ResultType &) {
-    instantiate_seed<boost::ranlux64_4_01, boost::uint32_t>(urng, ResultType());
-}
-
-#endif
-
-template<class URNG, class ResultType>
-void instantiate_urng(const std::string & s, const URNG & u, const ResultType & r)
-{
-  std::cout << "Basic tests for " << s << std::endl;
-  URNG urng;
-  instantiate_seed(u, r);                       // seed() member function
-  int a[URNG::has_fixed_range ? 5 : 10];        // compile-time constant
-  (void) a;   // avoid "unused" warning
-  typename URNG::result_type x1 = urng();
-  ResultType x2 = x1;
-  (void) &x2;           // avoid "unused" warning
-
-  URNG urng2 = urng;             // copy constructor
-#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 // MSVC brokenness
-  BOOST_CHECK(urng == urng2);     // operator==
-  BOOST_CHECK(!(urng != urng2));  // operator!=
-  urng();
-  urng2 = urng;                  // copy assignment
-  BOOST_CHECK(urng == urng2);
-  urng2 = URNG(urng2);           // copy constructor, not templated constructor
-  BOOST_CHECK(urng == urng2);
-#endif // BOOST_MSVC
-
-  const std::vector<int> v(9999u, 0x41);
-  std::vector<int>::const_iterator it = v.begin();
-  std::vector<int>::const_iterator it_end = v.end();
-  URNG urng3(it, it_end);
-  BOOST_CHECK(it != v.begin());
-  std::iterator_traits<std::vector<int>::const_iterator>::difference_type n_words = (it - v.begin());
-  std::cout << "; seeding uses " << n_words << " words" << std::endl;
-
-  it = v.end();
-  BOOST_CHECK_THROW(urng3.seed(it, it_end), std::invalid_argument);
-
-  if(n_words > 1) {
-    it = v.end();
-    --it;
-    BOOST_CHECK_THROW(urng3.seed(it, it_end), std::invalid_argument);
-  }
-
-  // check for min/max members
-  ResultType min = (urng3.min)();
-  (void) &min;
-  ResultType max = (urng3.max)();
-  (void) &max;
-
-#ifndef BOOST_RANDOM_NO_STREAM_OPERATORS
-  // Streamable concept not supported for broken compilers
-
-  std::cout << "Testing stream operators" << std::endl;
-
-  // advance a little so that state is relatively arbitrary
-  for(int i = 0; i < 9307; ++i)
-    urng();
-  urng2 = urng;
-
-  {
-    // narrow stream first
-    std::ostringstream file;
-    file << urng;
-    // move forward
-    urng();
-    // restore old state
-    std::istringstream input(file.str());
-    input >> urng;
-    // std::cout << file.str() << std::endl;
-#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 // MSVC brokenness
-    // advance some more so that state is exercised
-    for(int i = 0; i < 10000; ++i) {
-      urng();
-      urng2();
-    }
-    BOOST_CHECK(urng == urng2);
-#endif // BOOST_MSVC
-  }
-  
-  urng2 = urng;
-#if !defined(BOOST_NO_STD_WSTREAMBUF) && !defined(BOOST_NO_STD_WSTRING)
-  {
-    // then wide stream
-    std::wostringstream file;
-    file << urng;
-    // move forward
-    urng();
-    std::wistringstream input(file.str());
-    input >> urng;
-#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 // MSVC brokenness
-    // advance some more so that state is exercised
-    for(int i = 0; i < 10000; ++i) {
-      urng();
-      urng2();
-    }
-    BOOST_CHECK(urng == urng2);
-#endif // BOOST_MSVC
-  }
-#endif // BOOST_NO_STD_WSTREAMBUF, BOOST_NO_STD_WSTRING
-#endif // BOOST_RANDOM_NO_STREAM_OPERATORS
-
-  // instantiate various distributions with this URNG
-  instantiate_dist(urng, "uniform_smallint", boost::uniform_smallint<>(0, 11));
-  instantiate_dist(urng, "uniform_int", boost::uniform_int<>(-200, 20000));
-  instantiate_dist(urng, "bernoulli_distribution",
-                   boost::bernoulli_distribution<>(0.2));
-  instantiate_dist(urng, "binomial_distribution",
-                   boost::binomial_distribution<>(4, 0.2));
-  instantiate_dist(urng, "geometric_distribution",
-                   boost::geometric_distribution<>(0.8));
-  instantiate_dist(urng, "poisson_distribution",
-                   boost::poisson_distribution<>(1));
-
-  instantiate_real_dist(urng, 1.0f);
-  instantiate_real_dist(urng, 1.0);
-  instantiate_real_dist(urng, 1.0l);
-
-#if 0
-  // We cannot compare the outcomes before/after save with std::abs(x-y)
-  instantiate_dist("uniform_on_sphere",
-                   boost::uniform_on_sphere<URNG>(urng, 2));
-#endif
-}
-
-template<class T>
-void extra_tests(T*)
-{
-}
-
-#if !defined(BOOST_NO_INT64_T) && !defined(BOOST_NO_INTEGRAL_INT64_T)
-void extra_tests(boost::rand48*)
-{
-  using namespace boost;
-  rand48 rnd(boost::int32_t(5));
-  rand48 rnd2(boost::uint64_t(0x80000000) * 42);
-  rnd.seed(boost::int32_t(17));
-  rnd2.seed(boost::uint64_t(0x80000000) * 49);
-}
-#endif
-
-void extra_tests(boost::minstd_rand*)
-{
-  using namespace boost;
-  minstd_rand mstd(42);
-  mstd.seed(17);
-}
-
-void extra_tests(boost::mt19937*)
-{
-  using namespace boost;
-  minstd_rand mstd(42);
-  mstd.seed(17);
-
-  mt19937 mt(boost::uint32_t(17));  // needs to be an exact type match for MSVC
-  int i = 42;
-  mt.seed(boost::uint32_t(i));
-  mt19937 mt2(mstd);
-  mt2.seed(mstd);
-
-  random_number_generator<mt19937> std_rng(mt2);
-  (void) std_rng(10);
-}
-
-void instantiate_all()
-{
-  using namespace boost;
-  using boost::random::ranlux24;
-  using boost::random::ranlux48;
-  
-  typedef boost::random::lagged_fibonacci<boost::uint32_t, 24, 607, 273> lagged_fibonacci;
-
-  typedef BOOST_RANDOM_URNG_TEST::result_type result_type;
-  instantiate_urng(BOOST_PP_STRINGIZE(BOOST_RANDOM_URNG_TEST), BOOST_RANDOM_URNG_TEST(), static_cast<result_type>(0));
-  BOOST_RANDOM_URNG_TEST* type_ptr = 0;
-  extra_tests(type_ptr);
-
-}
-
-
-#if defined(BOOST_MSVC) && _MSC_VER < 1300
-
-// These explicit instantiations are necessary, otherwise MSVC does
-// not find the <boost/operators.hpp> inline friends.
-// We ease the typing with a suitable preprocessor macro.
-#define INSTANT(x) \
-template class boost::uniform_smallint<x>; \
-template class boost::uniform_int<x>; \
-template class boost::uniform_real<x>; \
-template class boost::bernoulli_distribution<x>; \
-template class boost::geometric_distribution<x>; \
-template class boost::triangle_distribution<x>; \
-template class boost::exponential_distribution<x>; \
-template class boost::normal_distribution<x>; \
-template class boost::uniform_on_sphere<x>; \
-template class boost::lognormal_distribution<x>;
-
-INSTANT(boost::minstd_rand0)
-INSTANT(boost::minstd_rand)
-INSTANT(boost::ecuyer1988)
-INSTANT(boost::kreutzer1986)
-INSTANT(boost::hellekalek1995)
-INSTANT(boost::mt19937)
-INSTANT(boost::mt11213b)
-
-#undef INSTANT
-#endif
-
-
-int test_main(int, char*[])
-{
-  instantiate_all();
-  return 0;
-}

Added: trunk/libs/random/test/test_kreutzer1986.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/random/test/test_kreutzer1986.cpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -0,0 +1,19 @@
+/* test_kreutzer1986.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/shuffle_order.hpp>
+#include <boost/cstdint.hpp>
+
+#define BOOST_RANDOM_URNG boost::random::kreutzer1986
+// validation by experiment from Harry Erwin's generator.h (private e-mail)
+#define BOOST_RANDOM_VALIDATION_VALUE 139726
+
+#include "test_generator.ipp"

Added: trunk/libs/random/test/test_minstd_rand.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/random/test/test_minstd_rand.cpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -0,0 +1,19 @@
+/* test_minstd_rand.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/linear_congruential.hpp>
+#include <boost/cstdint.hpp>
+
+#define BOOST_RANDOM_URNG boost::random::minstd_rand
+// validation values from the publications
+#define BOOST_RANDOM_VALIDATION_VALUE 399268537
+
+#include "test_generator.ipp"

Added: trunk/libs/random/test/test_minstd_rand0.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/random/test/test_minstd_rand0.cpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -0,0 +1,19 @@
+/* test_minstd_rand0.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/linear_congruential.hpp>
+#include <boost/cstdint.hpp>
+
+#define BOOST_RANDOM_URNG boost::random::minstd_rand0
+// validation values from the publications
+#define BOOST_RANDOM_VALIDATION_VALUE 1043618065
+
+#include "test_generator.ipp"

Added: trunk/libs/random/test/test_mt11213b.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/random/test/test_mt11213b.cpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -0,0 +1,17 @@
+/* test_mt11213b.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/mersenne_twister.hpp>
+
+#define BOOST_RANDOM_URNG boost::random::mt11213b
+#define BOOST_RANDOM_VALIDATION_VALUE 3809585648U
+
+#include "test_generator.ipp"

Added: trunk/libs/random/test/test_mt19937_64.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/random/test/test_mt19937_64.cpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -0,0 +1,19 @@
+/* test_mt119937_64.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/mersenne_twister.hpp>
+#include <boost/cstdint.hpp>
+
+#define BOOST_RANDOM_URNG boost::random::mt19937_64
+// validation from the C++0x draft (n3090)
+#define BOOST_RANDOM_VALIDATION_VALUE UINT64_C(9981545732273789042)
+
+#include "test_generator.ipp"

Added: trunk/libs/random/test/test_rand48.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/random/test/test_rand48.cpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -0,0 +1,26 @@
+/* test_rand48.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/linear_congruential.hpp>
+#include <boost/cstdint.hpp>
+
+#define BOOST_RANDOM_URNG boost::random::rand48
+// by experiment from lrand48()
+#define BOOST_RANDOM_VALIDATION_VALUE 1993516219
+
+// rand48 uses non-standard seeding
+template<class Converted, class T>
+void test_seed_conversion(boost::rand48 & urng, const T & t) {
+    boost::rand48 urng2(t);
+    urng2.seed(t);
+}
+
+#include "test_generator.ipp"

Added: trunk/libs/random/test/test_ranlux24.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/random/test/test_ranlux24.cpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -0,0 +1,19 @@
+/* test_ranlux24.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/ranlux.hpp>
+#include <cmath>
+
+#define BOOST_RANDOM_URNG boost::random::ranlux24
+// validation from the C++0x draft (n3090)
+#define BOOST_RANDOM_VALIDATION_VALUE 9901578
+
+#include "test_generator.ipp"

Added: trunk/libs/random/test/test_ranlux3.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/random/test/test_ranlux3.cpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -0,0 +1,18 @@
+/* test_ranlux3.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/ranlux.hpp>
+
+#define BOOST_RANDOM_URNG boost::random::ranlux3
+// principal operation validated with CLHEP, values by experiment
+#define BOOST_RANDOM_VALIDATION_VALUE 5957620
+
+#include "test_generator.ipp"

Added: trunk/libs/random/test/test_ranlux3_01.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/random/test/test_ranlux3_01.cpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -0,0 +1,19 @@
+/* test_ranlux3_01.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/ranlux.hpp>
+#include <cmath>
+
+#define BOOST_RANDOM_URNG boost::random::ranlux3_01
+// principal operation validated with CLHEP, values by experiment
+#define BOOST_RANDOM_VALIDATION_VALUE 5957620/std::pow(2.0f,24)
+
+#include "test_generator.ipp"

Added: trunk/libs/random/test/test_ranlux4.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/random/test/test_ranlux4.cpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -0,0 +1,18 @@
+/* test_ranlux4.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/ranlux.hpp>
+
+#define BOOST_RANDOM_URNG boost::random::ranlux4
+// principal operation validated with CLHEP, values by experiment
+#define BOOST_RANDOM_VALIDATION_VALUE 8587295
+
+#include "test_generator.ipp"

Added: trunk/libs/random/test/test_ranlux48.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/random/test/test_ranlux48.cpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -0,0 +1,19 @@
+/* test_ranlux48.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/ranlux.hpp>
+#include <boost/cstdint.hpp>
+
+#define BOOST_RANDOM_URNG boost::random::ranlux48
+// validation from the C++0x draft (n3090)
+#define BOOST_RANDOM_VALIDATION_VALUE UINT64_C(249142670248501)
+
+#include "test_generator.ipp"

Added: trunk/libs/random/test/test_ranlux4_01.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/random/test/test_ranlux4_01.cpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -0,0 +1,19 @@
+/* test_ranlux4_01.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/ranlux.hpp>
+#include <cmath>
+
+#define BOOST_RANDOM_URNG boost::random::ranlux4_01
+// principal operation validated with CLHEP, values by experiment
+#define BOOST_RANDOM_VALIDATION_VALUE 8587295/std::pow(2.0f,24)
+
+#include "test_generator.ipp"

Added: trunk/libs/random/test/test_ranlux64_3.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/random/test/test_ranlux64_3.cpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -0,0 +1,19 @@
+/* test_ranlux64_3.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/ranlux.hpp>
+#include <cmath>
+
+#define BOOST_RANDOM_URNG boost::random::ranlux64_3
+// principal operation validated with CLHEP, values by experiment
+#define BOOST_RANDOM_VALIDATION_VALUE 141789170949364
+
+#include "test_generator.ipp"

Added: trunk/libs/random/test/test_ranlux64_3_01.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/random/test/test_ranlux64_3_01.cpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -0,0 +1,19 @@
+/* test_ranlux64_3_01.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/ranlux.hpp>
+#include <cmath>
+
+#define BOOST_RANDOM_URNG boost::random::ranlux64_3_01
+// principal operation validated with CLHEP, values by experiment
+#define BOOST_RANDOM_VALIDATION_VALUE 0.83841253976454766
+
+#include "test_generator.ipp"

Added: trunk/libs/random/test/test_ranlux64_4.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/random/test/test_ranlux64_4.cpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -0,0 +1,19 @@
+/* test_ranlux64_4.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/ranlux.hpp>
+#include <cmath>
+
+#define BOOST_RANDOM_URNG boost::random::ranlux64_4
+// principal operation validated with CLHEP, values by experiment
+#define BOOST_RANDOM_VALIDATION_VALUE 199461971133682
+
+#include "test_generator.ipp"

Added: trunk/libs/random/test/test_ranlux64_4_01.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/random/test/test_ranlux64_4_01.cpp	2011-02-11 14:16:29 EST (Fri, 11 Feb 2011)
@@ -0,0 +1,19 @@
+/* test_ranlux64_4_01.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/ranlux.hpp>
+#include <cmath>
+
+#define BOOST_RANDOM_URNG boost::random::ranlux64_4_01
+// principal operation validated with CLHEP, values by experiment
+#define BOOST_RANDOM_VALIDATION_VALUE 0.59838973302498744
+
+#include "test_generator.ipp"