|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r55941 - in sandbox/statistics/survival_data: boost/survival/data boost/survival/data/algorithm boost/survival/data/algorithm/detail boost/survival/data/data boost/survival/data/meta boost/survival/data/random libs/survival/data/doc libs/survival/data/example libs/survival/data/src
From: erwann.rogard_at_[hidden]
Date: 2009-08-31 21:31:10
Author: e_r
Date: 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
New Revision: 55941
URL: http://svn.boost.org/trac/boost/changeset/55941
Log:
m
Text files modified:
sandbox/statistics/survival_data/boost/survival/data/algorithm/detail/log_shift.hpp | 8 +++++---
sandbox/statistics/survival_data/boost/survival/data/algorithm/events.hpp | 8 +++++---
sandbox/statistics/survival_data/boost/survival/data/algorithm/include.hpp | 6 +++---
sandbox/statistics/survival_data/boost/survival/data/algorithm/logit_log.hpp | 8 +++++---
sandbox/statistics/survival_data/boost/survival/data/algorithm/mean_events_by_covariate.hpp | 8 +++++---
sandbox/statistics/survival_data/boost/survival/data/algorithm/vectorize_events.hpp | 8 +++++---
sandbox/statistics/survival_data/boost/survival/data/data/event.hpp | 8 +++++---
sandbox/statistics/survival_data/boost/survival/data/data/include.hpp | 6 +++---
sandbox/statistics/survival_data/boost/survival/data/data/mean_event.hpp | 8 +++++---
sandbox/statistics/survival_data/boost/survival/data/data/record.hpp | 12 +++++++-----
sandbox/statistics/survival_data/boost/survival/data/include.hpp | 6 +++---
sandbox/statistics/survival_data/boost/survival/data/meta/failure_distribution.hpp | 12 +++++++-----
sandbox/statistics/survival_data/boost/survival/data/meta/failure_random.hpp | 14 ++++++++------
sandbox/statistics/survival_data/boost/survival/data/meta/include.hpp | 6 +++---
sandbox/statistics/survival_data/boost/survival/data/meta/random_input.hpp | 8 +++++---
sandbox/statistics/survival_data/boost/survival/data/random/batch.hpp | 12 +++++++-----
sandbox/statistics/survival_data/boost/survival/data/random/default_batch.hpp | 8 +++++---
sandbox/statistics/survival_data/boost/survival/data/random/failure_time.hpp | 14 ++++++++------
sandbox/statistics/survival_data/boost/survival/data/random/include.hpp | 6 +++---
sandbox/statistics/survival_data/libs/survival/data/doc/readme.txt | 8 ++++----
sandbox/statistics/survival_data/libs/survival/data/example/data.cpp | 7 ++++++-
sandbox/statistics/survival_data/libs/survival/data/example/data.h | 2 +-
sandbox/statistics/survival_data/libs/survival/data/example/random.cpp | 8 +++++---
sandbox/statistics/survival_data/libs/survival/data/example/random.h | 2 +-
sandbox/statistics/survival_data/libs/survival/data/src/main.cpp | 2 +-
25 files changed, 115 insertions(+), 80 deletions(-)
Modified: sandbox/statistics/survival_data/boost/survival/data/algorithm/detail/log_shift.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/algorithm/detail/log_shift.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/algorithm/detail/log_shift.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,15 +1,16 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::algorithm::log_shift.hpp //
+// statistics::survival::data::algorithm::log_shift.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_SURVIVAL_DATA_ALGORITHM_DETAIL_LOG_SHIFT_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_ALGORITHM_DETAIL_LOG_SHIFT_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_ALGORITHM_DETAIL_LOG_SHIFT_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_ALGORITHM_DETAIL_LOG_SHIFT_HPP_ER_2009
#include <boost/math/special_functions/log1p.hpp>
namespace boost{
+namespace statistics{
namespace survival{
namespace data{
namespace detail{
@@ -36,6 +37,7 @@
}// detail
}// data
}// survival
+}// statistics
}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/survival_data/boost/survival/data/algorithm/events.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/algorithm/events.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/algorithm/events.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::algorithm::events.hpp //
+// statistics::survival::data::algorithm::events.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_SURVIVAL_DATA_ALGORITHM_EVENTS_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_ALGORITHM_EVENTS_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_ALGORITHM_EVENTS_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_ALGORITHM_EVENTS_HPP_ER_2009
#include <algorithm>
#include <ext/algorithm>
#include <boost/lambda/lambda.hpp>
@@ -15,6 +15,7 @@
#include <boost/survival/data/data/record.hpp>
namespace boost{
+namespace statistics{
namespace survival{
namespace data{
@@ -60,6 +61,7 @@
}// data
}// survival
+}// statistics
}// boost
#endif
Modified: sandbox/statistics/survival_data/boost/survival/data/algorithm/include.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/algorithm/include.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/algorithm/include.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::algorithm::include.hpp //
+// statistics::survival::data::algorithm::include.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_SURVIVAL_DATA_ALGORTIHM_INCLUDE_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_ALGORTIHM_INCLUDE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_ALGORTIHM_INCLUDE_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_ALGORTIHM_INCLUDE_HPP_ER_2009
#include <boost/survival/data/algorithm/events.hpp>
#include <boost/survival/data/algorithm/vectorize_events.hpp>
Modified: sandbox/statistics/survival_data/boost/survival/data/algorithm/logit_log.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/algorithm/logit_log.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/algorithm/logit_log.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,18 +1,19 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::algorithm::logit_log.hpp //
+// statistics::survival::data::algorithm::logit_log.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_SURVIVAL_DATA_ALGORITHM_LOGIT_LOG_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_ALGORITHM_LOGIT_LOG_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_ALGORITHM_LOGIT_LOG_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_ALGORITHM_LOGIT_LOG_HPP_ER_2009
#include <stdexcept>
#include <iterator>
#include <boost/format.hpp>
#include <boost/survival/data/algorithm/detail/log_shift.hpp>
namespace boost{
+namespace statistics{
namespace survival{
namespace data{
@@ -43,6 +44,7 @@
}// data
}// survival
+}// statistics
}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/survival_data/boost/survival/data/algorithm/mean_events_by_covariate.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/algorithm/mean_events_by_covariate.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/algorithm/mean_events_by_covariate.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::algorithm::mean_events_by_covariate.hpp //
+// statistics::survival::data::algorithm::mean_events_by_covariate.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_SURVIVAL_DATA_ALGORITHM_MEAN_EVENTS_BY_COVARIATE_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_ALGORITHM_MEAN_EVENTS_BY_COVARIATE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_ALGORITHM_MEAN_EVENTS_BY_COVARIATE_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_ALGORITHM_MEAN_EVENTS_BY_COVARIATE_HPP_ER_2009
#include <vector>
#include <boost/foreach.hpp>
#include <boost/utility.hpp>
@@ -19,6 +19,7 @@
#include <boost/binary_op/algorithm/heads.hpp>
namespace boost{
+namespace statistics{
namespace survival{
namespace data{
@@ -132,6 +133,7 @@
}// data
}// survival
+}// statistics
}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/survival_data/boost/survival/data/algorithm/vectorize_events.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/algorithm/vectorize_events.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/algorithm/vectorize_events.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,17 +1,18 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::algorithm::make_mean_events.hpp //
+// statistics::survival::data::algorithm::make_mean_events.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_SURVIVAL_DATA_ALGORITHM_VECTORIZE_EVENTS_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_ALGORITHM_VECTORIZE_EVENTS_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_ALGORITHM_VECTORIZE_EVENTS_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_ALGORITHM_VECTORIZE_EVENTS_HPP_ER_2009
#include <boost/iterator/iterator_traits.hpp>
#include <boost/mpl/assert.hpp>
#include <boost/type_traits/is_same.hpp>
namespace boost{
+namespace statistics{
namespace survival{
namespace data{
@@ -49,6 +50,7 @@
}// data
}// survival
+}// statistics
}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/survival_data/boost/survival/data/data/event.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/data/event.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/data/event.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::data::event.hpp //
+// statistics::survival::data::data::event.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_SURVIVAL_DATA_DATA_EVENT_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_DATA_EVENT_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_DATA_EVENT_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_DATA_EVENT_HPP_ER_2009
#include <limits>
#include <ostream>
#include <boost/format.hpp>
@@ -17,6 +17,7 @@
#include <boost/arithmetic/equal.hpp>
namespace boost {
+namespace statistics{
namespace survival {
namespace data {
@@ -122,6 +123,7 @@
}// data
}// survival
+}// statistics
}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/survival_data/boost/survival/data/data/include.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/data/include.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/data/include.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::data::include.hpp //
+// statistics::survival::data::data::include.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_SURVIVAL_DATA_DATA_INCLUDE_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_DATA_INCLUDE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_DATA_INCLUDE_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_DATA_INCLUDE_HPP_ER_2009
#include <boost/survival/data/data/event.hpp>
#include <boost/survival/data/data/mean_event.hpp>
Modified: sandbox/statistics/survival_data/boost/survival/data/data/mean_event.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/data/mean_event.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/data/mean_event.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data:data::mean_event.hpp //
+// statistics::survival::data:data::mean_event.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_SURVIVAL_DATA_DATA_MEAN_EVENT_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_DATA_MEAN_EVENT_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_DATA_MEAN_EVENT_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_DATA_MEAN_EVENT_HPP_ER_2009
#include <stdexcept>
#include <boost/type_traits.hpp>
#include <boost/range.hpp>
@@ -18,6 +18,7 @@
#include <boost/math/special_functions/fpclassify.hpp>
namespace boost{
+namespace statistics{
namespace survival{
namespace data{
@@ -200,6 +201,7 @@
}// data
}// survival
+}// statistics
}// boost
#endif
Modified: sandbox/statistics/survival_data/boost/survival/data/data/record.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/data/record.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/data/record.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::record.hpp //
+// statistics::survival::data::record.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_SURVIVAL_DATA_RECORDER_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_RECORDER_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_RECORDER_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_RECORDER_HPP_ER_2009
#include <ostream>
#include <limits>
#include <boost/operators.hpp>
@@ -18,6 +18,7 @@
#include <boost/survival/data/data/event.hpp>
namespace boost{
+namespace statistics{
namespace survival{
namespace data{
@@ -79,7 +80,7 @@
// Assign
template<typename T>
void record<T>::set_failure_time(value_type rt){
- static const char* method = "survival::record::set_failure_time(%1%)";
+ static const char* method = "statistics::survival::record::set_failure_time(%1%)";
if(math::isinf(this->failure_time_)){
this->failure_time_ = rt;
}else{
@@ -132,7 +133,7 @@
template<typename T>
event<T> make_event(const record<T>& r, typename record<T>::value_type t){
- static const char* fun = "survival::make_event(%1%,%2)";
+ static const char* fun = "statistics::survival::make_event(%1%,%2)";
typedef typename record<T>::value_type value_t;
value_t eps = math::tools::epsilon<T>();
value_t dt = time_since_entry(r,t);
@@ -152,6 +153,7 @@
}// data
}// survival
+}// statistics
}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/survival_data/boost/survival/data/include.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/include.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/include.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::include.hpp //
+// statistics::survival::data::include.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_SURVIVAL_DATA_INCLUDE_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_INCLUDE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_INCLUDE_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_INCLUDE_HPP_ER_2009
#include <boost/survival/constant.hpp>
#include <boost/survival/data/algorithm/include.hpp>
Modified: sandbox/statistics/survival_data/boost/survival/data/meta/failure_distribution.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/meta/failure_distribution.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/meta/failure_distribution.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,15 +1,16 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::meta::failure_distribution.hpp //
+// statistics::survival::data::meta::failure_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_SURVIVAL_DATA_META_FAILURE_DISTRIBUTION_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_META_FAILURE_DISTRIBUTION_HPP_ER_2009
-#include <boost/model/wrap/aggregate/model_covariate_parameter.hpp>
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_META_FAILURE_DISTRIBUTION_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_META_FAILURE_DISTRIBUTION_HPP_ER_2009
+#include <boost/statistics/model/wrap/aggregate/model_covariate_parameter.hpp>
namespace boost{
+namespace statistics{
namespace survival{
namespace data{
@@ -25,7 +26,7 @@
template<typename M,typename X,typename P>
typename meta_failure_distribution<M>::type
make_failure_distribution(
- boost::model::model_covariate_parameter_<M,X,P> mcp
+ boost::statistics::model::model_covariate_parameter_<M,X,P> mcp
){
typedef meta_failure_distribution<M> meta_;
return meta_::make(
@@ -35,6 +36,7 @@
}// data
}// survival
+}// statistics
}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/survival_data/boost/survival/data/meta/failure_random.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/meta/failure_random.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/meta/failure_random.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,17 +1,18 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::meta::failure_random.hpp //
+// statistics::survival::data::meta::failure_random.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_SURVIVAL_DATA_META_FAILURE_RANDOM_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_META_FAILURE_RANDOM_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_META_FAILURE_RANDOM_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_META_FAILURE_RANDOM_HPP_ER_2009
#include <boost/dist_random/include.hpp>
-#include <boost/model/wrap/aggregate/model_covariate_parameter.hpp>
+#include <boost/statistics/model/wrap/aggregate/model_covariate_parameter.hpp>
#include <boost/survival/data/meta/failure_distribution.hpp>
namespace boost{
+namespace statistics{
namespace survival{
namespace data{
@@ -30,13 +31,13 @@
template<typename M,typename X,typename P>
typename meta_failure_random<M>::type
- make_failure_random(boost::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::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(
@@ -46,6 +47,7 @@
}// data
}// survival
+}// statistics
}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/survival_data/boost/survival/data/meta/include.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/meta/include.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/meta/include.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::meta::include.hpp //
+// statistics::survival::data::meta::include.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_SURVIVAL_DATA_META_INCLUDE_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_META_INCLUDE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_META_INCLUDE_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_META_INCLUDE_HPP_ER_2009
#include <boost/survival/data/meta/failure_distribution.hpp>
#include <boost/survival/data/meta/failure_random.hpp>
Modified: sandbox/statistics/survival_data/boost/survival/data/meta/random_input.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/meta/random_input.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/meta/random_input.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,15 +1,16 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::meta::random_input.hpp //
+// statistics::survival::data::meta::random_input.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_SURVIVAL_DATA_META_RANDOM_INPUT_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_META_RANDOM_INPUT_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_META_RANDOM_INPUT_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_META_RANDOM_INPUT_HPP_ER_2009
#include <boost/survival/data/meta/failure_distribution.hpp>
namespace boost{
+namespace statistics{
namespace survival{
namespace data{
namespace meta{
@@ -27,6 +28,7 @@
}// meta
}// data
}// survival
+}// statistics
}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/survival_data/boost/survival/data/random/batch.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/random/batch.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/random/batch.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,18 +1,18 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::random::batch.hpp //
+// statistics::survival::data::random::batch.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_SURVIVAL_DATA_RANDOM_BATCH_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_RANDOM_BATCH_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_RANDOM_BATCH_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_RANDOM_BATCH_HPP_ER_2009
#include <iostream> // TODO remove
#include <boost/format.hpp>
#include <boost/range.hpp>
#include <boost/random/variate_generator.hpp>
#include <boost/random/gen_to_random.hpp>
-#include <boost/model/wrap/aggregate/model_covariate_parameter.hpp>
+#include <boost/statistics/model/wrap/aggregate/model_covariate_parameter.hpp>
#include <boost/survival/data/data/record.hpp>
#include <boost/survival/data/random/failure_time.hpp>
#include <boost/survival/data/meta/random_input.hpp>
@@ -20,6 +20,7 @@
#include <boost/iterator/range_cycle.hpp>
namespace boost{
+namespace statistics{
namespace survival{
namespace data{
namespace random{
@@ -116,7 +117,7 @@
const model_parameter_& mp
= static_cast<const model_parameter_&>(*this);
value_type ft = random::failure_time<value_type>(
- boost::model::make_model_covariate_parameter(
+ boost::statistics::model::make_model_covariate_parameter(
mp.model(),
this->covariate(),
mp.parameter()
@@ -146,6 +147,7 @@
}// random
}// data
}// survival
+}// statistics
}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/survival_data/boost/survival/data/random/default_batch.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/random/default_batch.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/random/default_batch.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::random::default_batch.hpp //
+// statistics::survival::data::random::default_batch.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_SURVIVAL_DATA_RANDOM_DEFAULT_BATCH_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_RANDOM_DEFAULT_BATCH_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_RANDOM_DEFAULT_BATCH_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_RANDOM_DEFAULT_BATCH_HPP_ER_2009
#include <boost/random/gen_to_random.hpp>
#include <boost/functional/clock.hpp>
#include <boost/shared_ptr.hpp>
@@ -17,6 +17,7 @@
namespace boost{
+namespace statistics{
namespace survival{
namespace data{
namespace random{
@@ -86,6 +87,7 @@
}// random
}// data
}// survival
+}// statistics
}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/survival_data/boost/survival/data/random/failure_time.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/random/failure_time.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/random/failure_time.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,17 +1,18 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::random::failure_time.hpp //
+// statistics::survival::data::random::failure_time.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_SURVIVAL_DATA_RANDOM_FAILURE_TIME_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_RANDOM_FAILURE_TIME_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_RANDOM_FAILURE_TIME_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_RANDOM_FAILURE_TIME_HPP_ER_2009
#include <boost/dist_random/include.hpp>
-#include <boost/model/wrap/aggregate/model_covariate_parameter.hpp>
+#include <boost/statistics/model/wrap/aggregate/model_covariate_parameter.hpp>
#include <boost/survival/data/meta/failure_distribution.hpp>
namespace boost{
+namespace statistics{
namespace survival{
namespace data{
namespace random{
@@ -22,7 +23,7 @@
// can be overloaded by specializing on M.
template<typename T,typename M,typename X,typename P,typename U>
T failure_time(
- boost::model::model_covariate_parameter_<M,X,P> mcp,
+ boost::statistics::model::model_covariate_parameter_<M,X,P> mcp,
U& urng
);
@@ -30,7 +31,7 @@
template<typename T,typename M,typename X,typename P,typename U>
T failure_time(
- boost::model::model_covariate_parameter_<M,X,P> mcp,
+ boost::statistics::model::model_covariate_parameter_<M,X,P> mcp,
U& urng
){
return make_failure_random(mcp)(urng);
@@ -39,6 +40,7 @@
}// random
}// data
}// survival
+}// statistics
}// boost
#endif
\ No newline at end of file
Modified: sandbox/statistics/survival_data/boost/survival/data/random/include.hpp
==============================================================================
--- sandbox/statistics/survival_data/boost/survival/data/random/include.hpp (original)
+++ sandbox/statistics/survival_data/boost/survival/data/random/include.hpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::random::include.hpp //
+// statistics::survival::data::random::include.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_SURVIVAL_DATA_RANDOM_INCLUDE_HPP_ER_2009
-#define BOOST_SURVIVAL_DATA_RANDOM_INCLUDE_HPP_ER_2009
+#ifndef BOOST_STATISTICS_SURVIVAL_DATA_RANDOM_INCLUDE_HPP_ER_2009
+#define BOOST_STATISTICS_SURVIVAL_DATA_RANDOM_INCLUDE_HPP_ER_2009
#include <boost/survival/data/random/batch.hpp>
#include <boost/survival/data/random/default_batch.hpp>
Modified: sandbox/statistics/survival_data/libs/survival/data/doc/readme.txt
==============================================================================
--- sandbox/statistics/survival_data/libs/survival/data/doc/readme.txt (original)
+++ sandbox/statistics/survival_data/libs/survival/data/doc/readme.txt 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
-// survival::data::doc::readme //
+// statistics::survival::data::doc::readme //
// //
// (C) Copyright 2009 Erwann Rogard //
// Use, modification and distribution are subject to the //
@@ -25,9 +25,9 @@
/boost_1_39_0/
/sandbox/statistics/joint_dist/
/sandbox/statistics/survival_model/
-/sandbox/statistics/non_param/
+/sandbox/statistics/empirical_cdf/
/sandbox/statistics/matrix_view/
-/sandbox/statistics/non_param/
+/sandbox/statistics/empirical_cdf/
/sandbox/statistics/random/
/sandbox/statistics/scalar_dist/
/sandbox/statistics/dist_random/
@@ -77,7 +77,7 @@
[ meta ]
- A bridge between survival::data and survival::model
+ A bridge between statistics::survival::data and statistics::survival::model
[ Output ]
Modified: sandbox/statistics/survival_data/libs/survival/data/example/data.cpp
==============================================================================
--- sandbox/statistics/survival_data/libs/survival/data/example/data.cpp (original)
+++ sandbox/statistics/survival_data/libs/survival/data/example/data.cpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::example::data.cpp //
+// statistics::survival::data::example::data.cpp //
// //
// Copyright 2009 Erwann Rogard. Distributed under the Boost //
// Software License, Version 1.0. (See accompanying file //
@@ -34,7 +34,12 @@
// Statistics
using namespace boost;
+<<<<<<< .mine
+ using namespace statistics;
+ namespace surv = statistics::survival;
+=======
namespace surv = survival;
+>>>>>>> .r55939
// [ Types ]
typedef unsigned val_; // do not modify
Modified: sandbox/statistics/survival_data/libs/survival/data/example/data.h
==============================================================================
--- sandbox/statistics/survival_data/libs/survival/data/example/data.h (original)
+++ sandbox/statistics/survival_data/libs/survival/data/example/data.h 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::example::data.h //
+// statistics::survival::data::example::data.h //
// //
// Copyright 2009 Erwann Rogard. Distributed under the Boost //
// Software License, Version 1.0. (See accompanying file //
Modified: sandbox/statistics/survival_data/libs/survival/data/example/random.cpp
==============================================================================
--- sandbox/statistics/survival_data/libs/survival/data/example/random.cpp (original)
+++ sandbox/statistics/survival_data/libs/survival/data/example/random.cpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -28,12 +28,12 @@
#include <boost/standard_distribution/distributions/normal.hpp> //prior
#include <boost/standard_distribution/distributions/exponential.hpp> //data
-#include <boost/non_param/algorithm/sequential_kolmogorov_smirnov_distance.hpp>
+#include <boost/statistics/empirical_cdf/algorithm/sequential_kolmogorov_smirnov_distance.hpp>
#include <boost/matrix_view/algorithm/transform_column.hpp>
#include <boost/dist_random/include.hpp>
-#include <boost/model/include.hpp>
+#include <boost/statistics/model/include.hpp>
#include <boost/survival/data/include.hpp>
#include <boost/survival/model/models/exponential/include.hpp>
@@ -42,6 +42,7 @@
out << "-> example_random : ";
using namespace boost;
+ using namespace statistics;
namespace surv = survival;
// Generates batches of iid random records as follows:
@@ -211,7 +212,8 @@
fd_ fail_dist = surv::data::make_failure_distribution(mcp);
kss.clear();
- non_param::sequential_kolmogorov_smirnov_distance(
+ statistics::empirical_cdf
+ ::sequential_kolmogorov_smirnov_distance(
fail_dist,
boost::begin( fts ),
boost::end( fts ),
Modified: sandbox/statistics/survival_data/libs/survival/data/example/random.h
==============================================================================
--- sandbox/statistics/survival_data/libs/survival/data/example/random.h (original)
+++ sandbox/statistics/survival_data/libs/survival/data/example/random.h 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::data::example::random.h //
+// statistics::survival::data::example::random.h //
// //
// Copyright 2009 Erwann Rogard. Distributed under the Boost //
// Software License, Version 1.0. (See accompanying file //
Modified: sandbox/statistics/survival_data/libs/survival/data/src/main.cpp
==============================================================================
--- sandbox/statistics/survival_data/libs/survival/data/src/main.cpp (original)
+++ sandbox/statistics/survival_data/libs/survival/data/src/main.cpp 2009-08-31 21:31:07 EDT (Mon, 31 Aug 2009)
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// survival::src::main.cpp //
+// statistics::survival::src::main.cpp //
// //
// Copyright 2009 Erwann Rogard. Distributed under the Boost //
// Software License, Version 1.0. (See accompanying file //
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