[Boost-commit] svn:boost r56068 - in sandbox/statistics/survival_data: boost/statistics/survival/data/meta boost/statistics/survival/data/random libs/statistics/survival/data/doc libs/statistics/survival/data/example

Subject: [Boost-commit] svn:boost r56068 - in sandbox/statistics/survival_data: boost/statistics/survival/data/meta boost/statistics/survival/data/random libs/statistics/survival/data/doc libs/statistics/survival/data/example
From: erwann.rogard_at_[hidden]
Date: 2009-09-06 12:15:20

Author: e_r
Date: 2009-09-06 12:15:19 EDT (Sun, 06 Sep 2009)
New Revision: 56068
URL: http://svn.boost.org/trac/boost/changeset/56068

Log:
m
Text files modified: 
   sandbox/statistics/survival_data/boost/statistics/survival/data/meta/failure_random.hpp |     8 ++++++--                                
   sandbox/statistics/survival_data/boost/statistics/survival/data/random/batch.hpp        |     6 +++---                                  
   sandbox/statistics/survival_data/boost/statistics/survival/data/random/failure_time.hpp |     5 +++++                                   
   sandbox/statistics/survival_data/libs/statistics/survival/data/doc/readme.txt           |    18 ++++++++++--------                      
   sandbox/statistics/survival_data/libs/statistics/survival/data/example/random.cpp       |     4 ++--                                    
   5 files changed, 26 insertions(+), 15 deletions(-)

Modified: sandbox/statistics/survival_data/boost/statistics/survival/data/meta/failure_random.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/statistics/survival/data/meta/failure_random.hpp	(original)
+++ sandbox/statistics/survival_data/boost/statistics/survival/data/meta/failure_random.hpp	2009-09-06 12:15:19 EDT (Sun, 06 Sep 2009)
@@ -31,13 +31,17 @@
 
     template<typename M,typename X,typename P>
     typename meta_failure_random<M>::type 
-    make_failure_random(boost::statistics::model::model_covariate_parameter_<M,X,P>);
+    make_failure_random(
+        boost::statistics::model::model_covariate_parameter_<M,X,P>
+    );
 
     // Implementation //
 
     template<typename M,typename X,typename P>
     typename meta_failure_random<M>::type 
-    make_failure_random(boost::statistics::model::model_covariate_parameter_<M,X,P> mcp){
+    make_failure_random(
+        boost::statistics::model::model_covariate_parameter_<M,X,P> mcp
+    ){
         typedef meta_failure_random<M>                              map_;
         typedef typename map_::map2_                                map2_;
         return map2_::make(

Modified: sandbox/statistics/survival_data/boost/statistics/survival/data/random/batch.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/statistics/survival/data/random/batch.hpp	(original)
+++ sandbox/statistics/survival_data/boost/statistics/survival/data/random/batch.hpp	2009-09-06 12:15:19 EDT (Sun, 06 Sep 2009)
@@ -39,15 +39,15 @@
         typename RdX,  // RandomDistribution                // covariate
         typename I = typename meta::random_input<M>::type
     >
-    class batch : public model::model_parameter_<M,P>{
+    class batch : public statistics::model::model_parameter_<M,P>{
         public:
         typedef T                                           value_type;
         typedef I                                           input_type; 
         typedef record<value_type>                          result_type;
         typedef typename RdX::result_type                   covariate_type;
 
-        typedef model::model_parameter_<M,P>                model_parameter_;
-        typedef model::model_covariate_parameter_<M,covariate_type,P> 
+        typedef statistics::model::model_parameter_<M,P>    model_parameter_;
+        typedef statistics::model::model_covariate_parameter_<M,covariate_type,P> 
                                                 model_covariate_parameter_;
 
         // Constructor

Modified: sandbox/statistics/survival_data/boost/statistics/survival/data/random/failure_time.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/statistics/survival/data/random/failure_time.hpp	(original)
+++ sandbox/statistics/survival_data/boost/statistics/survival/data/random/failure_time.hpp	2009-09-06 12:15:19 EDT (Sun, 06 Sep 2009)
@@ -10,6 +10,7 @@
 #include <boost/dist_random/include.hpp>
 #include <boost/statistics/model/wrap/aggregate/model_covariate_parameter.hpp>
 #include <boost/statistics/survival/data/meta/failure_distribution.hpp>
+#include <boost/statistics/survival/model/concept/random_failure.hpp>
 
 namespace boost{
 namespace statistics{
@@ -34,6 +35,10 @@
         boost::statistics::model::model_covariate_parameter_<M,X,P> mcp,
         U& urng
     ){
+        BOOST_CONCEPT_ASSERT((
+            survival::model::RandomFailure<T,M,X,P,U>
+        ));
+    
         return make_failure_random(mcp)(urng);
     }
  

Modified: sandbox/statistics/survival_data/libs/statistics/survival/data/doc/readme.txt
==============================================================================
--- sandbox/statistics/survival_data/libs/statistics/survival/data/doc/readme.txt	(original)
+++ sandbox/statistics/survival_data/libs/statistics/survival/data/doc/readme.txt	2009-09-06 12:15:19 EDT (Sun, 06 Sep 2009)
@@ -23,19 +23,21 @@
 [ Dependencies ]
 
 /boost_1_39_0/ 
-/sandbox/statistics/joint_dist/ 
-/sandbox/statistics/survival_model/ 
+/sandbox/statistics/arithmetic/ 
+/sandbox/statistics/binary_op/ 
+/sandbox/statistics/dist_random/ 
 /sandbox/statistics/empirical_cdf/ 
 /sandbox/statistics/matrix_view/ 
-/sandbox/statistics/empirical_cdf/ 
-/sandbox/statistics/random/ 
-/sandbox/statistics/scalar_dist/ 
-/sandbox/statistics/dist_random/ 
-/sandbox/statistics/binary_op/ 
 /sandbox/statistics/functional/ 
-/sandbox/statistics/arithmetic/ 
 /sandbox/statistics/iterator/ 
+/sandbox/statistics/importance_weights/
+/sandbox/statistics/importance_sampling/
+/sandbox/statistics/joint_dist/ 
+/sandbox/statistics/random/ 
+/sandbox/statistics/scalar_dist/ 
 /sandbox/statistics/standard_distribution/ 
+/sandbox/statistics/survival_model/ 
+
 
 Link to : libboost_serialization-xgcc42-mt-1_39.a
 

Modified: sandbox/statistics/survival_data/libs/statistics/survival/data/example/random.cpp
==============================================================================
--- sandbox/statistics/survival_data/libs/statistics/survival/data/example/random.cpp	(original)
+++ sandbox/statistics/survival_data/libs/statistics/survival/data/example/random.cpp	2009-09-06 12:15:19 EDT (Sun, 06 Sep 2009)
@@ -163,7 +163,7 @@
             par_ par = boost::sample(mprior,urng);
             oa_pars << par; 
             ofs_pars.flush();
-            meta_batch_::rcov_ r = meta_batch_::rcov(
+            meta_batch_::rcov_ r_x = meta_batch_::rcov(
                 x_vals,
                 0,
                 n_record
@@ -172,7 +172,7 @@
                 model,
                 par,
                 clock, 
-                r
+                r_x
             );
             true_pars.push_back( par );
             vg_r vg_r( urng, batch );