Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r57091 - in sandbox/statistics/model: boost/statistics/model boost/statistics/model/algorithm boost/statistics/model/functional boost/statistics/model/wrap boost/statistics/model/wrap/aggregate boost/statistics/model/wrap/unary boost/statistics/model/wrap/unary/detail libs/statistics/model/doc
From: erwann.rogard_at_[hidden]
Date: 2009-10-23 10:51:34


Author: e_r
Date: 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
New Revision: 57091
URL: http://svn.boost.org/trac/boost/changeset/57091

Log:
m
Text files modified:
   sandbox/statistics/model/boost/statistics/model/algorithm/include.hpp | 2 +-
   sandbox/statistics/model/boost/statistics/model/algorithm/log_likelihood.hpp | 2 +-
   sandbox/statistics/model/boost/statistics/model/algorithm/log_likelihoods.hpp | 2 +-
   sandbox/statistics/model/boost/statistics/model/algorithm/log_posteriors.hpp | 6 ++----
   sandbox/statistics/model/boost/statistics/model/algorithm/log_posteriors2.hpp | 7 +++++--
   sandbox/statistics/model/boost/statistics/model/functional/include.hpp | 2 +-
   sandbox/statistics/model/boost/statistics/model/functional/log_likelihood_accumulator.hpp | 10 ++++++++--
   sandbox/statistics/model/boost/statistics/model/functional/log_likelihood_evaluator.hpp | 2 +-
   sandbox/statistics/model/boost/statistics/model/functional/log_posterior_evaluator.hpp | 2 +-
   sandbox/statistics/model/boost/statistics/model/functional/log_prior_evaluator.hpp | 18 +++++++++---------
   sandbox/statistics/model/boost/statistics/model/include.hpp | 4 ++--
   sandbox/statistics/model/boost/statistics/model/wrap/aggregate/data.hpp | 15 ++++++++-------
   sandbox/statistics/model/boost/statistics/model/wrap/aggregate/dataset.hpp | 12 ++++++------
   sandbox/statistics/model/boost/statistics/model/wrap/aggregate/model_covariate_parameter.hpp | 26 +++++++++++++++-----------
   sandbox/statistics/model/boost/statistics/model/wrap/aggregate/model_data.hpp | 16 ++++++++--------
   sandbox/statistics/model/boost/statistics/model/wrap/aggregate/model_dataset.hpp | 24 +++++++++++++-----------
   sandbox/statistics/model/boost/statistics/model/wrap/aggregate/model_parameter.hpp | 12 ++++++------
   sandbox/statistics/model/boost/statistics/model/wrap/aggregate/prior_model_dataset.hpp | 27 ++++++++++++++++-----------
   sandbox/statistics/model/boost/statistics/model/wrap/include.hpp | 2 +-
   sandbox/statistics/model/boost/statistics/model/wrap/unary/covariate.hpp | 29 +++++++++++++++--------------
   sandbox/statistics/model/boost/statistics/model/wrap/unary/covariates.hpp | 30 ++++++++++++++++--------------
   sandbox/statistics/model/boost/statistics/model/wrap/unary/detail/base.hpp | 2 +-
   sandbox/statistics/model/boost/statistics/model/wrap/unary/model.hpp | 28 ++++++++++++++--------------
   sandbox/statistics/model/boost/statistics/model/wrap/unary/parameter.hpp | 28 ++++++++++++++--------------
   sandbox/statistics/model/boost/statistics/model/wrap/unary/prior.hpp | 26 +++++++++++++-------------
   sandbox/statistics/model/boost/statistics/model/wrap/unary/response.hpp | 30 ++++++++++++++++--------------
   sandbox/statistics/model/boost/statistics/model/wrap/unary/responses.hpp | 30 ++++++++++++++++--------------
   sandbox/statistics/model/libs/statistics/model/doc/readme.txt | 17 ++++++++++++-----
   28 files changed, 222 insertions(+), 189 deletions(-)

Modified: sandbox/statistics/model/boost/statistics/model/algorithm/include.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/algorithm/include.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/algorithm/include.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::algorithm::include.hpp //
+// statistics::model::algorithm::include.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //

Modified: sandbox/statistics/model/boost/statistics/model/algorithm/log_likelihood.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/algorithm/log_likelihood.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/algorithm/log_likelihood.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::algorithm::log_likelihood.hpp //
+// statistics::model::algorithm::log_likelihood.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //

Modified: sandbox/statistics/model/boost/statistics/model/algorithm/log_likelihoods.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/algorithm/log_likelihoods.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/algorithm/log_likelihoods.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::algorithm::log_likelihoods.hpp //
+// statistics::model::algorithm::log_likelihoods.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //

