Subject: [Boost-commit] svn:boost r56524 - in sandbox/statistics/distribution_toolkit: boost/statistics/detail/distribution_toolkit/data boost/statistics/detail/distribution_toolkit/distributions boost/statistics/detail/distribution_toolkit/distributions/chi_squared boost/statistics/detail/distribution_toolkit/distributions/exponential boost/statistics/detail/distribution_toolkit/distributions/gamma boost/statistics/detail/distribution_toolkit/distributions/location_scale boost/statistics/detail/distribution_toolkit/distributions/normal boost/statistics/detail/distribution_toolkit/distributions/students_t boost/statistics/detail/distribution_toolkit/distributions/uniform boost/statistics/detail/distribution_toolkit/distributions/wrapper boost/statistics/detail/distribution_toolkit/fun_wrap boost/statistics/detail/distribution_toolkit/fwd_math boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf boost/statistics/detail/distribution_toolkit/meta boost/statistics/detail/distribution_toolkit/random boost/statistics/detail/distribution_toolkit/unscope libs/statistics/detail/distribution_toolkit/doc libs/statistics/detail/distribution_toolkit/example libs/statistics/detail/distribution_toolkit/src
From: erwann.rogard_at_[hidden]
Date: 2009-10-02 13:59:22
Author: e_r
Date: 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
New Revision: 56524
URL: http://svn.boost.org/trac/boost/changeset/56524
Log:
m/d
Removed:
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/inherit_policy.hpp
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/inherit_value.hpp
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/policy.hpp
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/value.hpp
Text files modified:
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/data/generate_n_sample_cdf.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/derivative_log_unnormalized_pdf.hpp | 6 +---
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/description.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/include.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/is_math_distribution.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/log_unnormalized_pdf.hpp | 6 +---
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/random.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/derivative_log_unnormalized_pdf.hpp | 2 -
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/description.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/include.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/is_math_distribution.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/log_unnormalized_pdf.hpp | 2 -
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/random.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/derivative_log_unnormalized_pdf.hpp | 6 +---
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/description.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/include.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/is_log_concave.hpp | 6 +---
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/is_math_distribution.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/log_unnormalized_pdf.hpp | 6 +---
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/random.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/include.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/cdf.hpp | 24 +++++++++-------------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/derivative_log_unnormalized_pdf.hpp | 29 ++++++++++-----------------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/description.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/include.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/is_scalar_distribution.hpp | 6 ++--
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/location_scale.hpp | 15 ++++++++-----
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/log_unnormalized_pdf.hpp | 28 ++++++++++----------------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/mean.hpp | 16 +++++++-------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/pdf.hpp | 28 +++++++++-----------------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/quantile.hpp | 23 ++++++++-------------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/random.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/variance.hpp | 16 +++++++-------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/derivative_log_unnormalized_pdf.hpp | 6 +---
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/description.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/include.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/is_math_distribution.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/log_unnormalized_pdf.hpp | 6 +---
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/normalizing_constant.hpp | 6 +---
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/random.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/derivative_log_unnormalized_pdf.hpp | 6 +---
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/description.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/include.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/is_math_distribution.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/log_unnormalized_pdf.hpp | 6 +---
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/random.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/derivative_log_unnormalized_pdf.hpp | 7 +----
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/description.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/include.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/is_math_distribution.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/log_unnormalized_pdf.hpp | 6 +---
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/cdf.hpp | 25 +++++++----------------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/derivative_log_unnormalized_pdf.hpp | 28 ++++++++++----------------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/description.hpp | 6 ++--
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/include.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/is_pseudo_scalar_distribution.hpp | 13 +++--------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/is_scalar_distribution.hpp | 13 +++--------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/log_unnormalized_pdf.hpp | 24 +++++++---------------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/mean.hpp | 23 +++++++--------------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/normalizing_constant.hpp | 23 +++++++--------------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/pdf.hpp | 25 +++++++----------------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/quantile.hpp | 28 ++++++++------------------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/random.hpp | 8 +++---
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/variance.hpp | 23 +++++++--------------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/wrapper.hpp | 16 +++++++++-----
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/cdf.hpp | 7 -----
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/log_unnormalized_pdf.hpp | 2
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/pdf.hpp | 8 +-----
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/quantile.hpp | 2
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/cdf.hpp | 17 ++++++++-------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/include.hpp | 14 ++++++------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/mean.hpp | 13 ++++-------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/pdf.hpp | 17 ++++++++-------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/quantile.hpp | 18 ++++++++--------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/variance.hpp | 13 ++++-------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/inverse_pdf.hpp | 10 ++++----
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/log_unnormalized_pdf.hpp | 22 +++++++++-----------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/log_unnormalized_pdf.hpp | 24 ++++++----------------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/product_pdf.hpp | 8 +++---
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/include.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/signature.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/random/generator.hpp | 4 +-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/unscope/derivative_log_unnormalized_pdf.hpp | 27 +++++++++++++------------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/unscope/log_unnormalized_pdf.hpp | 26 ++++++++++++------------
sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/doc/readme.txt | 2 +
sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/example/distribution_function.cpp | 41 +++++++++++++++++++++------------------
sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/example/random.cpp | 26 +++++++++++++++++++++++-
sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/src/main.cpp | 14 ++++++------
88 files changed, 417 insertions(+), 539 deletions(-)
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/data/generate_n_sample_cdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/data/generate_n_sample_cdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/data/generate_n_sample_cdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -11,7 +11,7 @@
#include <boost/utility/enable_if.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_scalar_distribution.hpp>
#include <boost/statistics/detail/distribution_toolkit/data/sample_cdf.hpp>
-#include <boost/statistics/detail/distribution_toolkit/fwd_math/cdf.hpp>
+//#include <boost/statistics/detail/distribution_toolkit/fwd_math/cdf.hpp>
namespace boost{
@@ -35,7 +35,7 @@
T x, cdf;
while(i<n){
x = vg();
- cdf = statistics::detail::distribution_toolkit::cdf(dist,x);
+ cdf = statistics::detail::cdf(dist,x);
sc(x,cdf);
++i;
};
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/derivative_log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/derivative_log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/derivative_log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
///////////////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_CHI_SQUARED_DERIVATIVE_LOG_UNNORMALIZED_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_CHI_SQUARED_DERIVATIVE_LOG_UNNORMALIZED_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_CHI_SQUARED_DERIVATIVE_LOG_UNNORMALIZED_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_CHI_SQUARED_DERIVATIVE_LOG_UNNORMALIZED_HPP_ER_2009
#include <boost/math/distributions/chi_squared.hpp>
#include <boost/math/special_functions/log1p.hpp>
#include <boost/numeric/conversion/converter.hpp>
@@ -16,7 +16,6 @@
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename T,typename P>
T
@@ -50,7 +49,6 @@
return (degrees_of_freedom/two-one) / x - one/two;
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/description.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/description.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/description.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_CHI_SQUARED_DESCRIPTION_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_CHI_SQUARED_DESCRIPTION_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_CHI_SQUARED_DESCRIPTION_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_CHI_SQUARED_DESCRIPTION_HPP_ER_2009
#include <ostream>
#include <boost/format.hpp>
#include <boost/math/distributions/chi_squared.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/include.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/include.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/include.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_CHI_SQUARED_INCLUDE_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_CHI_SQUARED_INCLUDE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_CHI_SQUARED_INCLUDE_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_CHI_SQUARED_INCLUDE_HPP_ER_2009
#include <boost/math/distributions/chi_squared.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/is_math_distribution.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/is_math_distribution.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/is_math_distribution.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_CHI_SQUARED_IS_MATH_DISTRIBUTION_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_CHI_SQUARED_IS_MATH_DISTRIBUTION_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_CHI_SQUARED_IS_MATH_DISTRIBUTION_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_CHI_SQUARED_IS_MATH_DISTRIBUTION_HPP_ER_2009
#include <boost/mpl/bool.hpp>
#include <boost/math/distributions/chi_squared.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_math_distribution.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_CHI_SQUARED_LOG_UNNORMALIZED_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_CHI_SQUARED_LOG_UNNORMALIZED_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_CHI_SQUARED_LOG_UNNORMALIZED_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_CHI_SQUARED_LOG_UNNORMALIZED_HPP_ER_2009
#include <boost/math/distributions/chi_squared.hpp>
#include <boost/math/special_functions/log1p.hpp>
#include <boost/numeric/conversion/converter.hpp>
@@ -16,7 +16,6 @@
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename T,typename P>
T
@@ -50,7 +49,6 @@
return (degrees_of_freedom/two-one) * log(x) - x/two;
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/random.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/random.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/random.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_CHI_SQUARED_RANDOM_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_CHI_SQUARED_RANDOM_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_CHI_SQUARED_RANDOM_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_CHI_SQUARED_RANDOM_HPP_ER_2009
#include <boost/math/distributions/chi_squared.hpp>
#include <boost/random/chi_squared.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/random.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/derivative_log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/derivative_log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/derivative_log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -15,7 +15,6 @@
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename T,typename P>
T
@@ -43,7 +42,6 @@
return result;
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/description.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/description.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/description.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_EXPONENTIAL_DESCRIPTION_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_EXPONENTIAL_DESCRIPTION_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_EXPONENTIAL_DESCRIPTION_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_EXPONENTIAL_DESCRIPTION_HPP_ER_2009
#include <string>
#include <boost/format.hpp>
#include <boost/math/distributions/exponential.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/include.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/include.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/include.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_EXPONENTIAL_INCLUDE_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_EXPONENTIAL_INCLUDE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_EXPONENTIAL_INCLUDE_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_EXPONENTIAL_INCLUDE_HPP_ER_2009
#include <boost/math/distributions/exponential.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/is_math_distribution.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/is_math_distribution.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/is_math_distribution.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_EXPONENTIAL_IS_MATH_DISTRIBUTION_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_EXPONENTIAL_IS_MATH_DISTRIBUTION_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_EXPONENTIAL_IS_MATH_DISTRIBUTION_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_EXPONENTIAL_IS_MATH_DISTRIBUTION_HPP_ER_2009
#include <boost/mpl/bool.hpp>
#include <boost/math/distributions/exponential.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_math_distribution.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -15,7 +15,6 @@
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename T,typename P>
T
@@ -43,7 +42,6 @@
return result;
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/random.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/random.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/random.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_EXPONENTIAL_RANDOM_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_EXPONENTIAL_RANDOM_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_EXPONENTIAL_RANDOM_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_EXPONENTIAL_RANDOM_HPP_ER_2009
#include <boost/math/distributions/exponential.hpp>
#include <boost/random/exponential_distribution.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/random.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/derivative_log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/derivative_log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/derivative_log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_GAMMA_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_GAMMA_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_GAMMA_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_GAMMA_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
#include <cmath>
#include <boost/math/distributions/gamma.hpp>
#include <boost/math/policies/policy.hpp>
@@ -15,7 +15,6 @@
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template <class T, class P>
inline T derivative_log_unnormalized_pdf(
@@ -47,7 +46,6 @@
return result;
} // derivative_log_unnormalized_pdf
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/description.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/description.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/description.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_GAMMA_DESCRIPTION_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_GAMMA_DESCRIPTION_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_GAMMA_DESCRIPTION_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_GAMMA_DESCRIPTION_HPP_ER_2009
#include <string>
#include <boost/format.hpp>
#include <boost/math/distributions/gamma.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/include.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/include.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/include.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_GAMMA_INCLUDE_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_GAMMA_INCLUDE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_GAMMA_INCLUDE_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_GAMMA_INCLUDE_HPP_ER_2009
#include <boost/math/distributions/gamma.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/is_log_concave.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/is_log_concave.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/is_log_concave.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_GAMMA_IS_LOG_CONCAVE_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_GAMMA_IS_LOG_CONCAVE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_GAMMA_IS_LOG_CONCAVE_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_GAMMA_IS_LOG_CONCAVE_HPP_ER_2009
#include <cmath>
#include <boost/math/distributions/gamma.hpp>
#include <boost/math/policies/policy.hpp>
@@ -15,7 +15,6 @@
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template <class T, class P>
inline bool is_log_concave(
@@ -25,7 +24,6 @@
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/is_math_distribution.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/is_math_distribution.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/is_math_distribution.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_GAMMA_IS_MATH_DISTRIBUTION_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_GAMMA_IS_MATH_DISTRIBUTION_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_GAMMA_IS_MATH_DISTRIBUTION_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_GAMMA_IS_MATH_DISTRIBUTION_HPP_ER_2009
#include <boost/mpl/bool.hpp>
#include <boost/math/distributions/gamma.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_math_distribution.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_GAMMA_LOG_UNNORMALIZED_PDF_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_GAMMA_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_GAMMA_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_GAMMA_LOG_UNNORMALIZED_PDF_HPP_ER_2009
#include <cmath>
#include <boost/math/distributions/gamma.hpp>
#include <boost/math/policies/policy.hpp>
@@ -15,7 +15,6 @@
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template <class T, class P>
inline T log_unnormalized_pdf(
@@ -47,7 +46,6 @@
return result;
} // log_unnormalized_pdf
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/random.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/random.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/random.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_GAMMA_RANDOM_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_GAMMA_RANDOM_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_GAMMA_RANDOM_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_GAMMA_RANDOM_HPP_ER_2009
#include <boost/math/distributions/gamma.hpp>
#include <boost/random/gamma_distribution.hpp>
#include <boost/random/location_scale.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/include.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/include.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/include.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_INCLUDE_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_INCLUDE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_INCLUDE_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_INCLUDE_HPP_ER_2009
#include <boost/statistics/detail/distribution_toolkit/distributions/chi_squared/include.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/exponential/include.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/cdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/cdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/cdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,34 +6,30 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_CDF_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_CDF_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_CDF_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_CDF_HPP_ER_2009
#include <boost/concept/assert.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/location_scale.hpp>
-#include <boost/statistics/detail/distribution_toolkit/concept/unary/cdf.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
- template<typename Z>
- typename location_scale_distribution<Z>::value_type
+ template<typename Z,typename T>
+ T
cdf(
- const location_scale_distribution<Z>& d,
- const typename location_scale_distribution<Z>::value_type& x
+ const distribution_toolkit::location_scale_distribution<Z>& d,
+ const T& x
){
- typedef typename
- location_scale_distribution<Z>::value_type value_t;
- value_t z = (x-d.mu())/d.sigma();
- return cdf(
+ typedef distribution_toolkit::location_scale_distribution<Z> dist_;
+ T z = (x-d.mu())/d.sigma();
+ return statistics::detail::cdf(
d.z(),
z
);
}
-
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/derivative_log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/derivative_log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/derivative_log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,37 +6,30 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
///////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
#include <boost/concept/assert.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/location_scale.hpp>
-#include <boost/statistics/detail/distribution_toolkit/concept/unary/derivative_log_unnormalized_pdf.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
- template<typename Z>
- typename meta::value< location_scale_distribution<Z> >::type
+ template<typename Z,typename T>
+ T
derivative_log_unnormalized_pdf(
- const location_scale_distribution<Z>& d,
- const typename meta::value< location_scale_distribution<Z> >::type& x
+ const distribution_toolkit::location_scale_distribution<Z>& d,
+ const T& x
){
- typedef typename
- meta::value< location_scale_distribution<Z> >::type value_t;
- value_t z = (x-d.mu())/d.sigma();
- BOOST_CONCEPT_ASSERT((
- concept::DerivativeLogUnnormalizedPdf<Z>
- ));
- value_t result = derivative_log_unnormalized_pdf(d.z(),z);
+ typedef distribution_toolkit::location_scale_distribution<Z> dist_;
+
+ T z = (x-d.mu())/d.sigma();
+ T result = statistics::detail::derivative_log_unnormalized_pdf(d.z(),z);
result /= d.sigma(); // = dz/dx
return result;
}
-
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/description.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/description.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/description.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_DESCRIPTION_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_DESCRIPTION_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_DESCRIPTION_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_DESCRIPTION_HPP_ER_2009
#include <string>
#include <boost/format.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/location_scale.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/include.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/include.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/include.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_INCLUDE_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_INCLUDE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_INCLUDE_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_INCLUDE_HPP_ER_2009
#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/cdf.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/description.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/is_scalar_distribution.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/is_scalar_distribution.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/is_scalar_distribution.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_IS_SCALAR_DISTRIBUTION_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_IS_SCALAR_DISTRIBUTION_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_IS_SCALAR_DISTRIBUTION_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_IS_SCALAR_DISTRIBUTION_HPP_ER_2009
#include <boost/mpl/bool.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/location_scale.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_scalar_distribution.hpp>
@@ -20,7 +20,7 @@
template<typename Z>
struct is_scalar_distribution< location_scale_distribution<Z> >
- : mpl::bool_<true>{};
+ : is_scalar_distribution<Z>{};
}// meta
}// distribution_toolkit
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/location_scale.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/location_scale.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/location_scale.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_LOCATION_SCALE_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_LOCATION_SCALE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_LOCATION_SCALE_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_LOCATION_SCALE_HPP_ER_2009
#include <vector>
#include <algorithm>
#include <iterator>
@@ -15,9 +15,9 @@
#include <boost/utility.hpp>
#include <boost/type_traits.hpp> // remove_reference etc.
#include <boost/range.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/inherit_policy.hpp>
+#include <boost/statistics/detail/distribution_common/meta/inherit_policy.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_scalar_distribution.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
//#include <boost/math/policies/policy.hpp>
namespace boost{
@@ -33,7 +33,8 @@
//
// TODO: range and support
template<typename Z>
- class location_scale_distribution : public meta::inherit_policy<Z>{
+ class location_scale_distribution
+ : public distribution::common::meta::inherit_policy<Z>{
public:
typedef Z distribution_type;
@@ -42,7 +43,9 @@
meta::is_scalar_distribution<Z>
));
- typedef typename meta::value<distribution_type>::type value_type;
+ typedef typename distribution::common::meta::value<
+ distribution_type
+ >::type value_type;
location_scale_distribution();
location_scale_distribution(
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,36 +6,30 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
///////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
#include <boost/concept/assert.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/location_scale.hpp>
-#include <boost/statistics/detail/distribution_toolkit/concept/unary/log_unnormalized_pdf.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
- template<typename Z>
- typename location_scale_distribution<Z>::value_type
+ template<typename Z,typename T>
+ T
log_unnormalized_pdf(
- const location_scale_distribution<Z>& d,
- const typename location_scale_distribution<Z>::value_type& x
+ const distribution_toolkit::location_scale_distribution<Z>& d,
+ const T& x
){
- typedef typename location_scale_distribution<Z>::value_type value_t;
- value_t z = (x-d.mu())/d.sigma();
- BOOST_CONCEPT_ASSERT((
- concept::LogUnnormalizedPdf<Z>
- ));
- value_t result = log_unnormalized_pdf(d.z(),z);
+ typedef distribution_toolkit::location_scale_distribution<Z> dist_;
+
+ T z = (x-d.mu())/d.sigma();
+ T result = statistics::detail::log_unnormalized_pdf(d.z(),z);
// -log ( sigma ) is a constant so it is ignored
return result;
}
-
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/mean.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/mean.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/mean.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,26 +6,26 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_MEAN_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_MEAN_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_MEAN_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_MEAN_HPP_ER_2009
#include <boost/concept/assert.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/location_scale.hpp>
-#include <boost/statistics/detail/distribution_toolkit/concept/unary/pdf.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename Z>
- typename location_scale_distribution<Z>::value_type
+ typename distribution::common::meta::value<
+ distribution_toolkit::location_scale_distribution<Z>
+ >::type
mean(
- const location_scale_distribution<Z>& d
+ const distribution_toolkit::location_scale_distribution<Z>& d
){
- return mean(d) + mean(d.z());
+ return d.mu() + statistics::detail::mean(d.z());
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,38 +6,30 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_PDF_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_PDF_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_PDF_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_PDF_HPP_ER_2009
#include <boost/concept/assert.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/location_scale.hpp>
-#include <boost/statistics/detail/distribution_toolkit/concept/unary/pdf.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
- template<typename Z>
- typename location_scale_distribution<Z>::value_type
+ template<typename Z,typename T>
+ T
pdf(
- const location_scale_distribution<Z>& d,
- const typename
- location_scale_distribution<Z>::value_type& x
+ const distribution_toolkit::location_scale_distribution<Z>& d,
+ const T& x
){
- typedef typename
- location_scale_distribution<Z>::value_type value_t;
- value_t z = (x-d.mu())/d.sigma();
-
- BOOST_CONCEPT_ASSERT((
- concept::Pdf<Z>
- ));
+
+ T z = (x-d.mu())/d.sigma();
- value_t result = pdf(d.z(),z);
+ T result = statistics::detail::pdf(d.z(),z);
result /= d.sigma();
return result;
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/quantile.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/quantile.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/quantile.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,34 +6,29 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_QUANTILE_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_QUANTILE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_QUANTILE_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_QUANTILE_HPP_ER_2009
#include <boost/concept/assert.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/location_scale.hpp>
-#include <boost/statistics/detail/distribution_toolkit/concept/unary/quantile.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
- template<typename Z>
- typename location_scale_distribution<Z>::value_type
+ template<typename Z,typename T>
+ T
quantile(
- const location_scale_distribution<Z>& d,
- const typename location_scale_distribution<Z>::value_type& x
+ const distribution_toolkit::location_scale_distribution<Z>& d,
+ const T& x
){
- typedef typename
- location_scale_distribution<Z>::value_type value_t;
- value_t z = (x-d.mu())/d.sigma();
- return quantile(
+ T z = (x-d.mu())/d.sigma();
+ return statistics::detail::quantile(
d.z(),
z
);
}
-
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/random.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/random.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/random.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_RANDOM_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_RANDOM_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_RANDOM_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_RANDOM_HPP_ER_2009
#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/location_scale.hpp>
#include <boost/random/location_scale.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/random.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/variance.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/variance.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/variance.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,26 +6,26 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_VARIANCE_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_LOCATION_SCALE_VARIANCE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_VARIANCE_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_LOCATION_SCALE_VARIANCE_HPP_ER_2009
#include <boost/concept/assert.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/location_scale.hpp>
-#include <boost/statistics/detail/distribution_toolkit/concept/unary/pdf.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename Z>
- typename location_scale_distribution<Z>::value_type
+ typename distribution::common::meta::value<
+ distribution_toolkit::location_scale_distribution<Z>
+ >::type
variance(
- const location_scale_distribution<Z>& d
+ const distribution_toolkit::location_scale_distribution<Z>& d
){
- return variance(d.z()) * d.sigma() * d.sigma();
+ return statistics::detail::variance(d.z()) * d.sigma() * d.sigma();
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/derivative_log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/derivative_log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/derivative_log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_NORMAL_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_NORMAL_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_NORMAL_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_NORMAL_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
#include <boost/math/distributions/normal.hpp>
#include <boost/numeric/conversion/converter.hpp>
//#include <boost/math/policies/policy.hpp>//TODO
@@ -15,7 +15,6 @@
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename T,typename P>
T
@@ -32,7 +31,6 @@
return (- z) * dz;
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/description.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/description.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/description.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_NORMAL_DESCRIPTION_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_NORMAL_DESCRIPTION_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_NORMAL_DESCRIPTION_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_NORMAL_DESCRIPTION_HPP_ER_2009
#include <ostream>
#include <boost/format.hpp>
#include <boost/math/distributions/normal.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/include.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/include.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/include.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_NORMAL_INCLUDE_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_NORMAL_INCLUDE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_NORMAL_INCLUDE_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_NORMAL_INCLUDE_HPP_ER_2009
#include <boost/math/distributions/normal.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/is_math_distribution.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/is_math_distribution.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/is_math_distribution.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_NORMAL_IS_MATH_DISTRIBUTION_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_NORMAL_IS_MATH_DISTRIBUTION_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_NORMAL_IS_MATH_DISTRIBUTION_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_NORMAL_IS_MATH_DISTRIBUTION_HPP_ER_2009
#include <boost/mpl/bool.hpp>
#include <boost/math/distributions/normal.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_math_distribution.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_NORMAL_LOG_UNNORMALIZED_PDF_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_NORMAL_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_NORMAL_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_NORMAL_LOG_UNNORMALIZED_PDF_HPP_ER_2009
#include <boost/math/distributions/normal.hpp>
#include <boost/numeric/conversion/converter.hpp>
//#include <boost/math/policies/policy.hpp>//TODO
@@ -15,7 +15,6 @@
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename T,typename P>
T
@@ -31,7 +30,6 @@
return - z * z / int2real_t::convert(2);
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/normalizing_constant.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/normalizing_constant.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/normalizing_constant.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
///////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_NORMAL_NORMALIZING_CONSTANT_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_NORMAL_NORMALIZING_CONSTANT_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_NORMAL_NORMALIZING_CONSTANT_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_NORMAL_NORMALIZING_CONSTANT_HPP_ER_2009
#include <cmath>
#include <boost/math/constants/constants.hpp>
#include <boost/math/distributions/normal.hpp>
@@ -15,7 +15,6 @@
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename T,typename P>
T normalizing_constant(const boost::math::normal_distribution<T,P>& d){
@@ -24,7 +23,6 @@
return sqrt(two * pi) * d.scale();
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/random.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/random.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/random.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_NORMAL_RANDOM_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_NORMAL_RANDOM_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_NORMAL_RANDOM_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_NORMAL_RANDOM_HPP_ER_2009
#include <boost/math/distributions/normal.hpp>
#include <boost/random/normal_distribution.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/random.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/derivative_log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/derivative_log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/derivative_log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_STUDENTS_T_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_STUDENTS_T_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_STUDENTS_T_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_STUDENTS_T_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
#include <boost/math/distributions/students_t.hpp>
#include <boost/math/special_functions/log1p.hpp>
#include <boost/numeric/conversion/converter.hpp>
@@ -16,7 +16,6 @@
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename T,typename Policy>
T
@@ -36,7 +35,6 @@
return (- m ) * dlog1p * dy;
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/description.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/description.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/description.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_STUDENTS_T_DESCRIPTION_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_STUDENTS_T_DESCRIPTION_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_STUDENTS_T_DESCRIPTION_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_STUDENTS_T_DESCRIPTION_HPP_ER_2009
#include <string>
#include <boost/format.hpp>
#include <boost/math/distributions/students_t.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/include.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/include.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/include.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
////////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_STUDENTS_T_INCLUDE_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_STUDENTS_T_INCLUDE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_STUDENTS_T_INCLUDE_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_STUDENTS_T_INCLUDE_HPP_ER_2009
#include <boost/math/distributions/students_t.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/students_t/description.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/is_math_distribution.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/is_math_distribution.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/is_math_distribution.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_STUDENTS_T_IS_MATH_DISTRIBUTION_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_STUDENTS_T_IS_MATH_DISTRIBUTION_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_STUDENTS_T_IS_MATH_DISTRIBUTION_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_STUDENTS_T_IS_MATH_DISTRIBUTION_HPP_ER_2009
#include <boost/mpl/bool.hpp>
#include <boost/math/distributions/students_t.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_scalar_distribution.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_STUDENTS_T_LOG_UNNORMALIZED_PDF_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_STUDENTS_T_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_STUDENTS_T_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_STUDENTS_T_LOG_UNNORMALIZED_PDF_HPP_ER_2009
#include <boost/math/distributions/students_t.hpp>
#include <boost/math/special_functions/log1p.hpp>
#include <boost/numeric/conversion/converter.hpp>
@@ -16,7 +16,6 @@
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename T,typename Policy>
T
@@ -36,7 +35,6 @@
return (- m ) * math::log1p(y);
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/random.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/random.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/random.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_STUDENTS_T_RANDOM_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_STUDENTS_T_RANDOM_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_STUDENTS_T_RANDOM_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_STUDENTS_T_RANDOM_HPP_ER_2009
#include <boost/math/distributions/students_t.hpp>
#include <boost/random/students_t.hpp> // sandbox/statistics/random
#include <boost/statistics/detail/distribution_toolkit/meta/random.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/derivative_log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/derivative_log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/derivative_log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_UNIFORM_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_UNIFORM_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_UNIFORM_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_UNIFORM_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
#include <boost/math/distributions/uniform.hpp>
#include <boost/math/special_functions/log1p.hpp>
#include <boost/numeric/conversion/converter.hpp>
@@ -17,8 +17,6 @@
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
-
template<typename T,typename P>
T
@@ -54,7 +52,6 @@
}
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/description.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/description.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/description.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_UNIFORM_DESCRIPTION_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_UNIFORM_DESCRIPTION_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_UNIFORM_DESCRIPTION_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_UNIFORM_DESCRIPTION_HPP_ER_2009
#include <string>
#include <boost/format.hpp>
#include <boost/math/distributions/uniform.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/include.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/include.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/include.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_UNIFORM_INCLUDE_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_UNIFORM_INCLUDE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_UNIFORM_INCLUDE_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_UNIFORM_INCLUDE_HPP_ER_2009
#include <boost/math/distributions/uniform.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/uniform/is_math_distribution.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/is_math_distribution.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/is_math_distribution.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/is_math_distribution.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_UNIFORM_IS_MATH_DISTRIBUTION_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_UNIFORM_IS_MATH_DISTRIBUTION_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_UNIFORM_IS_MATH_DISTRIBUTION_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_UNIFORM_IS_MATH_DISTRIBUTION_HPP_ER_2009
#include <boost/mpl/bool.hpp>
#include <boost/math/distributions/uniform.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_scalar_distribution.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_UNIFORM_LOG_UNNORMALIZED_PDF_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_UNIFORM_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_UNIFORM_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_UNIFORM_LOG_UNNORMALIZED_PDF_HPP_ER_2009
#include <boost/math/distributions/uniform.hpp>
#include <boost/math/special_functions/log1p.hpp>
#include <boost/numeric/conversion/converter.hpp>
@@ -17,7 +17,6 @@
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename T,typename P>
T
@@ -53,7 +52,6 @@
}
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/cdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/cdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/cdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,34 +6,25 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_CDF_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_CDF_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_CDF_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_CDF_HPP_ER_2009
#include <boost/concept/assert.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
-#include <boost/statistics/detail/distribution_toolkit/concept/unary/cdf.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/wrapper/wrapper.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
- template<typename D>
- typename meta::value< wrapper<D> >::type
+ template<typename D,typename T>
+ T
cdf(
- const wrapper<D>& w,
- typename meta::value< wrapper<D> >::type x
+ const distribution_toolkit::wrapper<D>& w,
+ const T& x
){
- typedef wrapper<D> w_;
- typedef typename w_::distribution_type d_;
- BOOST_CONCEPT_ASSERT((
- concept::Cdf<d_>
- ));
-
- return cdf(w.const_reference(),x);
+ return statistics::detail::cdf(w.const_reference(),x);
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/derivative_log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/derivative_log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/derivative_log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,34 +6,28 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
///////////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
#include <boost/concept/assert.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
-#include <boost/statistics/detail/distribution_toolkit/concept/unary/derivative_log_unnormalized_pdf.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/wrapper/wrapper.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
- template<typename D>
- typename meta::value< wrapper<D> >::type
+ template<typename D,typename T>
+ T
derivative_log_unnormalized_pdf(
- const wrapper<D>& w,
- typename meta::value< wrapper<D> >::type x
+ const distribution_toolkit::wrapper<D>& w,
+ const T& x
){
- typedef wrapper<D> w_;
- typedef typename w_::distribution_type d_;
- BOOST_CONCEPT_ASSERT((
- concept::DerivativeLogUnnormalizedPdf<d_>
- ));
-
- return derivative_log_unnormalized_pdf(w.const_reference(),x);
+ return statistics::detail::derivative_log_unnormalized_pdf(
+ w.const_reference(),
+ x
+ );
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/description.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/description.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/description.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_DESCRIPTION_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_DESCRIPTION_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_DESCRIPTION_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_DESCRIPTION_HPP_ER_2009
#include <string>
#include <boost/format.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/wrapper/wrapper.hpp>
@@ -19,7 +19,7 @@
template<typename D>
std::string
- description(const wrapper<D>& w)
+ description(const distribution_toolkit::wrapper<D>& w)
{
static const char* msg = "wrapper(%1%)";
format f(msg); f % description(w.const_reference());
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/include.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/include.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/include.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_INCLUDE_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_INCLUDE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_INCLUDE_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_INCLUDE_HPP_ER_2009
#include <boost/statistics/detail/distribution_toolkit/distributions/wrapper/cdf.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/wrapper/derivative_log_unnormalized_pdf.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/is_pseudo_scalar_distribution.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/is_pseudo_scalar_distribution.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/is_pseudo_scalar_distribution.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_IS_PSEUDO_SCALAR_DISTRIBUTION_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_IS_PSEUDO_SCALAR_DISTRIBUTION_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_IS_PSEUDO_SCALAR_DISTRIBUTION_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_IS_PSEUDO_SCALAR_DISTRIBUTION_HPP_ER_2009
#include <boost/statistics/detail/distribution_toolkit/meta/is_pseudo_scalar_distribution.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/wrapper/wrapper.hpp>
@@ -19,13 +19,8 @@
template<typename D>
struct is_pseudo_scalar_distribution< wrapper<D> >
- {
-
- typedef wrapper<D> w_;
- typedef typename w_::distribution_type d_;
- typedef typename is_pseudo_scalar_distribution<d_>::type type;
-
- };
+ :is_pseudo_scalar_distribution<typename wrapper<D>::distribution_type>
+ {};
}// meta
}// distribution_toolkit
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/is_scalar_distribution.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/is_scalar_distribution.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/is_scalar_distribution.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_IS_SCALAR_DISTRIBUTION_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_IS_SCALAR_DISTRIBUTION_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_IS_SCALAR_DISTRIBUTION_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_IS_SCALAR_DISTRIBUTION_HPP_ER_2009
#include <boost/statistics/detail/distribution_toolkit/meta/is_scalar_distribution.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/wrapper/wrapper.hpp>
@@ -19,13 +19,8 @@
template<typename D>
struct is_scalar_distribution< wrapper<D> >
- {
-
- typedef wrapper<D> w_;
- typedef typename w_::distribution_type d_;
- typedef typename is_scalar_distribution<d_>::type type;
-
- };
+ : is_scalar_distribution<typename wrapper<D>::distribution_type>
+ {};
}// meta
}// distribution_toolkit
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,33 +6,25 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_LOG_UNNORMALIZED_PDF_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_LOG_UNNORMALIZED_PDF_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_LOG_UNNORMALIZED_PDF_HPP_ER_2009
#include <boost/concept/assert.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
-#include <boost/statistics/detail/distribution_toolkit/concept/unary/log_unnormalized_pdf.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/wrapper/wrapper.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
- template<typename D>
- typename meta::value< wrapper<D> >::type
+ template<typename D,typename T>
+ T
log_unnormalized_pdf(
- const wrapper<D>& w,
- typename meta::value< wrapper<D> >::type x
+ const distribution_toolkit::wrapper<D>& w,
+ const T& x
){
- typedef wrapper<D> w_;
- typedef typename w_::distribution_type d_;
- BOOST_CONCEPT_ASSERT((
- concept::LogUnnormalizedPdf<d_>
- ));
- return log_unnormalized_pdf(w.const_reference(),x);
+ return statistics::detail::log_unnormalized_pdf(w.const_reference(),x);
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/mean.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/mean.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/mean.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,33 +6,26 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_MEAN_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_MEAN_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_MEAN_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_MEAN_HPP_ER_2009
#include <boost/concept/assert.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
-#include <boost/statistics/detail/distribution_toolkit/concept/unary/mean.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/wrapper/wrapper.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename D>
- typename meta::value< wrapper<D> >::type
+ typename distribution::common::meta::value<
+ distribution_toolkit::wrapper<D>
+ >::type
mean(
- const wrapper<D>& w
+ const distribution_toolkit::wrapper<D>& w
){
- typedef wrapper<D> w_;
- typedef typename w_::distribution_type d_;
- BOOST_CONCEPT_ASSERT((
- concept::Mean<d_>
- ));
-
- return mean(w.const_reference());
+ return statistics::detail::mean(w.const_reference());
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/normalizing_constant.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/normalizing_constant.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/normalizing_constant.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,33 +6,26 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_NORMALIZING_CONSTANT_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_NORMALIZING_CONSTANT_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_NORMALIZING_CONSTANT_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_NORMALIZING_CONSTANT_HPP_ER_2009
#include <boost/concept/assert.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
-#include <boost/statistics/detail/distribution_toolkit/concept/unary/normalizing_constant.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/wrapper/wrapper.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename D>
- typename meta::value< wrapper<D> >::type
+ typename distribution::common::meta::value<
+ distribution_toolkit::wrapper<D>
+ >::type
normalizing_constant(
- const wrapper<D>& w
+ const distribution_toolkit::wrapper<D>& w
){
- typedef wrapper<D> w_;
- typedef typename w_::distribution_type d_;
- BOOST_CONCEPT_ASSERT((
- concept::NormalizingConstant<d_>
- ));
-
- return normalizing_constant(w.const_reference());
+ return statistics::detail::normalizing_constant(w.const_reference());
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,34 +6,25 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_PDF_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_PDF_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_PDF_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_PDF_HPP_ER_2009
#include <boost/concept/assert.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
-#include <boost/statistics/detail/distribution_toolkit/concept/unary/pdf.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/wrapper/wrapper.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
- template<typename D>
- typename meta::value< wrapper<D> >::type
+ template<typename D,typename T>
+ T
pdf(
- const wrapper<D>& w,
- typename meta::value< wrapper<D> >::type x
+ const distribution_toolkit::wrapper<D>& w,
+ const T& x
){
- typedef wrapper<D> w_;
- typedef typename w_::distribution_type d_;
- BOOST_CONCEPT_ASSERT((
- concept::Pdf<d_>
- ));
-
- return pdf(w.const_reference(),x);
+ return statistics::detail::pdf(w.const_reference(),x);
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/quantile.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/quantile.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/quantile.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,34 +6,24 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_CDF_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_CDF_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_QUANTILE_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_QUANTILE_HPP_ER_2009
#include <boost/concept/assert.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
-#include <boost/statistics/detail/distribution_toolkit/concept/quantile.hpp>
-#include <boost/statistics/detail/distribution_toolkit/wrapper/wrapper.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
+#include <boost/statistics/detail/distribution_toolkit/distributions/wrapper/wrapper.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
- template<typename D>
- typename meta::value< wrapper<D> >::type
- quantile(
- const wrapper<D>& w,
- typename meta::value< wrapper<D> >::type x
+ template<typename D,typename T>
+ T quantile(
+ const distribution_toolkit::wrapper<D>& w,
+ const T& x
){
- typedef wrapper<D> w_;
- typedef typename w_::distribution_type d_;
- BOOST_CONCEPT_ASSERT((
- concept::Quantile<d_>
- ));
-
- return quantile(w.const_reference(),x);
+ return statistics::detail::quantile(w.const_reference(),x);
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/random.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/random.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/random.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_RANDOM_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_RANDOM_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_RANDOM_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_RANDOM_HPP_ER_2009
#include <boost/statistics/detail/distribution_toolkit/distributions/wrapper/wrapper.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/random.hpp>
@@ -19,9 +19,9 @@
template<typename D>
struct random<
- wrapper<D>
+ distribution_toolkit::wrapper<D>
>{
- typedef wrapper<D> w_;
+ typedef distribution_toolkit::wrapper<D> w_;
typedef typename w_::distribution_type d_;
typedef typename meta::random<d_>::type type;
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/variance.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/variance.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/variance.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,33 +6,26 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_VARIANCE_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_VARIANCE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_VARIANCE_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_VARIANCE_HPP_ER_2009
#include <boost/concept/assert.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
-#include <boost/statistics/detail/distribution_toolkit/concept/unary/variance.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/wrapper/wrapper.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename D>
- typename meta::value< wrapper<D> >::type
+ typename distribution::common::meta::value<
+ distribution_toolkit::wrapper<D>
+ >::type
variance(
- const wrapper<D>& w
+ const distribution_toolkit::wrapper<D>& w
){
- typedef wrapper<D> w_;
- typedef typename w_::distribution_type d_;
- BOOST_CONCEPT_ASSERT((
- concept::Variance<d_>
- ));
-
- return variance(w.const_reference());
+ return statistics::detail::variance(w.const_reference());
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/wrapper.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/wrapper.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/wrapper.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,14 +6,14 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
/////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_WRAPPER_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_WRAPPER_WRAPPER_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_WRAPPER_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_WRAPPER_HPP_ER_2009
#include <boost/call_traits.hpp>
#include <boost/type_traits.hpp>
#include <boost/mpl/assert.hpp>
#include <boost/mpl/not.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/inherit_policy.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
+#include <boost/statistics/detail/distribution_common/meta/inherit_policy.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
#include <boost/archive/text_oarchive.hpp>
#include <boost/archive/text_iarchive.hpp>
@@ -26,7 +26,7 @@
//
// BUG : See function_ptrs.cpp
template<typename D>
- class wrapper : meta::inherit_policy<
+ class wrapper : distribution::common::meta::inherit_policy<
typename remove_cv<
typename remove_reference<D>::type
>::type
@@ -37,9 +37,13 @@
typename remove_reference<D>::type
>::type distribution_type;
- typedef typename meta::value<distribution_type>::type value_type;
+ typedef typename
+ distribution::common::meta::value<distribution_type>::type
+ value_type;
+ wrapper(){}
wrapper(typename call_traits<D>::param_type d):d_(d){}
+ wrapper(const wrapper& that):d_(that.d_){}
typename call_traits<D>::const_reference
const_reference()const{ return this->d_; }
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/cdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/cdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/cdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -12,17 +12,12 @@
#include <boost/statistics/detail/distribution_toolkit/fwd_math/cdf.hpp>
namespace boost{
-
-//namespace math{
-// template<typename T,typename D> T cdf(const D& d,const T& x);
-//}
-
namespace statistics{
namespace detail{
namespace distribution_toolkit{
namespace fun_wrap{
template<typename D> struct cdf_
- : impl<D,cdf>{};
+ : impl<D,statistics::detail::cdf>{};
}
}
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -18,7 +18,7 @@
template<typename D>
struct log_unnormalized_pdf_
- : impl<D,log_unnormalized_pdf>{};
+ : impl<D,statistics::detail::log_unnormalized_pdf>{};
}// fun_wrap
}// distribution_toolkit
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -12,17 +12,13 @@
#include <boost/statistics/detail/distribution_toolkit/fwd_math/pdf.hpp>
namespace boost{
-
-//namespace math{
-// template<typename T,typename D> T pdf(const D& d,const T& x);
-//}
-
namespace statistics{
namespace detail{
namespace distribution_toolkit{
namespace fun_wrap{
- template<typename D> struct pdf_ : impl<D,pdf>{};
+ template<typename D> struct pdf_
+ : impl<D,statistics::detail::pdf>{};
}// fun_wrap
}// distribution_toolkit
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/quantile.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/quantile.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/quantile.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -23,7 +23,7 @@
template<typename D>
struct quantile_
- : impl<D,quantile>{};
+ : impl<D,statistics::detail::quantile>{};
}// fun_wrap
}// distribution_toolkit
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/cdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/cdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/cdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,29 +6,30 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_FWD_MATH_CDF_HPP_ER_2009
-#define BOOST_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_FWD_MATH_CDF_HPP_ER_2009
+#ifndef BOOST_COMMON_DISTRIBUTION_FWD_MATH_CDF_HPP_ER_2009
+#define BOOST_COMMON_DISTRIBUTION_FWD_MATH_CDF_HPP_ER_2009
#include <boost/utility/enable_if.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_math_distribution.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename D>
typename lazy_enable_if<
- meta::is_math_distribution<D>,
- meta::value<D>
+ distribution_toolkit::meta::is_math_distribution<D>,
+ distribution::common::meta::value<D>
>::type
- cdf(const D& dist,const typename meta::value<D>::type& x)
+ cdf(
+ const D& dist,
+ const typename distribution::common::meta::value<D>::type& x
+ )
{
return boost::math::cdf(dist,x);
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/include.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/include.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/include.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,13 +6,13 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_FWD_MATH_INCLUDE_HPP_ER_2009
-#define BOOST_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_FWD_MATH_INCLUDE_HPP_ER_2009
+#ifndef BOOST_COMMON_DISTRIBUTION_FWD_MATH_INCLUDE_HPP_ER_2009
+#define BOOST_COMMON_DISTRIBUTION_FWD_MATH_INCLUDE_HPP_ER_2009
-#include <boost/statistics/detail/distribution_toolkit/meta/fwd_math/cdf.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/fwd_math/pdf.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/fwd_math/quantile.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/fwd_math/mean.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/fwd_math/variance.hpp>
+#include <boost/statistics/detail/distribution_toolkit/fwd_math/cdf.hpp>
+#include <boost/statistics/detail/distribution_toolkit/fwd_math/pdf.hpp>
+#include <boost/statistics/detail/distribution_toolkit/fwd_math/quantile.hpp>
+#include <boost/statistics/detail/distribution_toolkit/fwd_math/mean.hpp>
+#include <boost/statistics/detail/distribution_toolkit/fwd_math/variance.hpp>
#endif
\ No newline at end of file
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/mean.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/mean.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/mean.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,29 +6,26 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_FWD_MATH_MEAN_HPP_ER_2009
-#define BOOST_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_FWD_MATH_MEAN_HPP_ER_2009
+#ifndef BOOST_COMMON_DISTRIBUTION_FWD_MATH_MEAN_HPP_ER_2009
+#define BOOST_COMMON_DISTRIBUTION_FWD_MATH_MEAN_HPP_ER_2009
#include <boost/utility/enable_if.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_math_distribution.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename D>
typename lazy_enable_if<
- meta::is_math_distribution<D>,
- meta::value<D>
+ distribution_toolkit::meta::is_math_distribution<D>,
+ distribution::common::meta::value<D>
>::type
mean(const D& dist)
{
return boost::math::mean(dist);
}
-
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,29 +6,30 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_FWD_MATH_PDF_HPP_ER_2009
-#define BOOST_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_FWD_MATH_PDF_HPP_ER_2009
+#ifndef BOOST_COMMON_DISTRIBUTION_FWD_MATH_PDF_HPP_ER_2009
+#define BOOST_COMMON_DISTRIBUTION_FWD_MATH_PDF_HPP_ER_2009
#include <boost/utility/enable_if.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_math_distribution.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename D>
typename lazy_enable_if<
- meta::is_math_distribution<D>,
- meta::value<D>
+ distribution_toolkit::meta::is_math_distribution<D>,
+ distribution::common::meta::value<D>
>::type
- pdf(const D& dist,const typename meta::value<D>::type& x)
+ pdf(
+ const D& dist,
+ const typename distribution::common::meta::value<D>::type& x
+ )
{
return boost::math::pdf(dist,x);
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/quantile.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/quantile.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/quantile.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,29 +6,29 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_FWD_MATH_QUANTILE_HPP_ER_2009
-#define BOOST_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_FWD_MATH_QUANTILE_HPP_ER_2009
+#ifndef BOOST_COMMON_DISTRIBUTION_FWD_MATH_QUANTILE_HPP_ER_2009
+#define BOOST_COMMON_DISTRIBUTION_FWD_MATH_QUANTILE_HPP_ER_2009
#include <boost/utility/enable_if.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_math_distribution.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename D>
typename lazy_enable_if<
- meta::is_math_distribution<D>,
- meta::value<D>
+ distribution_toolkit::meta::is_math_distribution<D>,
+ distribution::common::meta::value<D>
>::type
- quantile(const D& dist,const typename meta::value<D>::type& p)
+ quantile(
+ const D& dist,
+ const typename distribution::common::meta::value<D>::type& p
+ )
{
return boost::math::quantile(dist,p);
}
-
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/variance.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/variance.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/variance.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,29 +6,26 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_FWD_MATH_VARIANCE_HPP_ER_2009
-#define BOOST_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_FWD_MATH_VARIANCE_HPP_ER_2009
+#ifndef BOOST_COMMON_DISTRIBUTION_FWD_MATH_VARIANCE_HPP_ER_2009
+#define BOOST_COMMON_DISTRIBUTION_FWD_MATH_VARIANCE_HPP_ER_2009
#include <boost/utility/enable_if.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_math_distribution.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
template<typename D>
typename lazy_enable_if<
- meta::is_math_distribution<D>,
- meta::value<D>
+ distribution_toolkit::meta::is_math_distribution<D>,
+ distribution::common::meta::value<D>
>::type
variance(const D& dist)
{
return boost::math::variance(dist);
}
-
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/inverse_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/inverse_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/inverse_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -8,8 +8,8 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_MAP_PDF_INVERSE_PDF_INVERSE_PDF_HPP_ER_2009
#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_MAP_PDF_INVERSE_PDF_INVERSE_PDF_HPP_ER_2009
-#include <boost/statistics/detail/distribution_toolkit/meta/inherit_policy.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/inherit_value.hpp>
+#include <boost/statistics/detail/distribution_common/meta/inherit_policy.hpp>
+#include <boost/statistics/detail/distribution_common/meta/inherit_value.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_pseudo_scalar_distribution.hpp>
namespace boost{
@@ -21,14 +21,14 @@
// to its inverse
template<typename D>
class inverse_pdf : public
- meta::inherit_policy<
+ distribution::common::meta::inherit_policy<
D,
- meta::inherit_value<D>
+ distribution::common::meta::inherit_value<D>
>
{
public:
- typedef typename meta::value<D>::type value_type;
+ typedef typename distribution::common::meta::value<D>::type value_type;
inverse_pdf(){}
explicit inverse_pdf(const D& d):d_(d){}
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -11,28 +11,26 @@
#include <boost/mpl/not.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/inverse_pdf.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
-#include <boost/statistics/detail/distribution_toolkit/concept/unary/log_unnormalized_pdf.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
- template<typename D>
- typename meta::value< inverse_pdf<D> >::type
+ template<typename D,typename T>
+ T
log_unnormalized_pdf(
- const inverse_pdf<D>& dist,
- const typename meta::value< inverse_pdf<D> >::type& x
+ const distribution_toolkit::inverse_pdf<D>& dist,
+ const T& x
){
- BOOST_CONCEPT_ASSERT((
- concept::LogUnnormalizedPdf<D>
- ));
return
- ( -log_unnormalized_pdf(dist.distribution(),x) );
+ ( -statistics::detail::log_unnormalized_pdf(
+ dist.distribution(),
+ x
+ )
+ );
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -11,35 +11,25 @@
#include <boost/mpl/not.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/product_pdf.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
-#include <boost/statistics/detail/distribution_toolkit/concept/unary/log_unnormalized_pdf.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
namespace boost{
namespace statistics{
namespace detail{
-namespace distribution_toolkit{
- template<typename A,typename B>
- typename meta::value < product_pdf<A,B> >::type
+ template<typename A,typename B,typename T>
+ T
log_unnormalized_pdf(
- const product_pdf<A,B>& dist,
- const typename meta::value< product_pdf<A,B> >::type& x
+ const distribution_toolkit::product_pdf<A,B>& dist,
+ const T& x
){
- BOOST_CONCEPT_ASSERT((
- concept::LogUnnormalizedPdf<A>
- ));
- BOOST_CONCEPT_ASSERT((
- concept::LogUnnormalizedPdf<B>
- ));
-
return
- log_unnormalized_pdf(dist.first(),x)
- + log_unnormalized_pdf(dist.second(),x);
+ (statistics::detail::log_unnormalized_pdf(dist.first(),x)
+ + statistics::detail::log_unnormalized_pdf(dist.second(),x));
}
-}// distribution_toolkit
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/product_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/product_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/product_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -8,8 +8,8 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_MAP_PDF_PRODUCT_PDF_PRODUCT_PDF_HPP_ER_2009
#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_MAP_PDF_PRODUCT_PDF_PRODUCT_PDF_HPP_ER_2009
-#include <boost/statistics/detail/distribution_toolkit/meta/inherit_policy.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/inherit_value.hpp>
+#include <boost/statistics/detail/distribution_common/meta/inherit_policy.hpp>
+#include <boost/statistics/detail/distribution_common/meta/inherit_value.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_pseudo_scalar_distribution.hpp>
namespace boost{
@@ -20,9 +20,9 @@
// A pseudo distribution resulting from product of the pdf of two
// distributions
template<typename A,typename B>
- class product_pdf : public meta::inherit_policy<
+ class product_pdf : public distribution::common::meta::inherit_policy<
A,
- meta::inherit_value<A>
+ distribution::common::meta::inherit_value<A>
>{
public:
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/include.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/include.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/include.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -12,8 +12,8 @@
#include <boost/statistics/detail/distribution_toolkit/meta/delegate.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/distribution_base.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/pointer.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/policy.hpp>
+//#include <boost/statistics/detail/distribution_common/meta/policy.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/signature.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
+//#include <boost/statistics/detail/distribution_common/meta/value.hpp>
#endif
\ No newline at end of file
Deleted: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/inherit_policy.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/inherit_policy.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
+++ (empty file)
@@ -1,38 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// distribution_toolkit::distribution::common::meta::inherit_policy.hpp //
-// //
-// Copyright 2009 Erwann Rogard. 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) //
-///////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_META_INHERIT_POLICY_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_META_INHERIT_POLICY_HPP_ER_2009
-#include <boost/mpl/assert.hpp>
-#include <boost/mpl/not.hpp>
-#include <boost/type_traits.hpp>
-#include <boost/mpl/empty_base.hpp>
-#include <boost/statistics/detail/distribution_common/meta/policy.hpp>
-
-namespace boost{
-namespace statistics{
-namespace detail{
-namespace distribution_toolkit{
-namespace meta{
-/*
- template<typename D,typename B = mpl::empty_base>
- struct inherit_policy : B{
- BOOST_MPL_ASSERT((
- mpl::not_<
- is_reference<D>
- >
- ));
- typedef typename policy<D>::type policy_type;
- };
-*/
-}// meta
-}// distribution_toolkit
-}// detail
-}// statistics
-}// boost
-
-#endif
Deleted: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/inherit_value.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/inherit_value.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
+++ (empty file)
@@ -1,40 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// distribution::common::meta::inherit_value.hpp //
-// //
-// Copyright 2009 Erwann Rogard. 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) //
-///////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_META_INHERIT_VALUE_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_META_INHERIT_VALUE_HPP_ER_2009
-#include <boost/mpl/assert.hpp>
-#include <boost/mpl/not.hpp>
-#include <boost/type_traits.hpp>
-#include <boost/mpl/empty_base.hpp>
-#include <boost/statistics/detail/distribution_common/meta/value.hpp>
-/*
-namespace boost{
-namespace statistics{
-namespace detail{
-namespace distribution_toolkit{
-namespace meta{
-
- template<typename D,typename B = mpl::empty_base>
- struct inherit_value : B{
- BOOST_MPL_ASSERT((
- mpl::not_<
- is_reference<D>
- >
- ));
-
- typedef typename value<D>::type value_type;
-
- };
-
-}// meta
-}// distribution_toolkit
-}// detail
-}// statistics
-}// boost
-*/
-#endif
Deleted: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/policy.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/policy.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
+++ (empty file)
@@ -1,30 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// distribution_toolkit::meta::policy.hpp //
-// //
-// (C) Copyright 2009 Erwann Rogard //
-// Use, modification and distribution are subject to 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) //
-//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_META_POLICY_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_META_POLICY_HPP_ER_2009
-
-namespace boost{
-namespace statistics{
-namespace detail{
-namespace distribution_toolkit{
-namespace meta{
-
- //template<typename D>
- //struct policy{
- // typedef typename D::policy_type type;
- //};
-
-}// meta
-}// distribution_toolkit
-}// detail
-}// statistics
-}// boost
-
-
-#endif
\ No newline at end of file
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/signature.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/signature.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/signature.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -8,7 +8,7 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_META_SIGNATURE_HPP_ER_2009
#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_META_SIGNATURE_HPP_ER_2009
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
namespace boost{
namespace statistics{
@@ -19,7 +19,7 @@
// Signature for f(dist,x), f = pdf, cdf etc.
template<typename D>
struct signature{
- typedef typename value<D>::type value_type;
+ typedef typename distribution::common::meta::value<D>::type value_type;
typedef value_type type(
const D&,
Deleted: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/value.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/value.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
+++ (empty file)
@@ -1,32 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// distribution_toolkit::meta::value.hpp //
-// //
-// (C) Copyright 2009 Erwann Rogard //
-// Use, modification and distribution are subject to 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) //
-//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_META_VALUE_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_META_VALUE_HPP_ER_2009
-
-namespace boost{
-namespace statistics{
-namespace detail{
-namespace distribution_toolkit{
-namespace meta{
-
-// // Type of y and x in y = f(dist,x)
-// template<typename D>
-// struct value{
-// typedef typename D::value_type type;
-// };
-
-}// meta
-}// distribution_toolkit
-}// detail
-}// statistics
-}// boost
-
-
-#endif
-
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/random/generator.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/random/generator.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/random/generator.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -6,8 +6,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_RANDOM_GENERATOR_HPP_ER_2009
-#define BOOST_DISTRIBUTION_TOOLKIT_DISTRIBUTIONS_RANDOM_GENERATOR_HPP_ER_2009
+#ifndef BOOST_COMMON_DISTRIBUTION_RANDOM_GENERATOR_HPP_ER_2009
+#define BOOST_COMMON_DISTRIBUTION_RANDOM_GENERATOR_HPP_ER_2009
#include <boost/random/variate_generator.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_scalar_distribution.hpp>
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/unscope/derivative_log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/unscope/derivative_log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/unscope/derivative_log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -10,21 +10,22 @@
#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_UNSCOPE_DERIVATIVE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
#include <boost/utility/enable_if.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_pseudo_scalar_distribution.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
-namespace boost{
+//namespace boost{
+//namespace statistics{
+///namespace detail{
- template<typename D,typename T>
- typename boost::lazy_enable_if<
- statistics::detail::distribution_toolkit::meta
- ::is_pseudo_scalar_distribution<D>,
- statistics::detail::distribution_toolkit::meta::value<D>
- >::type
- derivative_log_unnormalized_pdf(const D& d,const T& x){
- return statistics::detail::distribution_toolkit
- ::derivative_log_unnormalized_pdf(d,x);
- }
+ //template<typename D,typename T>
+ //typename boost::lazy_enable_if<
+ // distribution_toolkit::meta::is_pseudo_scalar_distribution<D>,
+ // distribution::common::meta::value<D>
+ //>::type
+ //derivative_log_unnormalized_pdf(const D& d,const T& x){
+ // return statistics::detail::distribution_toolkit
+ // ::derivative_log_unnormalized_pdf(d,x);
+ //}
-}// boost
+//}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/unscope/log_unnormalized_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/unscope/log_unnormalized_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/unscope/log_unnormalized_pdf.hpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -10,21 +10,21 @@
#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_UNSCOPE_LOG_UNNORMALIZED_PDF_HPP_ER_2009
#include <boost/utility/enable_if.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_pseudo_scalar_distribution.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/value.hpp>
+#include <boost/statistics/detail/distribution_common/meta/value.hpp>
-namespace boost{
+//namespace boost{
- template<typename D,typename T>
- typename boost::lazy_enable_if<
- boost::statistics::detail::distribution_toolkit::meta
- ::is_pseudo_scalar_distribution<D>,
- boost::statistics::detail::distribution_toolkit::meta::value<D>
- >::type
- log_unnormalized_pdf(const D& d,const T& x){
- return boost::statistics::detail::distribution_toolkit
- ::log_unnormalized_pdf(d,x);
- }
+// template<typename D,typename T>
+// typename boost::lazy_enable_if<
+// boost::statistics::detail::distribution_toolkit::meta
+// ::is_pseudo_scalar_distribution<D>,
+// boost::distribution::common::meta::value<D>
+// >::type
+// log_unnormalized_pdf(const D& d,const T& x){
+// return boost::statistics::detail::distribution_toolkit
+// ::log_unnormalized_pdf(d,x);
+// }
-}// boost
+//}// boost
#endif
Modified: sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/doc/readme.txt
==============================================================================
--- sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/doc/readme.txt (original)
+++ sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/doc/readme.txt 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -94,6 +94,8 @@
[ History ]
+Oct 2 Transfered parts of /meta and /concept to newly created library
+ /distribution_common. Concept checks in libs/.../test
Sep 23 2009 : Merged
sandbox/statistics/scalar_dist
sandbox/statistics/standard_distribution
Modified: sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/example/distribution_function.cpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/example/distribution_function.cpp (original)
+++ sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/example/distribution_function.cpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -22,18 +22,19 @@
#include <boost/random/normal_distribution.hpp>
#include <boost/random/variate_generator.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/include.hpp>
-#include <boost/statistics/detail/distribution_toolkit/distributions/students_t/include.hpp>
-#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/include.hpp>
-#include <boost/statistics/detail/distribution_toolkit/map_pdf/include.hpp>
-#include <boost/statistics/detail/distribution_toolkit/distributions/wrapper/include.hpp>
-#include <boost/statistics/detail/distribution_toolkit/iterator/include.hpp>
-#include <boost/statistics/detail/distribution_toolkit/fun_wrap/include.hpp>
-#include <boost/statistics/detail/distribution_toolkit/unscope/include.hpp>
+//#include <boost/statistics/detail/distribution_toolkit/meta/include.hpp>
+//#include <boost/statistics/detail/distribution_toolkit/distributions/students_t/include.hpp>
+//#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/include.hpp>
+//#include <boost/statistics/detail/distribution_toolkit/map_pdf/include.hpp>
+//#include <boost/statistics/detail/distribution_toolkit/distributions/wrapper/include.hpp>
+//#include <boost/statistics/detail/distribution_toolkit/iterator/include.hpp>
+//#include <boost/statistics/detail/distribution_toolkit/fun_wrap/include.hpp>
+//#include <boost/statistics/detail/distribution_toolkit/unscope/include.hpp>
#include <libs/statistics/detail/distribution_toolkit/example/distribution_function.h>
void example_distribution_function(std::ostream& out){
+/*
out << "-> example_math_location_scale" << std::endl;
// Examples of location_scale + fun_wrap + map_pdf + iterator
@@ -41,6 +42,7 @@
using namespace boost;
using namespace math;
using namespace statistics::detail;
+ namespace st = statistics::detail;
namespace tk = distribution_toolkit;
namespace tk_it = tk::iterator;
@@ -84,7 +86,7 @@
BOOST_ASSERT(
float_::equal(
deleg(ls_stud,x),
- tk::log_unnormalized_pdf(ls_stud,x)
+ st::log_unnormalized_pdf(ls_stud,x)
)
);
}
@@ -122,15 +124,15 @@
BOOST_ASSERT(
float_::equal(
- tk::log_unnormalized_pdf(prod_dist,x),
- tk::log_unnormalized_pdf(prod_dist2,x)
+ st::log_unnormalized_pdf(prod_dist,x),
+ st::log_unnormalized_pdf(prod_dist2,x)
)
);
BOOST_ASSERT(
float_::equal(
- tk::log_unnormalized_pdf(prod_dist.first(),x)
- + tk::log_unnormalized_pdf(prod_dist.second(),x),
- tk::log_unnormalized_pdf(prod_dist,x)
+ st::log_unnormalized_pdf(prod_dist.first(),x)
+ + st::log_unnormalized_pdf(prod_dist.second(),x),
+ st::log_unnormalized_pdf(prod_dist,x)
)
);
@@ -141,8 +143,8 @@
BOOST_ASSERT(
float_::equal(
- -tk::log_unnormalized_pdf(inv_dist.distribution(),x),
- tk::log_unnormalized_pdf(inv_dist,x)
+ -log_unnormalized_pdf(inv_dist.distribution(),x),
+ log_unnormalized_pdf(inv_dist,x)
)
);
@@ -156,11 +158,12 @@
BOOST_ASSERT(
float_::equal(
// + sign because inherits from inverse
- tk::log_unnormalized_pdf(ratio_dist.first(),x)
- + tk::log_unnormalized_pdf(ratio_dist.second(),x),
- tk::log_unnormalized_pdf(ratio_dist,x)
+ log_unnormalized_pdf(ratio_dist.first(),x)
+ + log_unnormalized_pdf(ratio_dist.second(),x),
+ log_unnormalized_pdf(ratio_dist,x)
)
);
}
out << "<-" << std::endl;
+*/
}
Modified: sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/example/random.cpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/example/random.cpp (original)
+++ sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/example/random.cpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -17,7 +17,11 @@
#include <boost/statistics/detail/distribution_toolkit/distributions/gamma/include.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/normal/include.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/students_t/include.hpp>
+
+// fwd_math must precede location_scale<Z> if Z is from boost::math
+#include <boost/statistics/detail/distribution_toolkit/fwd_math/include.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/include.hpp>
+#include <boost/statistics/detail/distribution_toolkit/distributions/wrapper/include.hpp>
#include <boost/statistics/detail/distribution_toolkit/random/include.hpp>
#include <boost/statistics/detail/distribution_toolkit/data/include.hpp>
@@ -35,7 +39,7 @@
// the sample agrees wit the cdf of dist
using namespace boost;
- using namespace statistics;
+ using namespace boost::statistics;
namespace tk = statistics::detail::distribution_toolkit;
// Types
@@ -163,7 +167,25 @@
n_draws *= n2;
}
}
+ {
+ typedef math::students_t_distribution<val_> d0_;
+ typedef tk::wrapper<d0_> dist_;
+ const val_ df = 4.0;
+ d0_ d0( df );
+ dist_ dist(d0);
+
+ os << dist << std::endl;
+ unsigned i = 0;
+ unsigned n_draws = n1;
+ sc.clear();
+ while(i<n_loops){
+ sc.reserve(sc.size()+n_draws);
+ generate2_n(sc,n_draws,urng,dist);
+ os << sc << std::endl;
+ ++i;
+ n_draws *= n2;
+ }
+ }
os << "<-" << std::endl;
-
}
Modified: sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/src/main.cpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/src/main.cpp (original)
+++ sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/src/main.cpp 2009-10-02 13:59:14 EDT (Fri, 02 Oct 2009)
@@ -7,17 +7,17 @@
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
#include <iostream>
-#include <libs/statistics/detail/distribution_toolkit/example/distribution_function.h>
-#include <libs/statistics/detail/distribution_toolkit/example/random.h>
-#include <libs/statistics/detail/distribution_toolkit/test/unnormalized_functions.cpp>
+#include <libs/statistics/detail/distribution_toolkit/test/functions.cpp>
#include <libs/statistics/detail/distribution_toolkit/test/function_ptrs.cpp>
+//#include <libs/statistics/detail/distribution_toolkit/example/distribution_function.h>
+//#include <libs/statistics/detail/distribution_toolkit/example/random.h>
int main(){
- example_distribution_function(std::cout);
- example_random(std::cout);
- test_unnormalized_functions<double>();
- test_function_ptrs<double>();
+ //example_distribution_function(std::cout);
+ //example_random(std::cout);
+ test_functions<double>(std::cout);
+ test_function_ptrs<double>(std::cout);
return 0;
}
\ No newline at end of file