[Boost-commit] svn:boost r56531 - in sandbox/statistics/adaptive_rejection_sampling: boost/ars boost/ars/function boost/ars/test libs/ars/doc libs/ars/example

Subject: [Boost-commit] svn:boost r56531 - in sandbox/statistics/adaptive_rejection_sampling: boost/ars boost/ars/function boost/ars/test libs/ars/doc libs/ars/example
From: erwann.rogard_at_[hidden]
Date: 2009-10-02 15:58:40

Author: e_r
Date: 2009-10-02 15:58:39 EDT (Fri, 02 Oct 2009)
New Revision: 56531
URL: http://svn.boost.org/trac/boost/changeset/56531

Log:
m
Text files modified: 
   sandbox/statistics/adaptive_rejection_sampling/boost/ars/function/adaptor.hpp             |    11 +++++++----                             
   sandbox/statistics/adaptive_rejection_sampling/boost/ars/search_reflection.hpp            |    12 ++++++------                            
   sandbox/statistics/adaptive_rejection_sampling/boost/ars/test/standard_distribution.hpp   |     2 +-                                      
   sandbox/statistics/adaptive_rejection_sampling/libs/ars/doc/readme.txt                    |     2 +-                                      
   sandbox/statistics/adaptive_rejection_sampling/libs/ars/example/standard_distribution.cpp |     1 +                                       
   5 files changed, 16 insertions(+), 12 deletions(-)

Modified: sandbox/statistics/adaptive_rejection_sampling/boost/ars/function/adaptor.hpp
==============================================================================
--- sandbox/statistics/adaptive_rejection_sampling/boost/ars/function/adaptor.hpp	(original)
+++ sandbox/statistics/adaptive_rejection_sampling/boost/ars/function/adaptor.hpp	2009-10-02 15:58:39 EDT (Fri, 02 Oct 2009)
@@ -9,8 +9,11 @@
 #define BOOST_STATISTICS_DETAIL_ARS_FUNCTION_ADAPTOR_HPP_ER_2009
 #include <boost/type_traits.hpp>
 #include <boost/call_traits.hpp>
-#include <boost/statistics/detail/distribution_toolkit/unscope/log_unnormalized_pdf.hpp>
-#include <boost/statistics/detail/distribution_toolkit/unscope/derivative_log_unnormalized_pdf.hpp>
+
+//  Make sure to precede this file by
+// #include <boost/statistics/detail/distribution_toolkit/distributions/D.hpp>
+// #include <boost/statistics/detail/distribution_toolkit/fwd_math/cdf.hpp>
+// if D is defined in boost::math
 
 namespace boost{
 namespace statistics{
@@ -50,12 +53,12 @@
         value_type& log_pdf,
         value_type& dlog_pdf
     )const{
-        log_pdf = boost::log_unnormalized_pdf(
+        log_pdf = statistics::detail::log_unnormalized_pdf(
             this->distribution(),
             x
         );
             
-        dlog_pdf = boost::derivative_log_unnormalized_pdf(
+        dlog_pdf = statistics::detail::derivative_log_unnormalized_pdf(
             this->distribution(),
             x
         );

Modified: sandbox/statistics/adaptive_rejection_sampling/boost/ars/search_reflection.hpp
==============================================================================
--- sandbox/statistics/adaptive_rejection_sampling/boost/ars/search_reflection.hpp	(original)
+++ sandbox/statistics/adaptive_rejection_sampling/boost/ars/search_reflection.hpp	2009-10-02 15:58:39 EDT (Fri, 02 Oct 2009)
@@ -13,8 +13,8 @@
 #include <boost/ars/constant.hpp>
 #include <boost/ars/point.hpp>
 #include <boost/ars/error.hpp>
-#include <boost/ars/function_signature.hpp>
-#include <boost/ars/functional/standard_distribution.hpp>
+#include <boost/ars/function/signature.hpp>
+#include <boost/ars/function/adaptor.hpp>
 
 namespace boost{
 namespace statistics{
@@ -30,7 +30,7 @@
 search_reflection(
     const T& x_min,
     const T& x_max,
-    function<typename ars::function_signature<T>::type> delegate,
+    boost::function<typename ars::function::signature<T>::type> delegate,
     point<T>& p_0,
     point<T>& p_1,
     unsigned n_max
@@ -104,7 +104,7 @@
 unsigned search_reflection(
     const T& x_min,
     const T& x_max,
-    function<typename ars::function_signature<T>::type> delegate,
+    boost::function<typename ars::function::signature<T>::type> delegate,
     const T& x_0,
     const T& x_1,
     point<T>& p_0,
@@ -138,8 +138,8 @@
     ars::point<T>& p_1,
     unsigned n_max
 ){
-    typedef ars::functional::standard_distribution<const D&> fnal_t;
-    typedef typename ars::function_signature<T>::type   signature;
+    typedef ars::function::adaptor<const D&> fnal_t;
+    typedef typename ars::function::signature<T>::type   signature;
     typedef boost::function<signature>                  delegate_t;
     fnal_t fnal(dist);
 

Modified: sandbox/statistics/adaptive_rejection_sampling/boost/ars/test/standard_distribution.hpp
==============================================================================
--- sandbox/statistics/adaptive_rejection_sampling/boost/ars/test/standard_distribution.hpp	(original)
+++ sandbox/statistics/adaptive_rejection_sampling/boost/ars/test/standard_distribution.hpp	2009-10-02 15:58:39 EDT (Fri, 02 Oct 2009)
@@ -78,7 +78,7 @@
     typedef random::ref_distribution<ars_&>                 ref_ars_;
     typedef variate_generator<U&,ref_ars_>                  vg_ars_;
 
-    typedef statistics::detail::distribution_toolkit::sample_cdf<val_> sc_;
+    typedef statistics::detail::distribution::toolkit::sample_cdf<val_> sc_;
 
     ars_ ars;
     ars.set_function(x_min, x_max, fun_t(mdist));

Modified: sandbox/statistics/adaptive_rejection_sampling/libs/ars/doc/readme.txt
==============================================================================
--- sandbox/statistics/adaptive_rejection_sampling/libs/ars/doc/readme.txt	(original)
+++ sandbox/statistics/adaptive_rejection_sampling/libs/ars/doc/readme.txt	2009-10-02 15:58:39 EDT (Fri, 02 Oct 2009)
@@ -26,9 +26,9 @@
 [ Dependencies ]
 
 boost_1_39_0
+/sandbox/statistics/distribution_common
 /sandbox/statistics/distribution_toolkit
 
-
 [ History ]
 
 Sept    2009 : standard_distribution.hpp modified due to changes described in

Modified: sandbox/statistics/adaptive_rejection_sampling/libs/ars/example/standard_distribution.cpp
==============================================================================
--- sandbox/statistics/adaptive_rejection_sampling/libs/ars/example/standard_distribution.cpp	(original)
+++ sandbox/statistics/adaptive_rejection_sampling/libs/ars/example/standard_distribution.cpp	2009-10-02 15:58:39 EDT (Fri, 02 Oct 2009)
@@ -8,6 +8,7 @@
 #include <iostream>
 #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/fwd_math/cdf.hpp>
 #include <boost/ars/test/gamma_distribution.hpp>
 #include <boost/ars/test/normal_distribution.hpp>
 #include <libs/ars/example/standard_distribution.h>