|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r55943 - in sandbox/statistics/survival_model: boost/survival/model boost/survival/model/meta boost/survival/model/models/exponential boost/survival/model/models/exponential/detail libs/survival/model/doc libs/survival/model/example
From: erwann.rogard_at_[hidden]
Date: 2009-08-31 21:32:33
Author: e_r
Date: 2009-08-31 21:32:32 EDT (Mon, 31 Aug 2009)
New Revision: 55943
URL: http://svn.boost.org/trac/boost/changeset/55943
Log:
m
Text files modified:
sandbox/statistics/survival_model/boost/survival/model/include.hpp | 4 ++--
sandbox/statistics/survival_model/boost/survival/model/meta/data.hpp | 12 +++++++-----
sandbox/statistics/survival_model/boost/survival/model/meta/include.hpp | 4 ++--
sandbox/statistics/survival_model/boost/survival/model/meta/model_data.hpp | 12 +++++++-----
sandbox/statistics/survival_model/boost/survival/model/meta/response.hpp | 10 ++++++----
sandbox/statistics/survival_model/boost/survival/model/models/exponential/detail/log_likelihood.hpp | 9 ++++++---
sandbox/statistics/survival_model/boost/survival/model/models/exponential/include.hpp | 4 ++--
sandbox/statistics/survival_model/boost/survival/model/models/exponential/log_likelihood.hpp | 6 ++++--
sandbox/statistics/survival_model/boost/survival/model/models/exponential/meta_failure_distribution.hpp | 11 +++++++----
sandbox/statistics/survival_model/boost/survival/model/models/exponential/model.hpp | 7 +++++--
sandbox/statistics/survival_model/libs/survival/model/doc/readme.txt | 2 +-
sandbox/statistics/survival_model/libs/survival/model/example/exponential.cpp | 3 ++-
sandbox/statistics/survival_model/libs/survival/model/example/posterior_analysis.cpp | 13 +++++++------
13 files changed, 58 insertions(+), 39 deletions(-)
Modified: sandbox/statistics/survival_model/boost/survival/model/include.hpp
==============================================================================
--- sandbox/statistics/survival_model/boost/survival/model/include.hpp (original)
+++ sandbox/statistics/survival_model/boost/survival/model/include.hpp 2009-08-31 21:32:32 EDT (Mon, 31 Aug 2009)
@@ -5,8 +5,8 @@
// 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_SURVIVAL_MODEL_INCLUDE_HPP_ER_2009
-#define BOOST_SURVIVAL_MODEL_INCLUDE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_MODEL_INCLUDE_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_MODEL_INCLUDE_HPP_ER_2009
#include <boost/survival/model/meta/wrap.hpp>
#include <boost/survival/model/functional/prepare_weights.hpp>
Modified: sandbox/statistics/survival_model/boost/survival/model/meta/data.hpp
==============================================================================
--- sandbox/statistics/survival_model/boost/survival/model/meta/data.hpp (original)
+++ sandbox/statistics/survival_model/boost/survival/model/meta/data.hpp 2009-08-31 21:32:32 EDT (Mon, 31 Aug 2009)
@@ -5,12 +5,13 @@
// 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_SURVIVAL_MODEL_META_DATA_HPP_ER_2009
-#define BOOST_SURVIVAL_MODEL_META_DATA_HPP_ER_2009
-#include <boost/model/wrap/aggregate/data.hpp>
+#ifndef BOOST_STATISTICS_SURVIVAL_MODEL_META_DATA_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_MODEL_META_DATA_HPP_ER_2009
+#include <boost/statistics/model/wrap/aggregate/data.hpp>
#include <boost/survival/data/data/event.hpp>
namespace boost{
+namespace statistics{
namespace survival{
namespace model{
namespace meta{
@@ -18,13 +19,14 @@
// See statistics/model/libs/doc/readme
template<typename T,typename X>
struct data{
- typedef boost::survival::data::event<T> y_;
- typedef boost::model::data_< X, y_ > type;
+ typedef boost::statistics::survival::data::event<T> y_;
+ typedef boost::statistics::model::data_< X, y_ > type;
};
}// meta
}// model
}// survival
+}// statistics
}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/survival_model/boost/survival/model/meta/include.hpp
==============================================================================
--- sandbox/statistics/survival_model/boost/survival/model/meta/include.hpp (original)
+++ sandbox/statistics/survival_model/boost/survival/model/meta/include.hpp 2009-08-31 21:32:32 EDT (Mon, 31 Aug 2009)
@@ -5,8 +5,8 @@
// 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_SURVIVAL_MODEL_META_INCLUDE_HPP_ER_2009
-#define BOOST_SURVIVAL_MODEL_META_INCLUDE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_MODEL_META_INCLUDE_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_MODEL_META_INCLUDE_HPP_ER_2009
#include <boost/survival/model/meta/data.hpp>
#include <boost/survival/model/meta/response.hpp>
Modified: sandbox/statistics/survival_model/boost/survival/model/meta/model_data.hpp
==============================================================================
--- sandbox/statistics/survival_model/boost/survival/model/meta/model_data.hpp (original)
+++ sandbox/statistics/survival_model/boost/survival/model/meta/model_data.hpp 2009-08-31 21:32:32 EDT (Mon, 31 Aug 2009)
@@ -5,12 +5,13 @@
// 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_SURVIVAL_MODEL_META_MODEL_DATA_HPP_ER_2009
-#define BOOST_SURVIVAL_MODEL_META_MODEL_DATA_HPP_ER_2009
-#include <boost/model/wrap/aggregate/model_data.hpp>
+#ifndef BOOST_STATISTICS_SURVIVAL_MODEL_META_MODEL_DATA_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_MODEL_META_MODEL_DATA_HPP_ER_2009
+#include <boost/statistics/model/wrap/aggregate/model_data.hpp>
#include <boost/survival/data/data/event.hpp>
namespace boost{
+namespace statistics{
namespace survival{
namespace model{
namespace meta{
@@ -18,13 +19,14 @@
// See statistics/model/libs/doc/readme
template<typename T,typename M,typename X>
struct model_data{
- typedef boost::survival::data::event<T> y_;
- typedef boost::model::model_data_< M, X, y_ > type;
+ typedef boost::statistics::survival::data::event<T> y_;
+ typedef boost::statistics::model::model_data_< M, X, y_ > type;
};
}// meta
}// model
}// survival
+}// statistics
}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/survival_model/boost/survival/model/meta/response.hpp
==============================================================================
--- sandbox/statistics/survival_model/boost/survival/model/meta/response.hpp (original)
+++ sandbox/statistics/survival_model/boost/survival/model/meta/response.hpp 2009-08-31 21:32:32 EDT (Mon, 31 Aug 2009)
@@ -5,12 +5,13 @@
// 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_SURVIVAL_MODEL_META_RESPONSE_HPP_ER_2009
-#define BOOST_SURVIVAL_MODEL_META_RESPONSE_HPP_ER_2009
-#include <boost/model/wrap/unary/response.hpp>
+#ifndef BOOST_STATISTICS_SURVIVAL_MODEL_META_RESPONSE_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_MODEL_META_RESPONSE_HPP_ER_2009
+#include <boost/statistics/model/wrap/unary/response.hpp>
#include <boost/survival/data/data/event.hpp>
namespace boost{
+namespace statistics{
namespace survival{
namespace model{
namespace meta{
@@ -19,12 +20,13 @@
template<typename T>
struct response{
typedef survival::data::event<T> y_;
- typedef boost::model::response_<y_> type;
+ typedef boost::statistics::model::response_<y_> type;
};
}// meta
}// model
}// survival
+}// statistics
}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/survival_model/boost/survival/model/models/exponential/detail/log_likelihood.hpp
==============================================================================
--- sandbox/statistics/survival_model/boost/survival/model/models/exponential/detail/log_likelihood.hpp (original)
+++ sandbox/statistics/survival_model/boost/survival/model/models/exponential/detail/log_likelihood.hpp 2009-08-31 21:32:32 EDT (Mon, 31 Aug 2009)
@@ -5,14 +5,16 @@
// 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_SURVIVAL_MODEL_MODELS_EXPONENTIAL_DETAIL_LOG_LIKELIHOOD_HPP_ER_2009
-#define BOOST_SURVIVAL_MODEL_MODELS_EXPONENTIAL_DETAIL_LOG_LIKELIHOOD_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_MODEL_MODELS_EXPONENTIAL_DETAIL_LOG_LIKELIHOOD_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_MODEL_MODELS_EXPONENTIAL_DETAIL_LOG_LIKELIHOOD_HPP_ER_2009
#include <cmath>
#include <stdexcept>
#include <boost/format.hpp>
#include <boost/survival/data/data/event.hpp>
namespace boost{
+namespace statistics{
+
namespace survival{
namespace model{
namespace exponential{
@@ -50,10 +52,11 @@
return result;
}
-}// dlog_rateil
+}// detail
}// exponential
}// model
}// survival
+}// statistics
}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/survival_model/boost/survival/model/models/exponential/include.hpp
==============================================================================
--- sandbox/statistics/survival_model/boost/survival/model/models/exponential/include.hpp (original)
+++ sandbox/statistics/survival_model/boost/survival/model/models/exponential/include.hpp 2009-08-31 21:32:32 EDT (Mon, 31 Aug 2009)
@@ -5,8 +5,8 @@
// 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_SURVIVAL_MODEL_MODELS_EXPONENTIAL_INCLUDE_HPP_ER_2009
-#define BOOST_SURVIVAL_MODEL_MODELS_EXPONENTIAL_INCLUDE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_MODEL_MODELS_EXPONENTIAL_INCLUDE_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_MODEL_MODELS_EXPONENTIAL_INCLUDE_HPP_ER_2009
#include <boost/survival/model/models/exponential/model.hpp>
#include <boost/survival/model/models/exponential/log_likelihood.hpp>
Modified: sandbox/statistics/survival_model/boost/survival/model/models/exponential/log_likelihood.hpp
==============================================================================
--- sandbox/statistics/survival_model/boost/survival/model/models/exponential/log_likelihood.hpp (original)
+++ sandbox/statistics/survival_model/boost/survival/model/models/exponential/log_likelihood.hpp 2009-08-31 21:32:32 EDT (Mon, 31 Aug 2009)
@@ -5,13 +5,14 @@
// 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_SURVIVAL_MODEL_MODELS_EXPONENTIAL_LOG_LIKELIHOOD_HPP_ER_2009
-#define BOOST_SURVIVAL_MODEL_MODELS_EXPONENTIAL_LOG_LIKELIHOOD_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_MODEL_MODELS_EXPONENTIAL_LOG_LIKELIHOOD_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_MODEL_MODELS_EXPONENTIAL_LOG_LIKELIHOOD_HPP_ER_2009
#include <boost/survival/model/meta/model_data.hpp>
#include <boost/survival/model/models/exponential/model.hpp>
#include <boost/survival/model/models/exponential/detail/log_likelihood.hpp>
namespace boost{
+namespace statistics{
namespace model{
// Models Model (sandbox/statistics/model).
@@ -56,6 +57,7 @@
}
}// model
+}// statistics
}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/survival_model/boost/survival/model/models/exponential/meta_failure_distribution.hpp
==============================================================================
--- sandbox/statistics/survival_model/boost/survival/model/models/exponential/meta_failure_distribution.hpp (original)
+++ sandbox/statistics/survival_model/boost/survival/model/models/exponential/meta_failure_distribution.hpp 2009-08-31 21:32:32 EDT (Mon, 31 Aug 2009)
@@ -5,15 +5,17 @@
// 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_SURVIVAL_MODEL_MODELS_META_FAILURE_DISTRIBUTION_HPP_ER_2009
-#define BOOST_SURVIVAL_MODEL_MODELS_META_FAILURE_DISTRIBUTION_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_MODEL_MODELS_META_FAILURE_DISTRIBUTION_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_MODEL_MODELS_META_FAILURE_DISTRIBUTION_HPP_ER_2009
#include <cmath>
-#include <boost/model/wrap/aggregate/model_covariate_parameter.hpp>
+#include <boost/statistics/model/wrap/aggregate/model_covariate_parameter.hpp>
#include <boost/standard_distribution/distributions/exponential.hpp>
#include <boost/survival/data/meta/failure_distribution.hpp>
#include <boost/survival/model/models/exponential/model.hpp>
namespace boost{
+namespace statistics{
+
namespace survival{
namespace data{
@@ -24,7 +26,7 @@
template<typename X,typename P>
static type make(
- boost::model::model_covariate_parameter_<model_,X,P> mcp
+ boost::statistics::model::model_covariate_parameter_<model_,X,P> mcp
){
T lambda = model_::log_rate(
mcp.covariate(),
@@ -41,6 +43,7 @@
}// data
}// survival
+}// statistics
}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/survival_model/boost/survival/model/models/exponential/model.hpp
==============================================================================
--- sandbox/statistics/survival_model/boost/survival/model/models/exponential/model.hpp (original)
+++ sandbox/statistics/survival_model/boost/survival/model/models/exponential/model.hpp 2009-08-31 21:32:32 EDT (Mon, 31 Aug 2009)
@@ -5,8 +5,8 @@
// 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_SURVIVAL_MODEL_MODELS_EXPONENTIAL_MODEL_HPP_ER_2009
-#define BOOST_SURVIVAL_MODEL_MODELS_EXPONENTIAL_MODEL_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_MODEL_MODELS_EXPONENTIAL_MODEL_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_MODEL_MODELS_EXPONENTIAL_MODEL_HPP_ER_2009
#include <numeric>
#include <boost/mpl/assert.hpp>
#include <boost/archive/text_oarchive.hpp>
@@ -16,6 +16,8 @@
#include <boost/range.hpp>
namespace boost{
+namespace statistics{
+
namespace survival{
namespace model{
namespace exponential{
@@ -75,6 +77,7 @@
}// exponential
}// model
}// survival
+}// statistics
}// boost
#endif
Modified: sandbox/statistics/survival_model/libs/survival/model/doc/readme.txt
==============================================================================
--- sandbox/statistics/survival_model/libs/survival/model/doc/readme.txt (original)
+++ sandbox/statistics/survival_model/libs/survival/model/doc/readme.txt 2009-08-31 21:32:32 EDT (Mon, 31 Aug 2009)
@@ -37,7 +37,7 @@
/sandbox/statistics/importance_sampling/
/sandbox/statistics/importance_weights/
/sandbox/statistics/joint_dist/
-/sandbox/statistics/non_param/
+/sandbox/statistics/empirical_cdf/
/sandbox/statistics/mpl/
/sandbox/statistics/random/
/sandbox/statistics/binary_op/
Modified: sandbox/statistics/survival_model/libs/survival/model/example/exponential.cpp
==============================================================================
--- sandbox/statistics/survival_model/libs/survival/model/example/exponential.cpp (original)
+++ sandbox/statistics/survival_model/libs/survival/model/example/exponential.cpp 2009-08-31 21:32:32 EDT (Mon, 31 Aug 2009)
@@ -35,7 +35,7 @@
#include <libs/survival/model/example/exponential.h>
// Must come after the model to be used
-#include <boost/model/include.hpp>
+#include <boost/statistics/model/include.hpp>
#include <libs/survival/model/example/exponential.h>
@@ -50,6 +50,7 @@
// Evaluates the likelihoods and posteriors
using namespace boost;
+ using namespace statistics;
namespace surv = survival;
// [ Types ]
Modified: sandbox/statistics/survival_model/libs/survival/model/example/posterior_analysis.cpp
==============================================================================
--- sandbox/statistics/survival_model/libs/survival/model/example/posterior_analysis.cpp (original)
+++ sandbox/statistics/survival_model/libs/survival/model/example/posterior_analysis.cpp 2009-08-31 21:32:32 EDT (Mon, 31 Aug 2009)
@@ -29,12 +29,12 @@
#include <boost/standard_distribution/distributions/normal.hpp>
#include <boost/math/distributions/uniform.hpp>
-#include <boost/non_param/algorithm/sequential_kolmogorov_smirnov_distance.hpp>
+#include <boost/statistics/empirical_cdf/algorithm/sequential_kolmogorov_smirnov_distance.hpp>
#include <boost/survival/data/include.hpp>
#include <boost/survival/model/models/exponential/include.hpp>
// Must come after the model to be used
-#include <boost/model/include.hpp>
+#include <boost/statistics/model/include.hpp>
#include <boost/importance_weights/algorithm/prepare_weights.hpp>
#include <boost/importance_sampling/include.hpp>
@@ -56,6 +56,7 @@
// Checks the cg data against U[0,1] using Kolmogorov Smirnov
using namespace boost;
+ using namespace statistics;
namespace surv = survival;
namespace iw = importance_weights;
@@ -144,7 +145,7 @@
BOOST_ASSERT( n_batch % n_true_pars_kss == 0);
vals_ true_pars_kss;
true_pars_kss.reserve(n_true_pars_kss);
- non_param::sequential_kolmogorov_smirnov_distance(
+ statistics::empirical_cdf::sequential_kolmogorov_smirnov_distance(
mprior,
boost::begin(true_pars),
boost::end(true_pars),
@@ -236,7 +237,7 @@
BOOST_ASSERT( n_batch % n_p_pars_kss == 0);
vals_ p_pars_kss;
p_pars_kss.reserve(n_p_pars_kss);
- non_param::sequential_kolmogorov_smirnov_distance(
+ statistics::empirical_cdf::sequential_kolmogorov_smirnov_distance(
mproposal,
boost::begin(p_pars),
boost::end(p_pars),
@@ -347,7 +348,7 @@
n_t_pars
);
oa_t_pars << t_pars;
- val_ plt = algorithm::proportion_less_than(
+ val_ plt = statistics::empirical_cdf::proportion_less_than(
boost::begin( t_pars ),
boost::end( t_pars ),
true_pars[i]
@@ -369,7 +370,7 @@
BOOST_ASSERT( n_batch % n_ks == 0 );
vals_ kss;
kss.reserve( n_batch );
- non_param::sequential_kolmogorov_smirnov_distance(
+ statistics::empirical_cdf::sequential_kolmogorov_smirnov_distance(
munif_(),
boost::begin( cgs ),
boost::end( cgs ),
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