Modified: sandbox/statistics/model/boost/statistics/model/algorithm/log_posteriors.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/algorithm/log_posteriors.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/algorithm/log_posteriors.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::algorithm::log_posteriors.hpp //
+// statistics::model::algorithm::log_posteriors.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -17,9 +17,7 @@
 namespace model{
 
 // Evaluates the log-postetior for each parameter in [b_p,e_p)
-//
-// Warning : log_posteriors seems very suceptible to precision error.
-// log_posteriors2 appears to correct this problem.
+// Also see log_posteriors2
 template<
     typename T,typename D,typename M,typename Rx,typename Ry,typename ItP,
     typename ItLw

Modified: sandbox/statistics/model/boost/statistics/model/algorithm/log_posteriors2.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/algorithm/log_posteriors2.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/algorithm/log_posteriors2.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::algorithm::log_posteriors2.hpp //
+// statistics::model::algorithm::log_posteriors2.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -8,6 +8,7 @@
 #ifndef BOOST_MODEL_ALGORITHM_LOG_POSTERIORS2_HPP_ER_2009
 #define BOOST_MODEL_ALGORITHM_LOG_POSTERIORS2_HPP_ER_2009
 #include <algorithm>
+#include <boost/iterator/iterator_traits.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/statistics/model/wrap/aggregate/prior_model_dataset.hpp>
 #include <boost/statistics/model/functional/log_prior_evaluator.hpp>
@@ -18,6 +19,7 @@
 namespace model{
 
 // Evaluates the log-postetior for each parameter in [b_p,e_p)
+// Also see log_posteriors
 template<
     typename T,typename D,typename M,typename Rx,typename Ry,typename ItP,
     typename ItLw
@@ -56,7 +58,7 @@
     typename ItLw,
     typename ItLw2
>
-ItLw
+ItLw2
 log_posteriors2(
     prior_model_dataset_<D,M,Rx,Ry> pmd,
     ItP b_p,
@@ -68,6 +70,7 @@
     typedef log_likelihood_evaluator<T,M,Rx,Ry> eval_;
     eval0_ e0(pmd);
     eval_ e(pmd);
+
     return std::transform(
         b_p, //1
         e_p,

Modified: sandbox/statistics/model/boost/statistics/model/functional/include.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/functional/include.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/functional/include.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::functional::include.hpp //
+// statistics::model::functional::include.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //

Modified: sandbox/statistics/model/boost/statistics/model/functional/log_likelihood_accumulator.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/functional/log_likelihood_accumulator.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/functional/log_likelihood_accumulator.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::functional::log_likelihood_accumulator.hpp //
+// statistics::model::functional::log_likelihood_accumulator.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -7,6 +7,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_STATISTICS_MODEL_FUNCTIONAL_LOG_LIKELIHOOD_ACCUMULATOR_HPP_ER_2009
 #define BOOST_STATISTICS_MODEL_FUNCTIONAL_LOG_LIKELIHOOD_ACCUMULATOR_HPP_ER_2009
+#include <boost/concept_check.hpp>
 #include <boost/type_traits.hpp>
 #include <boost/call_traits.hpp>
 #include <boost/operators.hpp>
@@ -14,6 +15,7 @@
 #include <boost/statistics/model/wrap/aggregate/model_data.hpp>
 #include <boost/joint_dist/unscope/log_unnormalized_pdf.hpp>
 #include <boost/scalar_dist/unscope/log_unnormalized_pdf.hpp>
+#include <boost/statistics/model/concept/log_likelihood.hpp>
 
 namespace boost{
 
@@ -43,7 +45,6 @@
     typedef T result_type;
     typedef model_parameter_<M,P> model_parameter_type;
 
-
     // Construction
     log_likelihood_accumulator();
     log_likelihood_accumulator(model_parameter_type);
@@ -118,6 +119,11 @@
 typename log_likelihood_accumulator<T,M,P>::result_type
 log_likelihood_accumulator<T,M,P>::operator()(const X& x,const Y& y){
 
+ // TODO see compile error by uncommenting, e.g. survival_model
+ // BOOST_CONCEPT_ASSERT((
+ // HasLogLikelihood<T,M,X,Y,P>
+ // ));
+
     result_type l = log_likelihood<T>(
         make_model_data(
             model_parameter().model(),

Modified: sandbox/statistics/model/boost/statistics/model/functional/log_likelihood_evaluator.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/functional/log_likelihood_evaluator.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/functional/log_likelihood_evaluator.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::functional::log_likelihood_evaluator.hpp //
+// statistics::model::functional::log_likelihood_evaluator.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //

Modified: sandbox/statistics/model/boost/statistics/model/functional/log_posterior_evaluator.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/functional/log_posterior_evaluator.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/functional/log_posterior_evaluator.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::functional::log_posterior_evaluator.hpp //
+// statistics::model::functional::log_posterior_evaluator.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //

Modified: sandbox/statistics/model/boost/statistics/model/functional/log_prior_evaluator.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/functional/log_prior_evaluator.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/functional/log_prior_evaluator.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::functional::log_prior_evaluator.hpp //
+// statistics::model::functional::log_prior_evaluator.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -22,11 +22,11 @@
     class log_prior_evaluator{
         public:
         typedef T result_type;
- typedef prior_<D> prior_type;
+ typedef prior_wrapper<D> prior_wrapper_type;
         
         // Constructor
         log_prior_evaluator();
- log_prior_evaluator(const prior_type&);
+ log_prior_evaluator(const prior_wrapper_type&);
         log_prior_evaluator(const log_prior_evaluator&);
         log_prior_evaluator& operator=(const log_prior_evaluator&);
 
@@ -34,10 +34,10 @@
         template<typename P> result_type operator()(const P& p)const;
 
         // Access
- const prior_type& prior()const;
+ const prior_wrapper_type& prior_wrapper()const;
         
         private:
- prior_type p_;
+ prior_wrapper_type p_;
     };
 
     // Implementation //
@@ -48,7 +48,7 @@
     
     template<typename T,typename D>
     log_prior_evaluator<T,D>::log_prior_evaluator(
- const prior_type& p
+ const prior_wrapper_type& p
     ):p_(p){}
 
     template<typename T,typename D>
@@ -73,15 +73,15 @@
     typename log_prior_evaluator<T,D>::result_type
     log_prior_evaluator<T,D>::operator()(const P& p)const{
         return log_unnormalized_pdf(
- (this->prior()).prior(),
+ (this->prior_wrapper()).prior(),
             p
         );
     }
 
     // Access
     template<typename T,typename D>
- const typename log_prior_evaluator<T,D>::prior_type&
- log_prior_evaluator<T,D>::prior()const{
+ const typename log_prior_evaluator<T,D>::prior_wrapper_type&
+ log_prior_evaluator<T,D>::prior_wrapper()const{
         return (this->p_);
     }
 

Modified: sandbox/statistics/model/boost/statistics/model/include.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/include.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/include.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::include.hpp //
+// statistics::model::include.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -11,6 +11,6 @@
 #include <boost/statistics/model/algorithm/include.hpp>
 #include <boost/statistics/model/wrap/include.hpp>
 #include <boost/statistics/model/functional/include.hpp>
-
+#include <boost/statistics/model/random/include.hpp>
 
 #endif
\ No newline at end of file

Modified: sandbox/statistics/model/boost/statistics/model/wrap/aggregate/data.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/wrap/aggregate/data.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/wrap/aggregate/data.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::wrap::aggregate::data.hpp //
+// statistics::model::wrap::aggregate::data.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -16,14 +16,14 @@
         
     template<typename X,typename Y>
     class data_ :
- public covariate_<X>,
- public response_<Y>
+ public covariate_wrapper<X>,
+ public response_wrapper<Y>
     {
- typedef covariate_<X> cov_;
- typedef response_<Y> resp_;
+ typedef covariate_wrapper<X> cov_;
+ typedef response_wrapper<Y> resp_;
 
     public:
- typedef data_<X,Y> data_w_;
+ typedef data_<X,Y> data__type;
         
         // Construction
         data_();
@@ -38,7 +38,8 @@
     data_<X,Y>::data_() : cov_(),resp_(){}
         
     template<typename X,typename Y>
- data_<X,Y>::data_( cov_ cov, resp_ resp ) : cov_( cov ), resp_( resp ){}
+ data_<X,Y>::data_( cov_ cov, resp_ resp )
+ : cov_( cov ), resp_( resp ){}
         
     template<typename X,typename Y>
     data_<X,Y>::data_(const data_& that)

Modified: sandbox/statistics/model/boost/statistics/model/wrap/aggregate/dataset.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/wrap/aggregate/dataset.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/wrap/aggregate/dataset.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::wrap::aggregate::dataset.hpp //
+// statistics::model::wrap::aggregate::dataset.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -16,14 +16,14 @@
         
     template<typename Rx,typename Ry>
     class dataset_ :
- public covariates_<Rx>,
- public responses_<Ry>
+ public covariates_wrapper<Rx>,
+ public responses_wrapper<Ry>
     {
- typedef covariates_<Rx> covs_;
- typedef responses_<Ry> resps_;
+ typedef covariates_wrapper<Rx> covs_;
+ typedef responses_wrapper<Ry> resps_;
 
         public:
- typedef dataset_<Rx,Ry> dataset_w_;
+ typedef dataset_<Rx,Ry> dataset_type;
         
         // Construction
         dataset_();

Modified: sandbox/statistics/model/boost/statistics/model/wrap/aggregate/model_covariate_parameter.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/wrap/aggregate/model_covariate_parameter.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/wrap/aggregate/model_covariate_parameter.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::wrap::aggregate::model_covariate_parameter.hpp //
+// statistics::model::wrap::aggregate::model_covariate_parameter.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -17,31 +17,35 @@
     template<typename M,typename X,typename P>
     class model_covariate_parameter_ :
         public model_parameter_<M,P>,
- public covariate_<X>
+ public covariate_wrapper<X>
     {
- typedef model_parameter_<M,P> model_parameter_;
- typedef covariate_<X> covariate_;
+ typedef model_parameter_<M,P> model_parameter_;
+ typedef covariate_wrapper<X> covariate_;
 
         public:
 
- typedef model_covariate_parameter_<M,X,P> model_covariate_parameter_w_;
+ typedef model_covariate_parameter_<M,X,P>
+ model_covariate_parameter_type;
             
         // Construction
         model_covariate_parameter_();
         model_covariate_parameter_(model_parameter_ mp,covariate_ cov);
         model_covariate_parameter_(
- typename model_parameter_::model_w_ model,
+ typename model_parameter_::model_wrapper_type model,
             covariate_ cov,
- typename model_parameter_::parameter_w_ par
+ typename model_parameter_::parameter_wrapper_type par
+ );
+ model_covariate_parameter_(
+ const model_covariate_parameter_&
         );
- model_covariate_parameter_(const model_covariate_parameter_&);
             
     };
 
     // Implementation //
             
     template<typename M,typename X,typename P>
- model_covariate_parameter_<M,X,P>::model_covariate_parameter_()
+ model_covariate_parameter_<M,X,P>
+ ::model_covariate_parameter_()
     : model_parameter_(),covariate_(){}
         
     template<typename M,typename X,typename P>
@@ -52,9 +56,9 @@
 
     template<typename M,typename X,typename P>
     model_covariate_parameter_<M,X,P>::model_covariate_parameter_(
- typename model_parameter_::model_w_ m,
+ typename model_parameter_::model_wrapper_type m,
         covariate_ cov,
- typename model_parameter_::parameter_w_ p
+ typename model_parameter_::parameter_wrapper_type p
     )
      : model_parameter_( m, p ), covariate_( cov ){}
         

Modified: sandbox/statistics/model/boost/statistics/model/wrap/aggregate/model_data.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/wrap/aggregate/model_data.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/wrap/aggregate/model_data.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::wrap::aggregate::model_data.hpp //
+// statistics::model::wrap::aggregate::model_data.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -16,21 +16,21 @@
         
     template<typename M,typename X,typename Y>
     class model_data_ :
- public model_<M>,
+ public model_wrapper<M>,
         public data_<X,Y>
     {
- typedef model_<M> model_;
+ typedef model_wrapper<M> model_;
         typedef data_<X,Y> data_;
     public:
- typedef model_data_<M,X,Y> model_data_w_;
+ typedef model_data_<M,X,Y> model_data_type;
             
         // Construction
         model_data_();
         model_data_(model_ model,data_ data);
         model_data_(
             model_ model,
- typename data_::covariate_w_ cov,
- typename data_::response_w_ resp
+ typename data_::covariate_wrapper_type cov,
+ typename data_::response_wrapper_type resp
         );
         model_data_(const model_data_&);
             
@@ -44,8 +44,8 @@
     template<typename M,typename X,typename Y>
     model_data_<M,X,Y>::model_data_(
             model_ model,
- typename data_::covariate_w_ covs,
- typename data_::response_w_ resps
+ typename data_::covariate_wrapper_type covs,
+ typename data_::response_wrapper_type resps
     ) : model_( model ), data_ (covs,resps) {}
         
     template<typename M,typename X,typename Y>

Modified: sandbox/statistics/model/boost/statistics/model/wrap/aggregate/model_dataset.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/wrap/aggregate/model_dataset.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/wrap/aggregate/model_dataset.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::wrap::aggregate::model_dataset.hpp //
+// statistics::model::wrap::aggregate::model_dataset.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -16,21 +16,21 @@
         
     template<typename M,typename Rx,typename Ry>
     class model_dataset_ :
- public model_<M>,
- public dataset_<Rx,Ry>
+ public model_wrapper<M>,
+ public dataset_<Rx,Ry>
     {
- typedef model_<M> model_;
+ typedef model_wrapper<M> model_;
         typedef dataset_<Rx,Ry> dataset_;
     public:
- typedef model_dataset_<M,Rx,Ry> model_dataset_w_;
+ typedef model_dataset_<M,Rx,Ry> model_dataset_type;
             
         // Construction
         model_dataset_();
         model_dataset_(model_ model,dataset_ dataset);
         model_dataset_(
             model_ model,
- typename dataset_::covariates_w_ covs,
- typename dataset_::responses_w_ resps
+ typename dataset_::covariates_wrapper_type covs,
+ typename dataset_::responses_wrapper_type resps
         );
         model_dataset_(const model_dataset_&);
             
@@ -39,17 +39,19 @@
     // Implementation //
             
     template<typename M,typename Rx,typename Ry>
- model_dataset_<M,Rx,Ry>::model_dataset_() : model_(),dataset_(){}
+ model_dataset_<M,Rx,Ry>::model_dataset_()
+ : model_(),dataset_(){}
         
     template<typename M,typename Rx,typename Ry>
     model_dataset_<M,Rx,Ry>::model_dataset_(
             model_ model,
- typename dataset_::covariates_w_ covs,
- typename dataset_::responses_w_ resps
+ typename dataset_::covariates_wrapper_type covs,
+ typename dataset_::responses_wrapper_type resps
     ) : model_( model ), dataset_ (covs,resps) {}
         
     template<typename M,typename Rx,typename Ry>
- model_dataset_<M,Rx,Ry>::model_dataset_(const model_dataset_& that)
+ model_dataset_<M,Rx,Ry>::model_dataset_(
+ const model_dataset_& that)
     :model_( that ),dataset_( that ) {}
 
     // Free functions

Modified: sandbox/statistics/model/boost/statistics/model/wrap/aggregate/model_parameter.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/wrap/aggregate/model_parameter.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/wrap/aggregate/model_parameter.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::wrap::aggregate::model_parameter.hpp //
+// statistics::model::wrap::aggregate::model_parameter.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -16,15 +16,15 @@
         
     template<typename M,typename P>
     class model_parameter_ :
- public model_<M>,
- public parameter_<P>
+ public model_wrapper<M>,
+ public parameter_wrapper<P>
     {
- typedef model_<M> model_;
- typedef parameter_<P> parameter_;
+ typedef model_wrapper<M> model_;
+ typedef parameter_wrapper<P> parameter_;
 
     public:
 
- typedef model_parameter_<M,P> model_parameter_w_;
+ typedef model_parameter_<M,P> model_parameter_type;
             
         // Construction
         model_parameter_();

Modified: sandbox/statistics/model/boost/statistics/model/wrap/aggregate/prior_model_dataset.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/wrap/aggregate/prior_model_dataset.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/wrap/aggregate/prior_model_dataset.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::wrap::aggregate::prior_model_dataset.hpp //
+// statistics::model::wrap::aggregate::prior_model_dataset.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -16,22 +16,22 @@
         
     template<typename D,typename M,typename Rx,typename Ry>
     class prior_model_dataset_ :
- public prior_<D>,
+ public prior_wrapper<D>,
         public model_dataset_<M,Rx,Ry>
     {
- typedef prior_<D> prior_;
+ typedef prior_wrapper<D> prior_;
         typedef model_dataset_<M,Rx,Ry> model_dataset_;
     public:
- typedef prior_model_dataset_<D,M,Rx,Ry> prior_model_dataset_w_;
+ typedef prior_model_dataset_<D,M,Rx,Ry> prior_model_dataset_type;
             
         // Construction
         prior_model_dataset_();
         prior_model_dataset_(prior_ prior,model_dataset_ model_dataset);
         prior_model_dataset_(
             prior_ prior,
- typename model_dataset_::model_w_ m,
- typename model_dataset_::covariates_w_ covs,
- typename model_dataset_::responses_w_ resps
+ typename model_dataset_::model_wrapper_type m,
+ typename model_dataset_::covariates_wrapper_type covs,
+ typename model_dataset_::responses_wrapper_type resps
         );
         prior_model_dataset_(const prior_model_dataset_&);
             
@@ -46,9 +46,9 @@
     template<typename D,typename M,typename Rx,typename Ry>
     prior_model_dataset_<D,M,Rx,Ry>::prior_model_dataset_(
             prior_ prior,
- typename model_dataset_::model_w_ m,
- typename model_dataset_::covariates_w_ covs,
- typename model_dataset_::responses_w_ resps
+ typename model_dataset_::model_wrapper_type m,
+ typename model_dataset_::covariates_wrapper_type covs,
+ typename model_dataset_::responses_wrapper_type resps
     ) : prior_( prior ), model_dataset_ ( m, covs, resps) {}
         
     template<typename D,typename M,typename Rx,typename Ry>
@@ -60,7 +60,12 @@
         
     template<typename D,typename M,typename Rx,typename Ry>
     prior_model_dataset_<D,M,Rx,Ry>
- make_prior_model_dataset(const D& d,const M& m,const Rx& rx,const Ry& ry){
+ make_prior_model_dataset(
+ const D& d,
+ const M& m,
+ const Rx& rx,
+ const Ry& ry
+ ){
         typedef prior_model_dataset_<D,M,Rx,Ry> result_type;
         return result_type(d,m,rx,ry);
     }

Modified: sandbox/statistics/model/boost/statistics/model/wrap/include.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/wrap/include.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/wrap/include.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::wrap::include.hpp //
+// statistics::model::wrap::include.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //

Modified: sandbox/statistics/model/boost/statistics/model/wrap/unary/covariate.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/wrap/unary/covariate.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/wrap/unary/covariate.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::wrap::unary::covariate.hpp //
+// statistics::model::wrap::unary::covariate.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -14,17 +14,17 @@
 namespace model{
         
     template<typename X>
- class covariate_ : detail::base_<X>{
+ class covariate_wrapper : detail::base_<X>{
         typedef detail::base_<X> base_;
     public:
         typedef X covariate_type;
- typedef covariate_<X> covariate_w_;
+ typedef covariate_wrapper<X> covariate_wrapper_type;
             
         // Construction
- covariate_();
- covariate_(const X& x);
- covariate_(const covariate_&);
-
+ covariate_wrapper();
+ covariate_wrapper(const X& x);
+ covariate_wrapper(const covariate_wrapper&);
+
         // Access
         const X& covariate()const;
     };
@@ -32,24 +32,25 @@
     // Implementation //
             
     template<typename X>
- covariate_<X>::covariate_() : base_(){}
+ covariate_wrapper<X>::covariate_wrapper() : base_(){}
         
     template<typename X>
- covariate_<X>::covariate_( const X& x ) : base_(x){}
+ covariate_wrapper<X>::covariate_wrapper( const X& x ) : base_(x){}
         
     template<typename X>
- covariate_<X>::covariate_(const covariate_& that)
+ covariate_wrapper<X>::covariate_wrapper(const covariate_wrapper& that)
     :base_(that){}
 
     template<typename X>
- const X& covariate_<X>::covariate()const{ return (this->value); }
+ const X&
+ covariate_wrapper<X>::covariate()const{ return (this->value); }
                 
     // Free functions
         
     template<typename X>
- covariate_<X>
- make_covariate_(const X& x){
- typedef covariate_<X> result_type;
+ covariate_wrapper<X>
+ make_covariate_wrapper(const X& x){
+ typedef covariate_wrapper<X> result_type;
         return result_type(x);
     }
 

Modified: sandbox/statistics/model/boost/statistics/model/wrap/unary/covariates.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/wrap/unary/covariates.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/wrap/unary/covariates.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::wrap::unary::covariates.hpp //
+// statistics::model::wrap::unary::covariates.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -14,16 +14,16 @@
 namespace model{
         
     template<typename Rx>
- class covariates_ : detail::base_<Rx>{
+ class covariates_wrapper : detail::base_<Rx>{
         typedef detail::base_<Rx> base_;
     public:
- typedef Rx covariates_type;
- typedef covariates_<Rx> covariates_w_;
+ typedef Rx covariates_type;
+ typedef covariates_wrapper<Rx> covariates_wrapper_type;
 
         // Construction
- covariates_();
- covariates_(const Rx& x);
- covariates_(const covariates_&);
+ covariates_wrapper();
+ covariates_wrapper(const Rx& x);
+ covariates_wrapper(const covariates_wrapper&);
             
         // Access
         const Rx& covariates()const;
@@ -32,24 +32,26 @@
     // Implementation //
             
     template<typename Rx>
- covariates_<Rx>::covariates_() : base_(){}
+ covariates_wrapper<Rx>::covariates_wrapper() : base_(){}
         
     template<typename Rx>
- covariates_<Rx>::covariates_( const Rx& rx ) : base_(rx){}
+ covariates_wrapper<Rx>::covariates_wrapper( const Rx& rx ) : base_(rx){}
         
     template<typename Rx>
- covariates_<Rx>::covariates_(const covariates_& that)
+ covariates_wrapper<Rx>::covariates_wrapper(const covariates_wrapper& that)
     :base_(that){}
 
     template<typename Rx>
- const Rx& covariates_<Rx>::covariates()const{ return (this->value); }
+ const Rx& covariates_wrapper<Rx>::covariates()const{
+ return (this->value);
+ }
                 
     // Free functions
         
     template<typename Rx>
- covariates_<Rx>
- make_covariates(const Rx& rx){
- typedef covariates_<Rx> result_type;
+ covariates_wrapper<Rx>
+ make_covariates_wrapper(const Rx& rx){
+ typedef covariates_wrapper<Rx> result_type;
         return result_type(rx);
     }
 

Modified: sandbox/statistics/model/boost/statistics/model/wrap/unary/detail/base.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/wrap/unary/detail/base.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/wrap/unary/detail/base.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::wrap::unary::detail::base.hpp //
+// statistics::model::wrap::unary::detail::base.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //

Modified: sandbox/statistics/model/boost/statistics/model/wrap/unary/model.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/wrap/unary/model.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/wrap/unary/model.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::wrap::unary::model.hpp //
+// statistics::model::wrap::unary::model.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -14,16 +14,16 @@
 namespace model{
 
     template<typename M>
- class model_ : detail::base_<M>{
+ class model_wrapper : detail::base_<M>{
         typedef detail::base_<M> base_;
     public:
- typedef M model_type;
- typedef model_<M> model_w_;
+ typedef M model_type;
+ typedef model_wrapper<M> model_wrapper_type;
             
         // Construction
- model_();
- model_(const M& m);
- model_(const model_&);
+ model_wrapper();
+ model_wrapper(const M& m);
+ model_wrapper(const model_wrapper&);
             
         // Access
         const M& model()const;
@@ -32,24 +32,24 @@
     // Implementation //
             
     template<typename M>
- model_<M>::model_() : base_(){}
+ model_wrapper<M>::model_wrapper() : base_(){}
         
     template<typename M>
- model_<M>::model_( const M& m ) : base_(m){}
+ model_wrapper<M>::model_wrapper( const M& m ) : base_(m){}
         
     template<typename M>
- model_<M>::model_(const model_& that)
+ model_wrapper<M>::model_wrapper(const model_wrapper& that)
     :base_(that){}
 
     template<typename M>
- const M& model_<M>::model()const{ return (this->value); }
+ const M& model_wrapper<M>::model()const{ return (this->value); }
                 
     // Free functions
         
     template<typename M>
- model_<M>
- make_model(const M& m){
- typedef model_<M> result_type;
+ model_wrapper<M>
+ make_model_wrapper(const M& m){
+ typedef model_wrapper<M> result_type;
         return result_type(m);
     }
 

Modified: sandbox/statistics/model/boost/statistics/model/wrap/unary/parameter.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/wrap/unary/parameter.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/wrap/unary/parameter.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::wrap::unary::parameter.hpp //
+// statistics::model::wrap::unary::parameter.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -14,16 +14,16 @@
 namespace model{
         
     template<typename X>
- class parameter_ : detail::base_<X>{
+ class parameter_wrapper : detail::base_<X>{
         typedef detail::base_<X> base_;
     public:
- typedef X parameter_type;
- typedef parameter_<X> parameter_w_;
+ typedef X parameter_type;
+ typedef parameter_wrapper<X> parameter_wrapper_type;
             
         // Construction
- parameter_();
- parameter_(const X& x);
- parameter_(const parameter_&);
+ parameter_wrapper();
+ parameter_wrapper(const X& x);
+ parameter_wrapper(const parameter_wrapper&);
             
         // Access
         const X& parameter()const;
@@ -32,24 +32,24 @@
     // Implementation //
             
     template<typename X>
- parameter_<X>::parameter_() : base_(){}
+ parameter_wrapper<X>::parameter_wrapper() : base_(){}
         
     template<typename X>
- parameter_<X>::parameter_( const X& x ) : base_(x){}
+ parameter_wrapper<X>::parameter_wrapper( const X& x ) : base_(x){}
         
     template<typename X>
- parameter_<X>::parameter_(const parameter_& that)
+ parameter_wrapper<X>::parameter_wrapper(const parameter_wrapper& that)
     :base_(that){}
 
     template<typename X>
- const X& parameter_<X>::parameter()const{ return (this->value); }
+ const X& parameter_wrapper<X>::parameter()const{ return (this->value); }
                 
     // Free functions
         
     template<typename X>
- parameter_<X>
- make_parameter(const X& x){
- typedef parameter_<X> result_type;
+ parameter_wrapper<X>
+ make_parameter_wrapper(const X& x){
+ typedef parameter_wrapper<X> result_type;
         return result_type(x);
     }
 

Modified: sandbox/statistics/model/boost/statistics/model/wrap/unary/prior.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/wrap/unary/prior.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/wrap/unary/prior.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// prior::wrap::unary::prior.hpp //
+// statistics::model::prior::wrap::unary::prior.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -14,17 +14,17 @@
 namespace model{
         
     template<typename D>
- class prior_ : detail::base_<D>{
+ class prior_wrapper : detail::base_<D>{
         typedef detail::base_<D> base_;
     public:
         typedef D prior_type;
- typedef prior_<D> prior_w_;
+ typedef prior_wrapper<D> prior_wrapper_type;
 
             
         // Construction
- prior_();
- prior_(const D& d);
- prior_(const prior_&);
+ prior_wrapper();
+ prior_wrapper(const D& d);
+ prior_wrapper(const prior_wrapper&);
             
         // Access
         const D& prior()const;
@@ -33,24 +33,24 @@
     // Implementation //
             
     template<typename D>
- prior_<D>::prior_() : base_(){}
+ prior_wrapper<D>::prior_wrapper() : base_(){}
         
     template<typename D>
- prior_<D>::prior_( const D& d ) : base_(d){}
+ prior_wrapper<D>::prior_wrapper( const D& d ) : base_(d){}
         
     template<typename D>
- prior_<D>::prior_(const prior_& that)
+ prior_wrapper<D>::prior_wrapper(const prior_wrapper& that)
     :base_(that){}
 
     template<typename D>
- const D& prior_<D>::prior()const{ return (this->value); }
+ const D& prior_wrapper<D>::prior()const{ return (this->value); }
                 
     // Free functions
         
     template<typename D>
- prior_<D>
- make_prior(const D& d){
- typedef prior_<D> result_type;
+ prior_wrapper<D>
+ make_prior_wrapper(const D& d){
+ typedef prior_wrapper<D> result_type;
         return result_type(d);
     }
 

Modified: sandbox/statistics/model/boost/statistics/model/wrap/unary/response.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/wrap/unary/response.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/wrap/unary/response.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::wrap::unary::response.hpp //
+// statistics::model::wrap::unary::response.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -14,16 +14,16 @@
 namespace model{
         
     template<typename Y>
- class response_ : detail::base_<Y>{
+ class response_wrapper : detail::base_<Y>{
         typedef detail::base_<Y> base_;
     public:
- typedef Y response_type;
- typedef response_<Y> response_w_;
+ typedef Y response_type;
+ typedef response_wrapper<Y> response_wrapper_type;
             
         // Construction
- response_();
- response_(const Y& y);
- response_(const response_&);
+ response_wrapper();
+ response_wrapper(const Y& y);
+ response_wrapper(const response_wrapper&);
             
         // Access
         const Y& response()const;
@@ -32,24 +32,26 @@
     // Implementation //
             
     template<typename Y>
- response_<Y>::response_() : base_(){}
+ response_wrapper<Y>::response_wrapper() : base_(){}
         
     template<typename Y>
- response_<Y>::response_( const Y& y ) : base_(y){}
+ response_wrapper<Y>::response_wrapper( const Y& y ) : base_(y){}
         
     template<typename Y>
- response_<Y>::response_(const response_& that)
+ response_wrapper<Y>::response_wrapper(const response_wrapper& that)
     :base_(that){}
 
     template<typename Y>
- const Y& response_<Y>::response()const{ return (this->value); }
+ const Y& response_wrapper<Y>::response()const{
+ return (this->value);
+ }
                 
     // Free functions
         
     template<typename Y>
- response_<Y>
- make_response(const Y& y){
- typedef response_<Y> result_type;
+ response_wrapper<Y>
+ make_response_wrapper(const Y& y){
+ typedef response_wrapper<Y> result_type;
         return result_type(y);
     }
 

Modified: sandbox/statistics/model/boost/statistics/model/wrap/unary/responses.hpp
==============================================================================
--- sandbox/statistics/model/boost/statistics/model/wrap/unary/responses.hpp (original)
+++ sandbox/statistics/model/boost/statistics/model/wrap/unary/responses.hpp 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// model::wrap::unary::responses.hpp //
+// statistics::model::wrap::unary::responses.hpp //
 // //
 // Copyright 2009 Erwann Rogard. Distributed under the Boost //
 // Software License, Version 1.0. (See accompanying file //
@@ -14,16 +14,16 @@
 namespace model{
         
     template<typename Ry>
- class responses_ : detail::base_<Ry>{
+ class responses_wrapper : detail::base_<Ry>{
         typedef detail::base_<Ry> base_;
     public:
- typedef Ry responses_type;
- typedef responses_<Ry> responses_w_;
+ typedef Ry responses_type;
+ typedef responses_wrapper<Ry> responses_wrapper_type;
             
         // Construction
- responses_();
- responses_(const Ry& x);
- responses_(const responses_&);
+ responses_wrapper();
+ responses_wrapper(const Ry& x);
+ responses_wrapper(const responses_wrapper&);
             
         // Access
         const Ry& responses()const;
@@ -32,24 +32,26 @@
     // Implementation //
             
     template<typename Ry>
- responses_<Ry>::responses_() : base_(){}
+ responses_wrapper<Ry>::responses_wrapper() : base_(){}
         
     template<typename Ry>
- responses_<Ry>::responses_( const Ry& ry ) : base_(ry){}
+ responses_wrapper<Ry>::responses_wrapper( const Ry& ry ) : base_(ry){}
         
     template<typename Ry>
- responses_<Ry>::responses_(const responses_& that)
+ responses_wrapper<Ry>::responses_wrapper(const responses_wrapper& that)
     :base_(that){}
 
     template<typename Ry>
- const Ry& responses_<Ry>::responses()const{ return (this->value); }
+ const Ry& responses_wrapper<Ry>::responses()const{
+ return (this->value);
+ }
                 
     // Free functions
         
     template<typename Ry>
- responses_<Ry>
- make_responses(const Ry& ry){
- typedef responses_<Ry> result_type;
+ responses_wrapper<Ry>
+ make_responses_wrapper(const Ry& ry){
+ typedef responses_wrapper<Ry> result_type;
         return result_type(ry);
     }
 

Modified: sandbox/statistics/model/libs/statistics/model/doc/readme.txt
==============================================================================
--- sandbox/statistics/model/libs/statistics/model/doc/readme.txt (original)
+++ sandbox/statistics/model/libs/statistics/model/doc/readme.txt 2009-10-23 10:51:31 EDT (Fri, 23 Oct 2009)
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// statistics::modeldoc::readme //
+// statistics::model::doc::readme //
 // //
 // (C) Copyright 2009 Erwann Rogard //
 // Use, modification and distribution are subject to the //
@@ -23,6 +23,8 @@
 ii) STL-like algorithms for computing likelihoods or posterior distributions,
 by aggretating the contributions of data-units in an (for now) iid setting.
 
+iii) An importance_sampler
+
 Examples can be found in statistics/survival/libs/example
 
 [ Compiler ]
@@ -36,6 +38,8 @@
 /sandbox/statistics/scalar_dist/
 /sandbox/statistics/joint_dist/
 /sandbox/statistics/binary_op/
+/sandbox/statistics/importance_sampling/
+/sandbox/statistics/importance_weights/
 
 [ History ]
 
@@ -71,17 +75,20 @@
 
 [ Concepts ]
 
-- Model
+- HasLogLikelihood
     m models Model iff
     Expression Return type
     log_likelihood(make_model_data(m,x,y),p) T
-- LPdf
+
+- HasLogUnnormalizedPdf
     d models LPdf iff
     Expression Returns
     log_unnormalized_pdf(d,p) T
 
-Those D such that is_scalar_dist<D> or joint_dist<D> evaluates to true model
-LPdf. Check directory unscope in either package.
+Note that :
+- is_scalar_dist<D> => HasLogUnnormalizedPdf
+- joint_dist<D> => HasLogUnnormalizedPdf
+See unscope in either package.
 
 [ wrap ]
     Example of wrappers:


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