|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r58163 - in sandbox/statistics/distribution_toolkit: boost/statistics/detail/distribution_toolkit/concept/aggregate boost/statistics/detail/distribution_toolkit/concept/unary 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/iterator boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf boost/statistics/detail/distribution_toolkit/map_pdf/ratio_pdf boost/statistics/detail/distribution_toolkit/meta boost/statistics/detail/distribution_toolkit/random boost/statistics/detail/distribution_toolkit/test boost/statistics/detail/distribution_toolkit/unscope libs/statistics/detail/distribution_toolkit/doc libs/statistics/detail/distribution_toolkit/example libs/statistics/detail/distribution_toolkit/src libs/statistics/detail/distribution_toolkit/test
From: erwann.rogard_at_[hidden]
Date: 2009-12-05 20:06:02
Author: e_r
Date: 2009-12-05 20:05:54 EST (Sat, 05 Dec 2009)
New Revision: 58163
URL: http://svn.boost.org/trac/boost/changeset/58163
Log:
m
Text files modified:
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/concept/aggregate/function_ptrs.hpp | 13
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/concept/unary/function_ptr.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 | 12 -
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/include.hpp | 1
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/is_math_distribution.hpp | 2
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/log_unnormalized_pdf.hpp | 9
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/chi_squared/random.hpp | 12
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/derivative_log_unnormalized_pdf.hpp | 6
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/description.hpp | 11 -
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/include.hpp | 1
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/log_unnormalized_pdf.hpp | 6
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/exponential/random.hpp | 10
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/derivative_log_unnormalized_pdf.hpp | 7
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/description.hpp | 11 -
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/include.hpp | 1
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/gamma/is_log_concave.hpp | 7
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 | 10
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/cdf.hpp | 16 -
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/derivative_log_unnormalized_pdf.hpp | 10
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/include.hpp | 1
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/location_scale.hpp | 4
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/log_unnormalized_pdf.hpp | 6
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/mean.hpp | 12
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/pdf.hpp | 6
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/quantile.hpp | 11
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/random.hpp | 19 -
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/location_scale/variance.hpp | 14
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 | 12 -
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/normal/include.hpp | 1
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 | 10
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 | 12 -
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/students_t/include.hpp | 1
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 | 10
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/derivative_log_unnormalized_pdf.hpp | 6
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/description.hpp | 12 -
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 | 1
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/uniform/log_unnormalized_pdf.hpp | 9
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/cdf.hpp | 7
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/derivative_log_unnormalized_pdf.hpp | 4
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/description.hpp | 4
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/is_pseudo_scalar_distribution.hpp | 4
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/is_scalar_distribution.hpp | 4
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/log_unnormalized_pdf.hpp | 4
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/mean.hpp | 4
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/normalizing_constant.hpp | 4
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/pdf.hpp | 4
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/quantile.hpp | 4
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/random.hpp | 6
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/variance.hpp | 4
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/distributions/wrapper/wrapper.hpp | 8
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/cdf.hpp | 6
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/log_unnormalized_pdf.hpp | 6
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/pdf.hpp | 6
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fun_wrap/quantile.hpp | 8
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/cdf.hpp | 11 +
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/fwd_math/pdf.hpp | 34 ++-
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/iterator/distribution_function.hpp | 4
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/iterator/include.hpp | 3
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/include.hpp | 2
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/inverse_pdf.hpp | 11
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/log_unnormalized_pdf.hpp | 18 -
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/include.hpp | 2
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/log_unnormalized_pdf.hpp | 17 -
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/product_pdf.hpp | 5
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/ratio_pdf/ratio_pdf.hpp | 4
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/bind_delegate.hpp | 2
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/delegate.hpp | 2
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/pointer.hpp | 2
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/random.hpp | 38 +--
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/signature.hpp | 2
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/random/generator.hpp | 6
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/random/include.hpp | 4
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/test/random.hpp | 117 +++++-------
sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/unscope/os.hpp | 25 +-
sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/doc/readme.txt | 6
sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/example/distribution_function.cpp | 94 ++--------
sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/example/random.cpp | 58 +++---
sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/src/main.cpp | 8
sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/test/function_ptrs.cpp | 4
sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/test/functions.cpp | 359 ++++++++++++++++++++++-----------------
88 files changed, 600 insertions(+), 667 deletions(-)
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/concept/aggregate/function_ptrs.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/concept/aggregate/function_ptrs.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/concept/aggregate/function_ptrs.hpp 2009-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
//////////////////////////////////////////////////////////////////////////////////
// distribution::toolkit::distributions::aggregate::function_ptrs.hpp //
// //
@@ -23,11 +24,12 @@
namespace concept{
template<typename D>
- class FunctionPtrs :
- FunctionPtr<D,fun_wrap::cdf_>,
- FunctionPtr<D,fun_wrap::pdf_>,
- FunctionPtr<D,fun_wrap::log_unnormalized_pdf_>,
- FunctionPtr<D,fun_wrap::quantile_>
+ class FunctionPtrs
+// :
+// FunctionPtr<D,fun_wrap::cdf_>,
+// FunctionPtr<D,fun_wrap::pdf_>,
+// FunctionPtr<D,fun_wrap::log_unnormalized_pdf_>,
+// FunctionPtr<D,fun_wrap::quantile_>
{
};
@@ -40,3 +42,4 @@
}// boost
#endif
+*/
\ No newline at end of file
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/concept/unary/function_ptr.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/concept/unary/function_ptr.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/concept/unary/function_ptr.hpp 2009-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
//////////////////////////////////////////////////////////////////////////////////
// distribution::toolkit::distributions::concept::unary::function_ptr.hpp //
// //
@@ -41,4 +42,5 @@
}// detail
}// boost
-#endif
\ No newline at end of file
+#endif
+*/
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -14,8 +14,7 @@
#include <boost/math/policies/policy.hpp>
namespace boost{
-namespace statistics{
-namespace detail{
+namespace math{
template<typename T,typename P>
T
@@ -49,8 +48,7 @@
return (degrees_of_freedom/two-one) / x - one/two;
}
-}// detail
-}// statistics
+}// math
}// boost
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -13,11 +13,7 @@
#include <boost/math/distributions/chi_squared.hpp>
namespace boost{
-namespace statistics{
-namespace detail{
-namespace distribution{
-namespace toolkit{
-
+namespace math{
template<typename T,typename P>
std::string
@@ -28,11 +24,7 @@
return f.str();
}
-}// distribution
-}// toolkit
-
-}// detail
-}// statistics
+}// math
}// boost
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -16,5 +16,6 @@
#include <boost/statistics/detail/distribution_toolkit/distributions/chi_squared/is_math_distribution.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/chi_squared/log_unnormalized_pdf.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/chi_squared/random.hpp>
+#include <boost/statistics/detail/distribution_toolkit/distributions/chi_squared/os.hpp>
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -17,7 +17,6 @@
namespace detail{
namespace distribution{
namespace toolkit{
-
namespace meta{
template<typename T,typename P>
@@ -27,7 +26,6 @@
}// meta
}// distribution
}// toolkit
-
}// detail
}// statistics
}// boost
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -14,12 +14,10 @@
#include <boost/math/policies/policy.hpp>
namespace boost{
-namespace statistics{
-namespace detail{
+namespace math{
template<typename T,typename P>
- T
- log_unnormalized_pdf(
+ T log_unnormalized_pdf(
const boost::math::chi_squared_distribution<T,P>& dist,
const T& x
){
@@ -49,8 +47,7 @@
return (degrees_of_freedom/two-one) * log(x) - x/two;
}
-}// detail
-}// statistics
+}// math
}// boost
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////////
-// distribution::toolkit::distributions::chi_squared::random.hpp //
+// distribution::toolkit::distributions::chi_squared::random.hpp //
// //
// (C) Copyright 2009 Erwann Rogard //
// Use, modification and distribution are subject to the //
@@ -10,32 +10,28 @@
#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>
+#include <boost/statistics/detail/distribution_common/meta/random/distribution.hpp>
namespace boost{
namespace statistics{
namespace detail{
namespace distribution{
-namespace toolkit{
-
namespace meta{
template<typename T,typename P>
- struct random<
+ struct random_distribution<
boost::math::chi_squared_distribution<T,P>
>{
typedef boost::math::chi_squared_distribution<T> dist_;
typedef boost::random::chi_squared_distribution<T> type;
- static type make(const dist_& d){
+ static type call(const dist_& d){
return type(d.degrees_of_freedom());
}
};
}// meta
}// distribution
-}// toolkit
-
}// detail
}// statistics
}// boost
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -13,8 +13,7 @@
#include <boost/math/policies/policy.hpp>
namespace boost{
-namespace statistics{
-namespace detail{
+namespace math{
template<typename T,typename P>
T
@@ -42,8 +41,7 @@
return result;
}
-}// detail
-}// statistics
+}// math
}// boost
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -13,11 +13,7 @@
#include <boost/math/distributions/exponential.hpp>
namespace boost{
-namespace statistics{
-namespace detail{
-namespace distribution{
-namespace toolkit{
-
+namespace math{
template<typename T,typename P>
std::string
@@ -29,10 +25,7 @@
return f.str();
}
-}// distribution
-}// toolkit
-}// detail
-}// statistics
+}// math
}// boost
#endif
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -16,5 +16,6 @@
#include <boost/statistics/detail/distribution_toolkit/distributions/exponential/is_math_distribution.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/exponential/log_unnormalized_pdf.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/exponential/random.hpp>
+#include <boost/statistics/detail/distribution_toolkit/distributions/exponential/os.hpp>
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -13,8 +13,7 @@
#include <boost/math/policies/policy.hpp>
namespace boost{
-namespace statistics{
-namespace detail{
+namespace math{
template<typename T,typename P>
T
@@ -42,8 +41,7 @@
return result;
}
-}// detail
-}// statistics
+}// math
}// boost
#endif
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -10,30 +10,26 @@
#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>
+#include <boost/statistics/detail/distribution_common/meta/random/distribution.hpp>
namespace boost{
namespace statistics{
namespace detail{
namespace distribution{
-namespace toolkit{
-
namespace meta{
template<typename T,typename P>
- struct random<
+ struct random_distribution<
boost::math::exponential_distribution<T,P>
>{
typedef boost::math::exponential_distribution<T,P> dist_;
typedef boost::exponential_distribution<T> type;
- static type make(const dist_& d){ return type(d.lambda()); }
+ static type call(const dist_& d){ return type(d.lambda()); }
};
}// meta
}// distribution
-}// toolkit
-
}// detail
}// statistics
}// boost
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -13,8 +13,7 @@
#include <boost/math/policies/policy.hpp>
namespace boost{
-namespace statistics{
-namespace detail{
+namespace math{
template <class T, class P>
inline T derivative_log_unnormalized_pdf(
@@ -46,8 +45,8 @@
return result;
} // derivative_log_unnormalized_pdf
-}// detail
-}// statistics
+
+}// math
}// boost
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -13,10 +13,7 @@
#include <boost/math/distributions/gamma.hpp>
namespace boost{
-namespace statistics{
-namespace detail{
-namespace distribution{
-namespace toolkit{
+namespace math{
template<typename T,typename P>
@@ -28,11 +25,7 @@
return f.str();
}
-}// distribution
-}// toolkit
-
-}// detail
-}// statistics
+}// math
}// boost
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -17,5 +17,6 @@
#include <boost/statistics/detail/distribution_toolkit/distributions/gamma/is_math_distribution.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/gamma/log_unnormalized_pdf.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/gamma/random.hpp>
+#include <boost/statistics/detail/distribution_toolkit/distributions/gamma/os.hpp>
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -13,8 +13,7 @@
#include <boost/math/policies/policy.hpp>
namespace boost{
-namespace statistics{
-namespace detail{
+namespace math{
template <class T, class P>
inline bool is_log_concave(
@@ -23,9 +22,7 @@
return ( dist.shape() > static_cast<T>(1) );
}
-
-}// detail
-}// statistics
+}// math
}// boost
#endif
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -13,8 +13,7 @@
#include <boost/math/policies/policy.hpp>
namespace boost{
-namespace statistics{
-namespace detail{
+namespace math{
template <class T, class P>
inline T log_unnormalized_pdf(
@@ -46,8 +45,7 @@
return result;
} // log_unnormalized_pdf
-}// detail
-}// statistics
+}// math
}// boost
#endif
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -11,25 +11,23 @@
#include <boost/math/distributions/gamma.hpp>
#include <boost/random/gamma_distribution.hpp>
#include <boost/random/location_scale.hpp>
-#include <boost/statistics/detail/distribution_toolkit/meta/random.hpp>
+#include <boost/statistics/detail/distribution_common/meta/random/distribution.hpp>
namespace boost{
namespace statistics{
namespace detail{
namespace distribution{
-namespace toolkit{
-
namespace meta{
template<typename T,typename P>
- struct random<
+ struct random_distribution<
boost::math::gamma_distribution<T,P>
>{
typedef boost::math::gamma_distribution<T,P> dist_;
typedef boost::gamma_distribution<T> z_;
typedef boost::random::location_scale_distribution<z_> type;
- static type make(const dist_& d){
+ static type call(const dist_& d){
return type(
0,
d.scale(),
@@ -40,8 +38,6 @@
}// meta
}// distribution
-}// toolkit
-
}// detail
}// statistics
}// boost
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -15,21 +15,19 @@
namespace boost{
namespace statistics{
namespace detail{
+namespace distribution{
+namespace toolkit{
template<typename Z,typename T>
T
- cdf(
- const distribution::toolkit::location_scale_distribution<Z>& d,
- const T& x
- ){
- typedef distribution::toolkit::location_scale_distribution<Z> dist_;
+ cdf(const location_scale_distribution<Z>& d,const T& x){
+ typedef location_scale_distribution<Z> dist_;
T z = (x-d.mu())/d.sigma();
- return statistics::detail::cdf(
- d.z(),
- z
- );
+ return cdf(d.z(),z);
}
+}// toolkit
+}// distribution
}// 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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -15,21 +15,25 @@
namespace boost{
namespace statistics{
namespace detail{
+namespace distribution{
+namespace toolkit{
template<typename Z,typename T>
T
derivative_log_unnormalized_pdf(
- const distribution::toolkit::location_scale_distribution<Z>& d,
+ const location_scale_distribution<Z>& d,
const T& x
){
- typedef distribution::toolkit::location_scale_distribution<Z> dist_;
+ typedef location_scale_distribution<Z> dist_;
T z = (x-d.mu())/d.sigma();
- T result = statistics::detail::derivative_log_unnormalized_pdf(d.z(),z);
+ T result = derivative_log_unnormalized_pdf(d.z(),z);
result /= d.sigma(); // = dz/dx
return result;
}
+}// toolkit
+}// distribution
}// detail
}// statistics
}// boost
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -20,5 +20,6 @@
#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/random.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/quantile.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/variance.hpp>
+#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/os.hpp>
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -49,11 +49,11 @@
BOOST_MPL_ASSERT(( meta::is_scalar_distribution<Z> ));
- typedef typename distribution::common::meta::value<
+ typedef typename distribution::meta::value<
distribution_type
>::type value_type;
- typedef typename distribution::common::meta::policy<
+ typedef typename distribution::meta::policy<
distribution_type
>::type policy_type;
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -15,6 +15,8 @@
namespace boost{
namespace statistics{
namespace detail{
+namespace distribution{
+namespace toolkit{
template<typename Z,typename T>
T
@@ -25,11 +27,13 @@
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);
+ T result = log_unnormalized_pdf(d.z(),z);
// -log ( sigma ) is a constant so it is ignored
return result;
}
+}// toolkit
+}// distribution
}// 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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -15,17 +15,19 @@
namespace boost{
namespace statistics{
namespace detail{
+namespace distribution{
+namespace toolkit{
template<typename Z>
- typename distribution::common::meta::value<
- distribution::toolkit::location_scale_distribution<Z>
- >::type
+ typename location_scale_distribution<Z>::value_type
mean(
- const distribution::toolkit::location_scale_distribution<Z>& d
+ const location_scale_distribution<Z>& d
){
- return d.mu() + statistics::detail::mean(d.z());
+ return d.mu() + mean(d.z());
}
+}// toolkit
+}// distribution
}// 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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -15,6 +15,8 @@
namespace boost{
namespace statistics{
namespace detail{
+namespace distribution{
+namespace toolkit{
template<typename Z,typename T>
T
@@ -25,11 +27,13 @@
T z = (x-d.mu())/d.sigma();
- T result = statistics::detail::pdf(d.z(),z);
+ T result = pdf(d.z(),z);
result /= d.sigma();
return result;
}
+}// toolkit
+}// distribution
}// 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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -15,20 +15,21 @@
namespace boost{
namespace statistics{
namespace detail{
+namespace distribution{
+namespace toolkit{
template<typename Z,typename T>
T
quantile(
- const distribution::toolkit::location_scale_distribution<Z>& d,
+ const location_scale_distribution<Z>& d,
const T& x
){
T z = (x-d.mu())/d.sigma();
- return statistics::detail::quantile(
- d.z(),
- z
- );
+ return quantile(d.z(),z);
}
+}// toolkit
+}// distribution
}// 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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -10,30 +10,27 @@
#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>
+#include <boost/statistics/detail/distribution_common/meta/random/distribution.hpp>
namespace boost{
namespace statistics{
namespace detail{
namespace distribution{
-namespace toolkit{
-
namespace meta{
-
template<typename Z>
- struct random<
- location_scale_distribution<Z>
+ struct random_distribution<
+ toolkit::location_scale_distribution<Z>
>{
- typedef location_scale_distribution<Z> dist_;
- typedef typename meta::random<Z>::type z_;
+ typedef toolkit::location_scale_distribution<Z> dist_;
+ typedef typename meta::random_distribution<Z>::type z_;
typedef boost::random::location_scale_distribution<z_> type;
- static type make(const dist_& d){
+ static type call(const dist_& d){
return type(
d.mu(),
d.sigma(),
- make_random(d.z())
+ make_random_distribution(d.z())
);
}
};
@@ -41,8 +38,6 @@
}// meta
}// distribution
-}// toolkit
-
}// detail
}// statistics
}// boost
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -15,17 +15,17 @@
namespace boost{
namespace statistics{
namespace detail{
+namespace distribution{
+namespace toolkit{
template<typename Z>
- typename distribution::common::meta::value<
- distribution::toolkit::location_scale_distribution<Z>
- >::type
- variance(
- const distribution::toolkit::location_scale_distribution<Z>& d
- ){
- return statistics::detail::variance(d.z()) * d.sigma() * d.sigma();
+ typename location_scale_distribution<Z>::value_type
+ variance(const location_scale_distribution<Z>& d){
+ return variance(d.z()) * d.sigma() * d.sigma();
}
+}// toolkit
+}// distribution
}// 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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -13,8 +13,7 @@
//#include <boost/math/policies/policy.hpp>//TODO
namespace boost{
-namespace statistics{
-namespace detail{
+namespace math{
template<typename T,typename P>
T
@@ -31,8 +30,7 @@
return (- z) * dz;
}
-}// detail
-}// statistics
+}// math
}// boost
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -13,11 +13,7 @@
#include <boost/math/distributions/normal.hpp>
namespace boost{
-namespace statistics{
-namespace detail{
-namespace distribution{
-namespace toolkit{
-
+namespace math{
template<typename T,typename P>
std::string
@@ -28,11 +24,7 @@
return f.str();
}
-}// distribution
-}// toolkit
-
-}// detail
-}// statistics
+}// math
}// boost
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -17,5 +17,6 @@
#include <boost/statistics/detail/distribution_toolkit/distributions/normal/is_math_distribution.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/normal/normalizing_constant.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/normal/random.hpp>
+#include <boost/statistics/detail/distribution_toolkit/distributions/normal/os.hpp>
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -13,8 +13,7 @@
//#include <boost/math/policies/policy.hpp>//TODO
namespace boost{
-namespace statistics{
-namespace detail{
+namespace math{
template<typename T,typename P>
T
@@ -30,8 +29,7 @@
return - z * z / int2real_t::convert(2);
}
-}// detail
-}// statistics
+}// math
}// boost
#endif
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -13,8 +13,7 @@
#include <boost/math/distributions/normal.hpp>
namespace boost{
-namespace statistics{
-namespace detail{
+namespace math{
template<typename T,typename P>
T normalizing_constant(const boost::math::normal_distribution<T,P>& d){
@@ -23,8 +22,7 @@
return sqrt(two * pi) * d.scale();
}
-}// detail
-}// statistics
+}// math
}// boost
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -10,32 +10,28 @@
#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>
+#include <boost/statistics/detail/distribution_common/meta/random/distribution.hpp>
namespace boost{
namespace statistics{
namespace detail{
namespace distribution{
-namespace toolkit{
-
namespace meta{
template<typename T,typename P>
- struct random<
+ struct random_distribution<
boost::math::normal_distribution<T,P>
>{
typedef boost::math::normal_distribution<T,P> dist_;
typedef boost::normal_distribution<T> type;
- static type make(const dist_& d){
+ static type call(const dist_& d){
return type(d.location(),d.scale());
}
};
}// meta
}// distribution
-}// toolkit
-
}// detail
}// statistics
}// boost
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -14,8 +14,7 @@
// #include <boost/math/policies/policy.hpp> // TODO
namespace boost{
-namespace statistics{
-namespace detail{
+namespace math{
template<typename T,typename Policy>
T
@@ -35,8 +34,7 @@
return (- m ) * dlog1p * dy;
}
-}// detail
-}// statistics
+}// math
}// boost
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -13,11 +13,7 @@
#include <boost/math/distributions/students_t.hpp>
namespace boost{
-namespace statistics{
-namespace detail{
-namespace distribution{
-namespace toolkit{
-
+namespace math{
template<typename T,typename P>
std::string
@@ -28,11 +24,7 @@
return f.str();
}
-}// distribution
-}// toolkit
-
-}// detail
-}// statistics
+}// math
}// boost
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -15,5 +15,6 @@
#include <boost/statistics/detail/distribution_toolkit/distributions/students_t/is_math_distribution.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/students_t/log_unnormalized_pdf.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/students_t/random.hpp>
+#include <boost/statistics/detail/distribution_toolkit/distributions/students_t/os.hpp>
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -14,8 +14,7 @@
// #include <boost/math/policies/policy.hpp> // TODO
namespace boost{
-namespace statistics{
-namespace detail{
+namespace math{
template<typename T,typename Policy>
T
@@ -35,8 +34,7 @@
return (- m ) * math::log1p(y);
}
-}// detail
-}// statistics
+}// math
}// boost
#endif
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -10,32 +10,28 @@
#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>
+#include <boost/statistics/detail/distribution_common/meta/random/distribution.hpp>
namespace boost{
namespace statistics{
namespace detail{
namespace distribution{
-namespace toolkit{
-
namespace meta{
template<typename T,typename P>
- struct random<
+ struct random_distribution<
boost::math::students_t_distribution<T,P>
>{
typedef boost::math::students_t_distribution<T,P> dist_;
typedef boost::random::students_t_distribution<T> type;
- static type make(const dist_& d){
+ static type call(const dist_& d){
return type(d.degrees_of_freedom());
}
};
}// meta
}// distribution
-}// toolkit
-
}// detail
}// statistics
}// boost
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -15,8 +15,7 @@
#include <boost/math/tools/precision.hpp>
namespace boost{
-namespace statistics{
-namespace detail{
+namespace math{
template<typename T,typename P>
T
@@ -52,8 +51,7 @@
}
}
-}// detail
-}// statistics
+}// math
}// boost
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -13,11 +13,7 @@
#include <boost/math/distributions/uniform.hpp>
namespace boost{
-namespace statistics{
-namespace detail{
-namespace distribution{
-namespace toolkit{
-
+namespace math{
template<typename T,typename P>
std::string
@@ -28,11 +24,7 @@
return (f.str());
}
-}// distribution
-}// toolkit
-
-}// detail
-}// statistics
+}// math
}// boost
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -10,8 +10,10 @@
#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/derivative_log_unnormalized_pdf.hpp>
+#include <boost/statistics/detail/distribution_toolkit/distributions/uniform/description.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/uniform/is_math_distribution.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/uniform/log_unnormalized_pdf.hpp>
-#include <boost/statistics/detail/distribution_toolkit/distributions/uniform/derivative_log_unnormalized_pdf.hpp>
+#include <boost/statistics/detail/distribution_toolkit/distributions/uniform/os.hpp>
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -17,7 +17,6 @@
namespace detail{
namespace distribution{
namespace toolkit{
-
namespace meta{
template<typename T,typename P>
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -15,12 +15,10 @@
#include <boost/math/tools/precision.hpp>
namespace boost{
-namespace statistics{
-namespace detail{
+namespace math{
template<typename T,typename P>
- T
- log_unnormalized_pdf(
+ T log_unnormalized_pdf(
const boost::math::uniform_distribution<T,P>& dist,
const T& x
)
@@ -52,8 +50,7 @@
}
}
-}// detail
-}// statistics
+}// math
}// boost
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
/////////////////////////////////////////////////////////////////////////////////
// distribution::toolkit::distributions::wrapper::cdf.hpp //
// //
@@ -17,8 +18,7 @@
namespace detail{
template<typename D,typename T>
- T
- cdf(
+ T cdf(
const distribution::toolkit::wrapper<D>& w,
const T& x
){
@@ -29,4 +29,5 @@
}// statistics
}// boost
-#endif
\ No newline at end of file
+#endif
+*/
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
///////////////////////////////////////////////////////////////////////////////////////
// distribution::toolkit::distributions::wrapper::derivative_log_unnormalized_pdf.hpp //
// //
@@ -32,4 +33,5 @@
}// statistics
}// boost
-#endif
\ No newline at end of file
+#endif
+*/
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
//////////////////////////////////////////////////////////////////////////////////////
// distribution::toolkit::distributions::wrapper::description.hpp //
// //
@@ -36,4 +37,5 @@
}// boost
-#endif
\ No newline at end of file
+#endif
+*/
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
/////////////////////////////////////////////////////////////////////////////////
// distribution::toolkit::distributions::wrapper::is_pseudo_scalar_distribution.hpp //
// //
@@ -32,4 +33,5 @@
}// statistics
}// boost
-#endif
\ No newline at end of file
+#endif
+*/
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
/////////////////////////////////////////////////////////////////////////////////
// distribution::toolkit::distributions::wrapper::is_scalar_distribution.hpp //
// //
@@ -32,4 +33,5 @@
}// statistics
}// boost
-#endif
\ No newline at end of file
+#endif
+*/
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
/////////////////////////////////////////////////////////////////////////////////
// distribution::toolkit::distributions::wrapper::log_unnormalized_pdf.hpp //
// //
@@ -29,4 +30,5 @@
}// statistics
}// boost
-#endif
\ No newline at end of file
+#endif
+*/
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
/////////////////////////////////////////////////////////////////////////////////
// distribution::toolkit::distributions::wrapper::mean.hpp //
// //
@@ -30,4 +31,5 @@
}// statistics
}// boost
-#endif
\ No newline at end of file
+#endif
+*/
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
/////////////////////////////////////////////////////////////////////////////////
// distribution::toolkit::distributions::wrapper::normalizing_constant.hpp //
// //
@@ -30,4 +31,5 @@
}// statistics
}// boost
-#endif
\ No newline at end of file
+#endif
+*/
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
/////////////////////////////////////////////////////////////////////////////////
// distribution::toolkit::distributions::wrapper::pdf.hpp //
// //
@@ -29,4 +30,5 @@
}// statistics
}// boost
-#endif
\ No newline at end of file
+#endif
+*/
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
/////////////////////////////////////////////////////////////////////////////////
// distribution::toolkit::distributions::wrapper::quantile.hpp //
// //
@@ -28,4 +29,5 @@
}// statistics
}// boost
-#endif
\ No newline at end of file
+#endif
+*/
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
/////////////////////////////////////////////////////////////////////////////////
// distribution::toolkit::distributions::wrapper::random.hpp //
// //
@@ -27,7 +28,7 @@
typedef typename w_::distribution_type d_;
typedef typename meta::random<d_>::type type;
- static type make(const w_& d){
+ static type call(const w_& d){
return type(
make_random(d.const_reference())
);
@@ -42,4 +43,5 @@
}// statistics
}// boost
-#endif
\ No newline at end of file
+#endif
+*/
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
/////////////////////////////////////////////////////////////////////////////////
// distribution::toolkit::distributions::wrapper::variance.hpp //
// //
@@ -30,4 +31,5 @@
}// statistics
}// boost
-#endif
\ No newline at end of file
+#endif
+*/
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -6,6 +6,7 @@
// 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_WRAPPER_WRAPPER_HPP_ER_2009
#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_WRAPPER_WRAPPER_HPP_ER_2009
#include <boost/call_traits.hpp>
@@ -23,12 +24,11 @@
namespace distribution{
namespace toolkit{
+ // TODO deprecated
// Useful for serializing or as a reference wrapper (D = const E&)
- //
- // BUG : See function_ptrs.cpp
template<typename D>
- class wrapper : distribution::common::meta::inherit_policy<
+ class wrapper : distribution::meta::inherit_policy<
typename remove_cv<
typename remove_reference<D>::type
>::type
@@ -80,5 +80,5 @@
}// boost
#endif
-
+*/
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -9,7 +9,7 @@
#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_FUN_WRAP_CDF_HPP_ER_2009
#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_FUN_WRAP_CDF_HPP_ER_2009
#include <boost/statistics/detail/distribution_toolkit/fun_wrap/detail/impl.hpp>
-#include <boost/statistics/detail/distribution_toolkit/fwd_math/cdf.hpp>
+//#include <boost/statistics/detail/distribution_toolkit/fwd_math/cdf.hpp>
namespace boost{
namespace statistics{
@@ -18,8 +18,8 @@
namespace toolkit{
namespace fun_wrap{
- template<typename D> struct cdf_
- : impl<D,statistics::detail::cdf>{};
+ //template<typename D> struct cdf_
+ // : impl<D,boost::statistics::detail::cdf>{};
}// fun_wrap
}// toolkit
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -17,9 +17,9 @@
namespace toolkit{
namespace fun_wrap{
- template<typename D>
- struct log_unnormalized_pdf_
- : impl<D,statistics::detail::log_unnormalized_pdf>{};
+// template<typename D>
+// struct log_unnormalized_pdf_
+// : impl<D,statistics::detail::log_unnormalized_pdf>{};
}// fun_wrap
}// distribution
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -9,7 +9,7 @@
#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_FUN_WRAP_PDF_HPP_ER_2009
#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_FUN_WRAP_PDF_HPP_ER_2009
#include <boost/statistics/detail/distribution_toolkit/fun_wrap/detail/impl.hpp>
-#include <boost/statistics/detail/distribution_toolkit/fwd_math/pdf.hpp>
+//#include <boost/statistics/detail/distribution_toolkit/fwd_math/pdf.hpp>
namespace boost{
namespace statistics{
@@ -18,8 +18,8 @@
namespace toolkit{
namespace fun_wrap{
- template<typename D> struct pdf_
- : impl<D,statistics::detail::pdf>{};
+// template<typename D> struct pdf_
+// : impl<D,statistics::detail::pdf>{};
}// fun_wrap
}// distribution
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -9,7 +9,7 @@
#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_FUN_WRAP_QUANTILE_HPP_ER_2009
#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_FUN_WRAP_QUANTILE_HPP_ER_2009
#include <boost/statistics/detail/distribution_toolkit/fun_wrap/detail/impl.hpp>
-#include <boost/statistics/detail/distribution_toolkit/fwd_math/quantile.hpp>
+//#include <boost/statistics/detail/distribution_toolkit/fwd_math/quantile.hpp>
namespace boost{
namespace statistics{
@@ -18,9 +18,9 @@
namespace toolkit{
namespace fun_wrap{
- template<typename D>
- struct quantile_
- : impl<D,statistics::detail::quantile>{};
+// template<typename D>
+// struct quantile_
+// : impl<D,statistics::detail::quantile>{};
}// fun_wrap
}// distribution
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -13,6 +13,17 @@
#include <boost/statistics/detail/distribution_common/meta/value.hpp>
namespace boost{
+namespace math{
+ template<typename D>
+ typename boost::lazy_enable_if<
+ boost::statistics::detail::distribution::toolkit::meta::is_math_distribution<D>,
+ boost::statistics::detail::distribution::common::meta::value<D>
+ >::type
+ cdf(
+ const D& dist,
+ const typename boost::statistics::detail::distribution::common::meta::value<D>::type& x
+ );
+}
namespace statistics{
namespace detail{
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -9,32 +9,36 @@
#ifndef BOOST_DISTRIBUTION_TOOLKIT_FWD_MATH_PDF_HPP_ER_2009
#define BOOST_DISTRIBUTION_TOOLKIT_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_common/meta/value.hpp>
+//#include <boost/statistics/detail/distribution_toolkit/meta/is_math_distribution.hpp>
+//#include <boost/statistics/detail/distribution_common/meta/value.hpp>
namespace boost{
namespace statistics{
namespace detail{
+namespace distribution{
+namespace toolkit{
- template<typename D>
- typename lazy_enable_if<
- distribution::toolkit::meta::is_math_distribution<D>,
- distribution::common::meta::value<D>
- >::type
- pdf(
- const D& dist,
- const typename distribution::common::meta::value<D>::type& x
- )
- {
- return boost::math::pdf(dist,x);
- }
+// template<typename D>
+// typename lazy_enable_if<
+// distribution::toolkit::meta::is_math_distribution<D>,
+// distribution::common::meta::value<D>
+// >::type
+// pdf(
+// const D& dist,
+// const typename distribution::common::meta::value<D>::type& x
+// )
+// {
+// return boost::math::pdf(dist,x);
+// }
+ using math::pdf;
+}// toolkit
+}// distribution
}// detail
}// statistics
}// boost
-
#endif
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/iterator/distribution_function.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/iterator/distribution_function.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/iterator/distribution_function.hpp 2009-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
//////////////////////////////////////////////////////////////////////////////
// distribution::toolkit::iterator::distribution_function.hpp //
// //
@@ -30,7 +31,7 @@
typedef boost::transform_iterator<unary_,ItX> type;
template<template<typename> class F>
- static type make(
+ static type call(
const D& dist,
ItX i_x
){
@@ -72,3 +73,4 @@
#endif
+*/
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/iterator/include.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/iterator/include.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/iterator/include.hpp 2009-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
//////////////////////////////////////////////////////////////////////////////
// distribution_toolkititerator::distribution_function.hpp //
// //
@@ -12,4 +13,4 @@
#include <boost/statistics/detail/distribution_toolkit/iterator/distribution_function.hpp>
#endif
-
+*/
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/include.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/include.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/include.hpp 2009-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -12,5 +12,7 @@
#include <boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/inverse_pdf.hpp>
#include <boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/is_pseudo_scalar_distribution.hpp>
#include <boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/log_unnormalized_pdf.hpp>
+#include <boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/description.hpp>
+#include <boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/os.hpp>
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 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_common/meta/inherit_policy.hpp>
-#include <boost/statistics/detail/distribution_common/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{
@@ -18,19 +18,18 @@
namespace distribution{
namespace toolkit{
-
// A pseudo distribution resulting from mapping the pdf of a distribution
// to its inverse
template<typename D>
class inverse_pdf : public
- distribution::common::meta::inherit_policy<
+ distribution::meta::inherit_policy<
D,
- distribution::common::meta::inherit_value<D>
+ distribution::meta::inherit_value<D>
>
{
public:
- typedef typename distribution::common::meta::value<D>::type value_type;
+ typedef typename distribution::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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -16,21 +16,17 @@
namespace boost{
namespace statistics{
namespace detail{
+namespace distribution{
+namespace toolkit{
template<typename D,typename T>
- T
- log_unnormalized_pdf(
- const distribution::toolkit::inverse_pdf<D>& dist,
- const T& x
- ){
- return
- ( -statistics::detail::log_unnormalized_pdf(
- dist.distribution(),
- x
- )
- );
+ T log_unnormalized_pdf(const inverse_pdf<D>& dist,const T& x)
+ {
+ return ( -log_unnormalized_pdf(dist.distribution(),x) );
}
+}// toolkit
+}// distribution
}// detail
}// statistics
}// boost
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/include.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/include.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/include.hpp 2009-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -12,5 +12,7 @@
#include <boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/product_pdf.hpp>
#include <boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/is_pseudo_scalar_distribution.hpp>
#include <boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/log_unnormalized_pdf.hpp>
+#include <boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/description.hpp>
+#include <boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/os.hpp>
#endif
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -16,20 +16,19 @@
namespace boost{
namespace statistics{
namespace detail{
+namespace distribution{
+namespace toolkit{
template<typename A,typename B,typename T>
- T
- log_unnormalized_pdf(
- const distribution::toolkit::product_pdf<A,B>& dist,
- const T& x
- ){
-
+ T log_unnormalized_pdf(const product_pdf<A,B>& dist,const T& x)
+ {
return
- (statistics::detail::log_unnormalized_pdf(dist.first(),x)
- + statistics::detail::log_unnormalized_pdf(dist.second(),x));
+ (log_unnormalized_pdf(dist.first(),x)
+ + log_unnormalized_pdf(dist.second(),x));
}
-
+}// toolkit
+}// distribution
}// 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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -18,13 +18,12 @@
namespace distribution{
namespace toolkit{
-
// A pseudo distribution resulting from product of the pdf of two
// distributions
template<typename A,typename B>
- class product_pdf : public distribution::common::meta::inherit_policy<
+ class product_pdf : public distribution::meta::inherit_policy<
A,
- distribution::common::meta::inherit_value<A>
+ distribution::meta::inherit_value<A>
>{
public:
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/ratio_pdf/ratio_pdf.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/ratio_pdf/ratio_pdf.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/map_pdf/ratio_pdf/ratio_pdf.hpp 2009-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -23,7 +23,7 @@
struct meta_ratio_pdf{
typedef inverse_pdf<B> inv_;
typedef product_pdf<A, inv_ > type;
- static type make(const A& a,const B& b){
+ static type call(const A& a,const B& b){
return type(
a,
inv_(b)
@@ -36,7 +36,7 @@
make_ratio_pdf(const A& a, const B& b)
{
typedef meta_ratio_pdf<A,B> meta_;
- return meta_::make(a,b);
+ return meta_::call(a,b);
}
}// distribution
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/bind_delegate.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/bind_delegate.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/bind_delegate.hpp 2009-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -35,7 +35,7 @@
typedef function<sig2_> type;
template<template<typename> class F>
- static type make(const D& dist){
+ static type call(const D& dist){
return type(
boost::lambda::bind(
deleg_::template make<F>(),
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/delegate.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/delegate.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/delegate.hpp 2009-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -25,7 +25,7 @@
typedef boost::function<sig_> type;
template<template<typename> class F> // F in fun_wrap
- static type make(){ return type(F<D>::instance); }
+ static type call(){ return type(F<D>::instance); }
};
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/pointer.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/pointer.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/pointer.hpp 2009-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -24,7 +24,7 @@
typedef sig_* type;
template<template<typename> class F> // F in fun_wrap
- static type make(){ return F<D>::instance; }
+ static type call(){ return F<D>::instance; }
};
}// meta
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/random.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/random.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/meta/random.hpp 2009-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,12 +1,13 @@
+/*
///////////////////////////////////////////////////////////////////////////////
-// distribution::toolkit::meta::random.hpp //
+// distribution::toolkit::meta::random_distribution.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_RANDOM_HPP_ER_2009
-#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_META_RANDOM_HPP_ER_2009
+#ifndef BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_META_RANDOM_DISTRIBUTION_HPP_ER_2009
+#define BOOST_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_META_RANDOM_DISTRIBUTION_HPP_ER_2009
#include <boost/utility/enable_if.hpp>
#include <boost/statistics/detail/distribution_toolkit/meta/is_scalar_distribution.hpp>
@@ -14,37 +15,26 @@
namespace statistics{
namespace detail{
namespace distribution{
-namespace toolkit{
-
namespace meta{
template<typename D>
- struct random{};
+ struct random_distribution{};
// Specialization for each D has to model RandomDistribution
// http://www.boost.org/doc/libs/1_40_0/libs/random/random-concepts.html
- // and provide static type make(const D& )
+ // and provide static type call(const D& )
}// meta
+ template<typename D>
+ typename meta::random_distribution<D>::type
+ make_random_distribution(const D& d){
+ typedef meta::random_distribution<D> meta_;
+ return meta_::call(d);
+ }
}// distribution
-}// toolkit
-
}// detail
}// statistics
-
-
- template<typename D>
- typename lazy_enable_if<
- statistics::detail::distribution::toolkit::meta::
- is_scalar_distribution<D>,
- statistics::detail::distribution::toolkit::meta::random<D>
- >::type
- make_random(const D& d){
- typedef
- statistics::detail::distribution::toolkit::meta::random<D> meta_;
- return meta_::make(d);
- }
-
}// boost
-#endif
\ No newline at end of file
+#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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -21,7 +21,7 @@
// Signature for f(dist,x), f = pdf, cdf etc.
template<typename D>
struct signature{
- typedef typename distribution::common::meta::value<D>::type value_type;
+ typedef typename distribution::meta::value<D>::type value_type;
typedef value_type type(
const D&,
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
//////////////////////////////////////////////////////////////////////////////////
// distribution::toolkit::random::generator.hpp //
// //
@@ -28,7 +29,7 @@
typedef distribution::toolkit::meta::random<D> meta_;
typedef typename meta_::type r_;;
typedef variate_generator<U,r_> type;
- static type make(U urng,const D& d){
+ static type call(U urng,const D& d){
return type(
urng,
make_random(d)
@@ -54,7 +55,7 @@
make_random_generator(U& urng,const D& dist){
typedef statistics::detail::distribution::toolkit::random
::meta::generator<D,U&> meta_;
- return meta_::make(urng,dist);
+ return meta_::call(urng,dist);
}
@@ -62,3 +63,4 @@
#endif
+*/
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/random/include.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/random/include.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/random/include.hpp 2009-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
//////////////////////////////////////////////////////////////////////////////////
// distribution::toolkit::random::include.hpp //
// //
@@ -11,4 +12,5 @@
#include <boost/statistics/detail/distribution_toolkit/random/generator.hpp>
-#endif
\ No newline at end of file
+#endif
+*/
\ No newline at end of file
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/test/random.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/test/random.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/test/random.hpp 2009-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -10,25 +10,18 @@
#include <iterator>
#include <boost/utility/result_of.hpp>
#include <boost/typeof/typeof.hpp>
-#include <ext/algorithm>
#include <boost/range.hpp>
+#include <boost/function.hpp>
#include <boost/static_assert.hpp>
+#include <boost/lambda/lambda.hpp>
+#include <boost/lambda/bind.hpp>
#include <boost/random/mersenne_twister.hpp>
-
-#include <boost/fusion/container/map.hpp>
#include <boost/fusion/include/map.hpp>
-#include <boost/fusion/include/map_fwd.hpp>
-#include <boost/fusion/sequence/intrinsic/at_key.hpp>
#include <boost/fusion/include/at_key.hpp>
-
-#include <boost/statistics/detail/fusion/map/identity_f.hpp>
+#include <boost/statistics/detail/distribution_toolkit/test/detail/x_f.hpp>
#include <boost/statistics/detail/non_parametric/kolmogorov_smirnov/statistic.hpp>
-
-#include <boost/statistics/detail/distribution_toolkit/meta/bind_delegate.hpp>
-#include <boost/statistics/detail/distribution_toolkit/fun_wrap/cdf.hpp>
-
-#include <boost/statistics/detail/distribution_toolkit/random/include.hpp>
-#include <boost/statistics/detail/distribution_toolkit/unscope/os.hpp>
+#include <boost/statistics/detail/distribution_common/functor/cdf.hpp>
+#include <boost/statistics/detail/distribution_common/meta/random/generator.hpp>
namespace boost{
namespace statistics{
@@ -37,9 +30,10 @@
namespace toolkit{
namespace test{
-template<typename D,typename N>
+template<typename D,typename R,typename N>
void random(
const D& dist,
+ R& random_generator,
N n_loops, // 6
N n1, // 1e1
N n2, // 1e1
@@ -50,80 +44,68 @@
// by make_random(dist), this example outputs a series of kolmogorov-
// smirnov statistics. Convergence to zero is evidence that
// the sample agrees wit the cdf of dist
-
- using namespace boost;
- // Types
- typedef typename common::meta::value<D>::type val_;
- typedef mt19937 urng_;
- typedef typename meta::bind_delegate<D>::type fun_;
- typedef detail::fusion::map::identity_f<
- mpl::int_<0>,
- mpl::int_<1>,
- fun_
- > functor_;
-
- typedef typename functor_::identity::key_ key1_;
- typedef typename functor_::function::key_ key2_;
-
- typedef non_parametric::kolmogorov_smirnov::statistic<
- val_,
- key1_,
- key2_
- > kolmogorov_smirnov_stat_;
- typedef typename boost::result_of<functor_(const val_&)>::type data_;
- typedef std::vector<data_> dataset_;
-
- // Constants
-
- urng_ urng;
-
- typedef boost::function<data_()> gen_data_;
+ typedef typename distribution::meta::value<D>::type val_;
+ typedef distribution::functor::cdf_<D> fun_;
+ typedef detail::x_f<val_> x_cdf_;
+ typedef typename x_cdf_::input k1_;
+ typedef typename x_cdf_::output1 k2_;
+ typedef non_parametric::kolmogorov_smirnov::statistic<val_,k1_,k2_> ks_;
+ typedef typename x_cdf_::template functor<D> make_x_cdf_;
+ typedef typename x_cdf_::template meta_generator<D> meta_gen_data_;
+ typedef typename meta_gen_data_::type gen_data_;
+ typedef typename gen_data_::result_type data_;
+ typedef std::vector<data_> dataset_;
dataset_ dataset;
- kolmogorov_smirnov_stat_ kolmogorov_smirnov_stat;
-
+ ks_ ks;
{
- functor_ functor(
- make_bind_delegate<fun_wrap::cdf_>(dist)
- );
-
- BOOST_AUTO(
- vg,
- make_random_generator(urng,dist)
- );
-
- gen_data_ gen_data = boost::lambda::bind<data_>(
- functor,
- boost::lambda::bind(
- boost::ref(
- vg
- )
- )
- );
-
- os << description(dist) << std::endl;
+ gen_data_ gen_data = meta_gen_data_::call(dist,random_generator);
+ os << dist << std::endl;
unsigned i = 0;
unsigned n_draws = n1;
dataset.clear();
while(i<n_loops){
dataset.reserve(dataset.size()+n_draws);
-
std::generate_n(
std::back_inserter(dataset),
n_draws,
gen_data
);
-
- kolmogorov_smirnov_stat(boost::begin(dataset),boost::end(dataset));
- os << kolmogorov_smirnov_stat.description() << std::endl;
+ ks(boost::begin(dataset),boost::end(dataset));
+ os << ks.description() << std::endl;
++i;
n_draws *= n2;
}
}
}
+template<typename D,typename U,typename N>
+void random2(
+ const D& dist,
+ U& urng,
+ N n_loops,
+ N n1,
+ N n2,
+ std::ostream& os
+)
+{
+ BOOST_AUTO(
+ vg,
+ make_random_generator(urng,dist)
+ );
+
+ return test::random(
+ dist,
+ vg,
+ n_loops,
+ n1,
+ n2,
+ os
+ );
+}
+
}// test
}// toolkit
@@ -132,5 +114,4 @@
}// statistics
}// boost
-
#endif
\ No newline at end of file
Modified: sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/unscope/os.hpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/unscope/os.hpp (original)
+++ sandbox/statistics/distribution_toolkit/boost/statistics/detail/distribution_toolkit/unscope/os.hpp 2009-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -13,22 +13,29 @@
#include <boost/statistics/detail/distribution_toolkit/meta/is_pseudo_scalar_distribution.hpp>
namespace boost{
+namespace statistics{
+namespace detail{
+namespace distribution{
+namespace toolkit{
template<typename D>
- typename boost::lazy_enable_if<
- statistics::detail::distribution::toolkit
- ::meta::is_pseudo_scalar_distribution<D>,
- mpl::identity<std::ostream&>
+ typename
+ boost::lazy_enable_if<
+ meta::is_pseudo_scalar_distribution<D>,
+ boost::mpl::identity<std::ostream&>
>::type
operator<<(std::ostream& os,const D& dist){
- return (
- os <<
- statistics::detail::distribution::toolkit::description(dist)
- );
+ return (os << description(dist));
}
-}
+}// toolkit
+}// distribution
+}// detail
+}// statistics
+}// boost
+
+// using boost::statistics::detail::distribution::toolkit::operator<<
#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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -91,6 +91,12 @@
[ History ]
+Dec 4 2009 :
+ /math_fwd removed. Instead, any extension to boost::math stays in this
+ namespace. Rationale : allows Koenig Lookup.
+ /fun_wrap removed. Instead, functor for pdf, cdf etc are in
+ distribution_common
+
Nov 6 2009 : Added error-handling policy to location_scale
Oct 11 2009 :
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -30,10 +30,8 @@
#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/map_pdf/include.hpp>
#include <boost/statistics/detail/distribution_toolkit/unscope/include.hpp>
#include <libs/statistics/detail/distribution_toolkit/example/distribution_function.h>
@@ -42,30 +40,24 @@
out << "-> example_math_location_scale" << std::endl;
- // Examples of location_scale + fun_wrap + map_pdf + iterator
-
using namespace boost;
using namespace math;
using namespace statistics::detail;
- namespace st = statistics::detail;
- namespace co = distribution::common;
- namespace tk = distribution::toolkit;
- namespace tk_it = tk::iterator;
+ namespace dist = distribution;
// Types
- typedef double val_;
- typedef boost::mt19937 urng_;
- typedef boost::normal_distribution<val_> rnd_;
- typedef math::students_t_distribution<val_> stud_;
- typedef tk::location_scale_distribution<stud_> ls_stud_;
- typedef boost::variate_generator<urng_&,rnd_> vg_;
- typedef boost::numeric::bounds<val_> bounds_;
+ typedef double val_;
+ typedef boost::mt19937 urng_;
+ typedef boost::normal_distribution<val_> rnd_;
+ typedef math::students_t_distribution<val_> stud_;
+ typedef dist::toolkit::location_scale_distribution<stud_> ls_stud_;
+ typedef boost::variate_generator<urng_&,rnd_> vg_;
+ typedef boost::numeric::bounds<val_> bounds_;
// Constants
const unsigned df = 10;
const val_ mu = 10;
const val_ sigma = 2;
- const unsigned n = 1e1;
const val_ x = 2.132;
// Initialization
@@ -97,76 +89,29 @@
}
};
-
-
- { // Create a delegate for log_unnormalized_pdf
-
- typedef tk::meta::delegate<ls_stud_> meta_deleg_;
- typedef meta_deleg_::type deleg_;
- deleg_ deleg
- = meta_deleg_::make<tk::fun_wrap::log_unnormalized_pdf_>();
- BOOST_ASSERT(
- float_::equal(
- deleg(ls_stud,x),
- st::log_unnormalized_pdf(ls_stud,x)
- )
- );
- }
- { // Create a delegate for log_unnormalized_pdf
- typedef co::functor::log_unnormalized_pdf<ls_stud_> ftor_;
- ftor_ ftor(ls_stud);
- }
- { // make_distribution_function_iterator + fun_wrap
- // Arbitrary random sample
- typedef std::vector<val_> vals_;
- vals_ range_x;
- std::generate_n(
- back_inserter(range_x),
- n,
- vg_(urng,rnd_(0,1))
- );
- vals_ range_log_pdf;
- std::copy(
- tk_it::make_distribution_function<
- tk::fun_wrap::log_unnormalized_pdf_
- >(stud,boost::begin(range_x)),
- tk_it::make_distribution_function<
- tk::fun_wrap::log_unnormalized_pdf_
- >(stud,boost::end(range_x)),
- std::back_inserter(range_log_pdf)
- );
- }
{ // product_pdf
- typedef tk::product_pdf<stud_,ls_stud_> prod_dist_;
-
- typedef tk::meta::delegate<prod_dist_> meta_deleg_;
- typedef meta_deleg_::type deleg_;
- deleg_ deleg
- = meta_deleg_::make<tk::fun_wrap::log_unnormalized_pdf_>();
-
+ typedef dist::toolkit::product_pdf<stud_,ls_stud_> prod_dist_;
prod_dist_ prod_dist(stud,ls_stud);
prod_dist_ prod_dist2(stud,ls_stud);
prod_dist = prod_dist2; // check assignment
-
BOOST_ASSERT(
float_::equal(
- st::log_unnormalized_pdf(prod_dist,x),
- st::log_unnormalized_pdf(prod_dist2,x)
+ log_unnormalized_pdf(prod_dist,x),
+ log_unnormalized_pdf(prod_dist2,x)
)
);
BOOST_ASSERT(
float_::equal(
- st::log_unnormalized_pdf(prod_dist.first(),x)
- + st::log_unnormalized_pdf(prod_dist.second(),x),
- st::log_unnormalized_pdf(prod_dist,x)
+ log_unnormalized_pdf(prod_dist.first(),x)
+ + log_unnormalized_pdf(prod_dist.second(),x),
+ log_unnormalized_pdf(prod_dist,x)
)
);
}
{ // inverse_pdf
- typedef tk::inverse_pdf<stud_> inv_dist_;
+ typedef dist::toolkit::inverse_pdf<stud_> inv_dist_;
inv_dist_ inv_dist(stud);
-
BOOST_ASSERT(
float_::equal(
-log_unnormalized_pdf(inv_dist.distribution(),x),
@@ -176,11 +121,10 @@
}
{ // ratio_pdf + fun_wrap
- typedef tk::meta_ratio_pdf<stud_,ls_stud_> mf_;
- typedef mf_::type ratio_dist_;
-
- ratio_dist_ ratio_dist = mf_::make(stud,ls_stud);
+ typedef dist::toolkit::meta_ratio_pdf<stud_,ls_stud_> mf_;
+ typedef mf_::type ratio_dist_;
+ ratio_dist_ ratio_dist = mf_::call(stud,ls_stud);
BOOST_ASSERT(
float_::equal(
// + sign because inherits from inverse
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,40 +1,40 @@
//////////////////////////////////////////////////////////////////////////////
-// distribution::toolkit::example::random.cpp //
+// distribution::toolkit::example::random2.cpp //
// //
// (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) //
//////////////////////////////////////////////////////////////////////////////
+#include <boost/random/mersenne_twister.hpp>
+
#include <boost/statistics/detail/distribution_toolkit/distributions/chi_squared/include.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/exponential/include.hpp>
#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>
-// Warning: location_scale<Z> comes after fwd_math because Z is defined in math::
-#include <boost/statistics/detail/distribution_toolkit/fwd_math/cdf.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_common/distributions/reference/include.hpp>
#include <boost/statistics/detail/distribution_toolkit/test/random.hpp>
-
#include <libs/statistics/detail/distribution_toolkit/example/random.h>
void example_random(std::ostream& os)
{
- // For each distribution, dist, and the corresponding random engine returned
- // by make_random(dist), this example outputs a series of kolmogorov-
+ // For each distribution, dist, and the corresponding random2 engine returned
+ // by make_random2(dist), this example outputs a series of kolmogorov-
// smirnov statistics. Convergence to zero is evidence that
// the sample agrees wit the cdf of dist
- os << "-> test_random " << std::endl;
+ os << "-> test_random2 " << std::endl;
using namespace boost;
using namespace boost::statistics;
namespace stat = statistics::detail;
- namespace tk = stat::distribution::toolkit;
- namespace dc = stat::distribution::common;
+ namespace dist = stat::distribution;
+ namespace test = dist::toolkit::test;
+ typedef boost::mt19937 urng_;
const unsigned n_loops = 6;
const unsigned n1 = 1e1;
@@ -42,28 +42,29 @@
// Types
typedef double val_;
-
+
+ urng_ urng;
+
{
typedef math::chi_squared_distribution<val_> dist_;
const val_ df = 10;
dist_ dist( df );
-
- tk::test::random(
+ test::random2(
dist,
+ urng,
n_loops,
n1,
n2,
os
);
-
}
{
typedef math::exponential_distribution<val_> dist_;
const val_ lambda = 1.0;
dist_ dist( lambda );
-
- tk::test::random(
+ test::random2(
dist,
+ urng,
n_loops,
n1,
n2,
@@ -77,8 +78,9 @@
const val_ scale = 3.0;
dist_ dist( shape, scale );
- tk::test::random(
+ test::random2(
dist,
+ urng,
n_loops,
n1,
n2,
@@ -91,8 +93,9 @@
const val_ s = 2.0;
dist_ dist( m, s );
- tk::test::random(
+ test::random2(
dist,
+ urng,
n_loops,
n1,
n2,
@@ -104,9 +107,9 @@
typedef math::students_t_distribution<val_> dist_;
const val_ df = 4.0;
dist_ dist( df );
-
- tk::test::random(
+ test::random2(
dist,
+ urng,
n_loops,
n1,
n2,
@@ -114,16 +117,16 @@
);
}
{
- typedef math::students_t_distribution<val_> dist_z_;
- typedef tk::location_scale_distribution<dist_z_> dist_;
+ typedef math::students_t_distribution<val_> dist_z_;
+ typedef dist::toolkit::location_scale_distribution<dist_z_> dist_;
const val_ df = 4.0;
const val_ m = 1.0;
const val_ s = 2.0;
dist_z_ dist_z( df );
dist_ dist(m, s, dist_z);
-
- tk::test::random(
+ test::random2(
dist,
+ urng,
n_loops,
n1,
n2,
@@ -132,13 +135,14 @@
}
{
typedef math::students_t_distribution<val_> d0_;
- typedef tk::wrapper<d0_> dist_;
+ typedef dist::reference_wrapper<d0_> dist_;
const val_ df = 4.0;
d0_ d0( df );
dist_ dist(d0);
- tk::test::random(
+ test::random2(
dist,
+ urng,
n_loops,
n1,
n2,
@@ -147,4 +151,4 @@
}
os << "<-" << std::endl;
-}
+}
\ No newline at end of file
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-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -8,16 +8,14 @@
//////////////////////////////////////////////////////////////////////////////
#include <iostream>
#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_functions<double>(std::cout);
- test_function_ptrs<double>(std::cout);
+ example_distribution_function(std::cout);
+ example_random(std::cout);
+ test_functions<double>(std::cout);
return 0;
}
\ No newline at end of file
Modified: sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/test/function_ptrs.cpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/test/function_ptrs.cpp (original)
+++ sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/test/function_ptrs.cpp 2009-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -1,3 +1,4 @@
+/*
//////////////////////////////////////////////////////////////////////////////
// distribution::toolkit::test::function_ptrs.cpp //
// //
@@ -103,4 +104,5 @@
os << "<-" << std::endl;
}
-#endif
\ No newline at end of file
+#endif
+*/
\ No newline at end of file
Modified: sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/test/functions.cpp
==============================================================================
--- sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/test/functions.cpp (original)
+++ sandbox/statistics/distribution_toolkit/libs/statistics/detail/distribution_toolkit/test/functions.cpp 2009-12-05 20:05:54 EST (Sat, 05 Dec 2009)
@@ -9,7 +9,6 @@
#ifndef LIBS_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_TEST_FUNCTIONS_H_ER_2009
#define LIBS_STATISTICS_DETAIL_DISTRIBUTION_TOOLKIT_TEST_FUNCTIONS_H_ER_2009
#include <ostream>
-
#include <boost/concept/assert.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/chi_squared/include.hpp>
@@ -18,29 +17,13 @@
#include <boost/statistics/detail/distribution_toolkit/distributions/normal/include.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/students_t/include.hpp>
#include <boost/statistics/detail/distribution_toolkit/distributions/uniform/include.hpp>
-
-#include <boost/statistics/detail/distribution_toolkit/fwd_math/cdf.hpp>
-#include <boost/statistics/detail/distribution_toolkit/fwd_math/mean.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/variance.hpp>
-
-#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/location_scale.hpp>
-#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/quantile.hpp>
-#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/cdf.hpp>
-#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/pdf.hpp>
-#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/log_unnormalized_pdf.hpp>
-#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/mean.hpp>
-#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/derivative_log_unnormalized_pdf.hpp>
-#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/variance.hpp>
-
-#include <boost/statistics/detail/distribution_toolkit/distributions/wrapper/include.hpp>
+#include <boost/statistics/detail/distribution_toolkit/distributions/location_scale/include.hpp>
#include <boost/statistics/detail/distribution_toolkit/map_pdf/inverse_pdf/include.hpp>
#include <boost/statistics/detail/distribution_toolkit/map_pdf/product_pdf/include.hpp>
#include <boost/statistics/detail/distribution_toolkit/map_pdf/ratio_pdf/include.hpp>
-// Concepts must come after distributions
+#include <boost/statistics/detail/distribution_common/concept/unary/description.hpp>
#include <boost/statistics/detail/distribution_common/concept/unary/mean.hpp>
#include <boost/statistics/detail/distribution_common/concept/unary/variance.hpp>
#include <boost/statistics/detail/distribution_common/concept/unary/quantile.hpp>
@@ -48,221 +31,275 @@
#include <boost/statistics/detail/distribution_common/concept/unary/pdf.hpp>
#include <boost/statistics/detail/distribution_common/concept/unary/log_unnormalized_pdf.hpp>
#include <boost/statistics/detail/distribution_common/concept/unary/derivative_log_unnormalized_pdf.hpp>
-#include <boost/statistics/detail/distribution_toolkit/concept/aggregate/function_ptrs.hpp>
+#include <boost/statistics/detail/distribution_common/concept/unary/os.hpp>
-#include <boost/statistics/detail/distribution_common/meta/wrapper_distribution.hpp>
-#include <boost/statistics/detail/distribution_common/meta/wrapper_variable.hpp>
-#include <boost/statistics/detail/distribution_common/meta/wrapper_probability.hpp>
+#include <boost/statistics/detail/distribution_common/distributions/reference/include.hpp>
+#include <boost/statistics/detail/distribution_common/meta/wrapper/distribution.hpp>
+#include <boost/statistics/detail/distribution_common/meta/wrapper/variable.hpp>
+#include <boost/statistics/detail/distribution_common/meta/wrapper/probability.hpp>
template <typename T>
void test_functions(std::ostream& os)
{
- os << "test_functions - >" << std::endl;
+ os << "test_functions - >";
using namespace boost;
using namespace math;
- namespace st = boost::statistics::detail;
- namespace st_dc = st::distribution::common;
- namespace st_dc_c = st_dc::concept;
- namespace st_tk = st::distribution::toolkit;
- namespace st_tk_c = st_tk::concept;
+ namespace dist = boost::statistics::detail::distribution;
- typedef st_dc::meta::wrapper_variable<T> x_;
- typedef st_dc::meta::wrapper_probability<T,x_> p_x_;
+ typedef dist::meta::wrapper_variable<T> x_;
+ typedef dist::meta::wrapper_probability<T,x_> p_x_;
{
typedef math::chi_squared_distribution<T> d_;
- typedef st_dc::meta::wrapper_distribution<d_,p_x_> w_;
-
+ typedef dist::meta::wrapper_distribution<d_,p_x_> w_;
BOOST_CONCEPT_ASSERT((
- st_tk_c::FunctionPtrs<d_>
+ dist::concept::Os<
+ dist::concept::Description<
+ dist::concept::DerivativeLogUnnormalizedPdf<
+ dist::concept::LogUnnormalizedPdf<
+ dist::concept::Pdf<
+ dist::concept::Quantile<
+ dist::concept::Cdf<
+ dist::concept::Mean<
+ dist::concept::Variance<w_>
+ >
+ >
+ >
+ >
+ >
+ >
+ >
+ >
));
-
+ }
+ {
+ typedef boost::math::exponential_distribution<T> d_;
+ typedef dist::meta::wrapper_distribution<d_,p_x_> w_;
BOOST_CONCEPT_ASSERT((
- st_dc_c::DerivativeLogUnnormalizedPdf<
- st_dc_c::LogUnnormalizedPdf<
- st_dc_c::Pdf<
- st_dc_c::Quantile<
- st_dc_c::Cdf<
- st_dc_c::Mean<
- st_dc_c::Variance<w_>
- >
- >
- >
- >
- >
+ dist::concept::Os<
+ dist::concept::Description<
+ dist::concept::DerivativeLogUnnormalizedPdf<
+ dist::concept::LogUnnormalizedPdf<
+ dist::concept::Pdf<
+ dist::concept::Quantile<
+ dist::concept::Cdf<
+ dist::concept::Mean<
+ dist::concept::Variance<w_>
+ >
+ >
+ >
+ >
+ >
+ >
+ >
>
));
}
{
- typedef math::exponential_distribution<T> d_;
- typedef st_dc::meta::wrapper_distribution<d_,p_x_> w_;
+ typedef math::gamma_distribution<T> d_;
+ typedef dist::meta::wrapper_distribution<d_,p_x_> w_;
BOOST_CONCEPT_ASSERT((
- st_dc_c::DerivativeLogUnnormalizedPdf<
- st_dc_c::LogUnnormalizedPdf<
- st_dc_c::Pdf<
- st_dc_c::Quantile<
- st_dc_c::Cdf<
- st_dc_c::Mean<
- st_dc_c::Variance<w_>
- >
- >
- >
- >
- >
+ dist::concept::Os<
+ dist::concept::Description<
+ dist::concept::DerivativeLogUnnormalizedPdf<
+ dist::concept::LogUnnormalizedPdf<
+ dist::concept::Pdf<
+ dist::concept::Quantile<
+ dist::concept::Cdf<
+ dist::concept::Mean<
+ dist::concept::Variance<w_>
+ >
+ >
+ >
+ >
+ >
+ >
+ >
>
));
}
{
- typedef math::gamma_distribution<T> d_;
- typedef st_dc::meta::wrapper_distribution<d_,p_x_> w_;
+ typedef math::normal_distribution<T> d_;
+ typedef dist::meta::wrapper_distribution<d_,p_x_> w_;
BOOST_CONCEPT_ASSERT((
- st_dc_c::DerivativeLogUnnormalizedPdf<
- st_dc_c::LogUnnormalizedPdf<
- st_dc_c::Pdf<
- st_dc_c::Quantile<
- st_dc_c::Cdf<
- st_dc_c::Mean<
- st_dc_c::Variance<w_>
- >
- >
- >
- >
- >
+ dist::concept::Os<
+ dist::concept::Description<
+ dist::concept::DerivativeLogUnnormalizedPdf<
+ dist::concept::LogUnnormalizedPdf<
+ dist::concept::Pdf<
+ dist::concept::Quantile<
+ dist::concept::Cdf<
+ dist::concept::Mean<
+ dist::concept::Variance<w_>
+ >
+ >
+ >
+ >
+ >
+ >
+ >
>
));
-
}
{
- typedef math::normal_distribution<T> d_;
- typedef st_dc::meta::wrapper_distribution<d_,p_x_> w_;
+ typedef math::students_t_distribution<T> d_;
+ typedef dist::meta::wrapper_distribution<d_,p_x_> w_;
+
BOOST_CONCEPT_ASSERT((
- st_dc_c::DerivativeLogUnnormalizedPdf<
- st_dc_c::LogUnnormalizedPdf<
- st_dc_c::Pdf<
- st_dc_c::Quantile<
- st_dc_c::Cdf<
- st_dc_c::Mean<
- st_dc_c::Variance<w_>
- >
- >
- >
- >
- >
+ dist::concept::Os<
+ dist::concept::Description<
+ dist::concept::DerivativeLogUnnormalizedPdf<
+ dist::concept::LogUnnormalizedPdf<
+ dist::concept::Pdf<
+ dist::concept::Quantile<
+ dist::concept::Cdf<
+ dist::concept::Mean<
+ dist::concept::Variance<w_>
+ >
+ >
+ >
+ >
+ >
+ >
+ >
>
));
}
{
- typedef math::students_t_distribution<T> d_;
- typedef st_dc::meta::wrapper_distribution<d_,p_x_> w_;
+ typedef boost::math::uniform_distribution<T> d_;
+ typedef dist::meta::wrapper_distribution<d_,p_x_> w_;
BOOST_CONCEPT_ASSERT((
- st_dc_c::DerivativeLogUnnormalizedPdf<
- st_dc_c::LogUnnormalizedPdf<
- st_dc_c::Pdf<
- st_dc_c::Quantile<
- st_dc_c::Cdf<
- st_dc_c::Mean<
- st_dc_c::Variance<w_>
- >
- >
- >
- >
- >
- >
+ dist::concept::Description<
+ dist::concept::DerivativeLogUnnormalizedPdf<
+ dist::concept::LogUnnormalizedPdf<
+ dist::concept::Pdf<
+ dist::concept::Quantile<
+ dist::concept::Cdf<
+ dist::concept::Mean<
+ dist::concept::Variance<w_>
+ >
+ >
+ >
+ >
+ >
+ >
+ >
));
}
{
typedef math::normal_distribution<T> d_;
- typedef st_dc::meta::wrapper_distribution<d_,p_x_> w_;
+ typedef dist::meta::wrapper_distribution<d_,p_x_> w_;
BOOST_CONCEPT_ASSERT((
- st_dc_c::DerivativeLogUnnormalizedPdf<
- st_dc_c::LogUnnormalizedPdf<
- st_dc_c::Pdf<
- st_dc_c::Quantile<
- st_dc_c::Cdf<
- st_dc_c::Mean<
- st_dc_c::Variance<w_>
- >
- >
- >
- >
- >
- >
+ dist::concept::Os<
+ dist::concept::Description<
+ dist::concept::DerivativeLogUnnormalizedPdf<
+ dist::concept::LogUnnormalizedPdf<
+ dist::concept::Pdf<
+ dist::concept::Quantile<
+ dist::concept::Cdf<
+ dist::concept::Mean<
+ dist::concept::Variance<w_>
+ >
+ >
+ >
+ >
+ >
+ >
+ >
+ >
));
}
{
typedef math::normal_distribution<T> z_;
- typedef st_tk::location_scale_distribution< z_ > d_;
- typedef st_dc::meta::wrapper_distribution<d_,p_x_> w_;
+ typedef dist::toolkit::location_scale_distribution< z_ > d_;
+ typedef dist::meta::wrapper_distribution<d_,p_x_> w_;
BOOST_CONCEPT_ASSERT((
- st_dc_c::DerivativeLogUnnormalizedPdf<
- st_dc_c::LogUnnormalizedPdf<
- st_dc_c::Pdf<
- st_dc_c::Quantile<
- st_dc_c::Cdf<
- st_dc_c::Mean<
- st_dc_c::Variance<w_>
- >
- >
- >
- >
- >
+ dist::concept::Os<
+ dist::concept::Description<
+ dist::concept::DerivativeLogUnnormalizedPdf<
+ dist::concept::LogUnnormalizedPdf<
+ dist::concept::Pdf<
+ dist::concept::Quantile<
+ dist::concept::Cdf<
+ dist::concept::Mean<
+ dist::concept::Variance<w_>
+ >
+ >
+ >
+ >
+ >
+ >
+ >
>
));
}
{
- typedef math::normal_distribution<T> d0_;
- typedef st_tk::wrapper< const d0_& > d_;
- typedef st_dc::meta::wrapper_distribution<d_,p_x_> w_;
+ typedef math::normal_distribution<T> d0_;
+ typedef dist::reference_wrapper< const d0_& > d_;
+ typedef dist::meta::wrapper_distribution<d_,p_x_> w_;
BOOST_CONCEPT_ASSERT((
- st_dc_c::DerivativeLogUnnormalizedPdf<
- st_dc_c::LogUnnormalizedPdf<
- st_dc_c::Pdf<
- st_dc_c::Quantile<
- st_dc_c::Cdf<
- st_dc_c::Mean<
- st_dc_c::Variance<w_>
- >
- >
- >
- >
- >
+ dist::concept::Os<
+ dist::concept::Description<
+ dist::concept::DerivativeLogUnnormalizedPdf<
+ dist::concept::LogUnnormalizedPdf<
+ dist::concept::Pdf<
+ dist::concept::Quantile<
+ dist::concept::Cdf<
+ dist::concept::Mean<
+ dist::concept::Variance<w_>
+ >
+ >
+ >
+ >
+ >
+ >
+ >
>
));
}
{
typedef math::normal_distribution<T> d0_;
- typedef st_tk::inverse_pdf< d0_ > d_;
- typedef st_dc::meta::wrapper_distribution<d_,p_x_> w_;
+ typedef dist::toolkit::inverse_pdf< d0_ > d_;
+ typedef dist::meta::wrapper_distribution<d_,p_x_> w_;
- BOOST_CONCEPT_ASSERT((
- st_dc_c::LogUnnormalizedPdf<w_>
+ BOOST_CONCEPT_ASSERT((
+ dist::concept::Os<
+ dist::concept::Description<
+ dist::concept::LogUnnormalizedPdf<w_>
+ >
+ >
));
}
{
typedef math::normal_distribution<T> d0_;
typedef math::chi_squared_distribution<T> d1_;
- typedef st_tk::product_pdf< d0_, d1_ > d_;
- typedef st_dc::meta::wrapper_distribution<d_,p_x_> w_;
+ typedef dist::toolkit::product_pdf< d0_, d1_ > d_;
+ typedef dist::meta::wrapper_distribution<d_,p_x_> w_;
BOOST_CONCEPT_ASSERT((
- st_dc_c::LogUnnormalizedPdf<w_>
+ dist::concept::Description<
+ dist::concept::LogUnnormalizedPdf<w_>
+ >
));
}
{
- typedef math::normal_distribution<T> d0_;
- typedef math::chi_squared_distribution<T> d1_;
- typedef typename st_tk::meta_ratio_pdf< d0_, d1_ >::type d_;
- typedef st_dc::meta::wrapper_distribution<d_,p_x_> w_;
+ typedef math::normal_distribution<T> d0_;
+ typedef math::chi_squared_distribution<T> d1_;
+ typedef typename dist::toolkit::meta_ratio_pdf< d0_, d1_ >::type d_;
+ typedef dist::meta::wrapper_distribution<d_,p_x_> w_;
- BOOST_CONCEPT_ASSERT((
- st_dc_c::LogUnnormalizedPdf<w_>
+ BOOST_CONCEPT_ASSERT((
+ dist::concept::Description<
+ dist::concept::LogUnnormalizedPdf<w_>
+ >
));
}
+
os << " <- " << std::endl;
}
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk