|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r83633 - in branches/release: . boost boost/accumulators boost/accumulators/framework/parameters boost/accumulators/numeric boost/accumulators/statistics boost/accumulators/statistics/parameters boost/accumulators/statistics/variates
From: eric_at_[hidden]
Date: 2013-03-29 15:44:40
Author: eric_niebler
Date: 2013-03-29 15:44:38 EDT (Fri, 29 Mar 2013)
New Revision: 83633
URL: http://svn.boost.org/trac/boost/changeset/83633
Log:
merge [83308] and [83392] from trunk, fixes #6926
Properties modified:
branches/release/ (props changed)
branches/release/boost/ (props changed)
Text files modified:
branches/release/boost/accumulators/accumulators_fwd.hpp | 14 ++++++++++++--
branches/release/boost/accumulators/framework/parameters/accumulator.hpp | 2 ++
branches/release/boost/accumulators/framework/parameters/sample.hpp | 2 ++
branches/release/boost/accumulators/framework/parameters/weight.hpp | 2 ++
branches/release/boost/accumulators/framework/parameters/weights.hpp | 2 ++
branches/release/boost/accumulators/numeric/functional.hpp | 10 ++++++++++
branches/release/boost/accumulators/statistics/density.hpp | 4 ++++
branches/release/boost/accumulators/statistics/extended_p_square.hpp | 4 +++-
branches/release/boost/accumulators/statistics/p_square_cumul_dist.hpp | 3 +++
branches/release/boost/accumulators/statistics/parameters/quantile_probability.hpp | 3 +++
branches/release/boost/accumulators/statistics/peaks_over_threshold.hpp | 4 ++++
branches/release/boost/accumulators/statistics/rolling_window.hpp | 3 +++
branches/release/boost/accumulators/statistics/tail.hpp | 4 ++++
branches/release/boost/accumulators/statistics/variates/covariate.hpp | 4 ++++
14 files changed, 58 insertions(+), 3 deletions(-)
Modified: branches/release/boost/accumulators/accumulators_fwd.hpp
==============================================================================
--- branches/release/boost/accumulators/accumulators_fwd.hpp (original)
+++ branches/release/boost/accumulators/accumulators_fwd.hpp 2013-03-29 15:44:38 EDT (Fri, 29 Mar 2013)
@@ -185,8 +185,18 @@
inline void ignore_variable(void const *) {}
- #define BOOST_ACCUMULATORS_IGNORE_GLOBAL(X)\
- namespace detail { inline void BOOST_PP_CAT(ignore_, X)() { boost::accumulators::detail::ignore_variable(&X); } }
+#define BOOST_ACCUMULATORS_IGNORE_GLOBAL(X) \
+ namespace detail \
+ { \
+ struct BOOST_PP_CAT(ignore_, X) \
+ { \
+ void ignore() \
+ { \
+ boost::accumulators::detail::ignore_variable(&X); \
+ } \
+ }; \
+ } \
+ /**/
}
}} // namespace boost::accumulators
Modified: branches/release/boost/accumulators/framework/parameters/accumulator.hpp
==============================================================================
--- branches/release/boost/accumulators/framework/parameters/accumulator.hpp (original)
+++ branches/release/boost/accumulators/framework/parameters/accumulator.hpp 2013-03-29 15:44:38 EDT (Fri, 29 Mar 2013)
@@ -9,11 +9,13 @@
#define BOOST_ACCUMULATORS_FRAMEWORK_PARAMETERS_ACCUMULATOR_HPP_EAN_31_10_2005
#include <boost/parameter/keyword.hpp>
+#include <boost/accumulators/accumulators_fwd.hpp>
namespace boost { namespace accumulators
{
BOOST_PARAMETER_KEYWORD(tag, accumulator)
+BOOST_ACCUMULATORS_IGNORE_GLOBAL(accumulator)
}} // namespace boost::accumulators
Modified: branches/release/boost/accumulators/framework/parameters/sample.hpp
==============================================================================
--- branches/release/boost/accumulators/framework/parameters/sample.hpp (original)
+++ branches/release/boost/accumulators/framework/parameters/sample.hpp 2013-03-29 15:44:38 EDT (Fri, 29 Mar 2013)
@@ -9,11 +9,13 @@
#define BOOST_ACCUMULATORS_FRAMEWORK_PARAMETERS_SAMPLE_HPP_EAN_31_10_2005
#include <boost/parameter/keyword.hpp>
+#include <boost/accumulators/accumulators_fwd.hpp>
namespace boost { namespace accumulators
{
BOOST_PARAMETER_KEYWORD(tag, sample)
+BOOST_ACCUMULATORS_IGNORE_GLOBAL(sample)
}} // namespace boost::accumulators
Modified: branches/release/boost/accumulators/framework/parameters/weight.hpp
==============================================================================
--- branches/release/boost/accumulators/framework/parameters/weight.hpp (original)
+++ branches/release/boost/accumulators/framework/parameters/weight.hpp 2013-03-29 15:44:38 EDT (Fri, 29 Mar 2013)
@@ -9,12 +9,14 @@
#define BOOST_ACCUMULATORS_FRAMEWORK_PARAMETERS_WEIGHT_HPP_EAN_31_10_2005
#include <boost/parameter/keyword.hpp>
+#include <boost/accumulators/accumulators_fwd.hpp>
namespace boost { namespace accumulators
{
// The weight of a single sample
BOOST_PARAMETER_KEYWORD(tag, weight)
+BOOST_ACCUMULATORS_IGNORE_GLOBAL(weight)
}} // namespace boost::accumulators
Modified: branches/release/boost/accumulators/framework/parameters/weights.hpp
==============================================================================
--- branches/release/boost/accumulators/framework/parameters/weights.hpp (original)
+++ branches/release/boost/accumulators/framework/parameters/weights.hpp 2013-03-29 15:44:38 EDT (Fri, 29 Mar 2013)
@@ -9,12 +9,14 @@
#define BOOST_ACCUMULATORS_FRAMEWORK_PARAMETERS_WEIGHTS_HPP_EAN_28_10_2005
#include <boost/parameter/keyword.hpp>
+#include <boost/accumulators/accumulators_fwd.hpp>
namespace boost { namespace accumulators
{
// The weight accumulator
BOOST_PARAMETER_KEYWORD(tag, weights)
+BOOST_ACCUMULATORS_IGNORE_GLOBAL(weights)
}} // namespace boost::accumulators
Modified: branches/release/boost/accumulators/numeric/functional.hpp
==============================================================================
--- branches/release/boost/accumulators/numeric/functional.hpp (original)
+++ branches/release/boost/accumulators/numeric/functional.hpp 2013-03-29 15:44:38 EDT (Fri, 29 Mar 2013)
@@ -20,6 +20,7 @@
#include <boost/type_traits/is_floating_point.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/typeof/typeof.hpp>
+#include <boost/accumulators/accumulators_fwd.hpp>
#include <boost/accumulators/numeric/functional_fwd.hpp>
#include <boost/accumulators/numeric/detail/function1.hpp>
#include <boost/accumulators/numeric/detail/function2.hpp>
@@ -166,6 +167,7 @@
{ \
op::Name const &Name = boost::detail::pod_singleton<op::Name>::instance; \
} \
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(Name) \
/**/
/// INTERNAL ONLY
@@ -416,6 +418,14 @@
op::as_max const &as_max = boost::detail::pod_singleton<op::as_max>::instance;
op::as_zero const &as_zero = boost::detail::pod_singleton<op::as_zero>::instance;
op::as_one const &as_one = boost::detail::pod_singleton<op::as_one>::instance;
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(min_assign)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(max_assign)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(average)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(as_min)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(as_max)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(as_zero)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(as_one)
}
///////////////////////////////////////////////////////////////////////////////
Modified: branches/release/boost/accumulators/statistics/density.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/density.hpp (original)
+++ branches/release/boost/accumulators/statistics/density.hpp 2013-03-29 15:44:38 EDT (Fri, 29 Mar 2013)
@@ -15,6 +15,7 @@
#include <boost/range.hpp>
#include <boost/parameter/keyword.hpp>
#include <boost/mpl/placeholders.hpp>
+#include <boost/accumulators/accumulators_fwd.hpp>
#include <boost/accumulators/framework/accumulator_base.hpp>
#include <boost/accumulators/framework/extractor.hpp>
#include <boost/accumulators/numeric/functional.hpp>
@@ -34,6 +35,9 @@
BOOST_PARAMETER_NESTED_KEYWORD(tag, density_cache_size, cache_size)
BOOST_PARAMETER_NESTED_KEYWORD(tag, density_num_bins, num_bins)
+BOOST_ACCUMULATORS_IGNORE_GLOBAL(density_cache_size)
+BOOST_ACCUMULATORS_IGNORE_GLOBAL(density_num_bins)
+
namespace impl
{
///////////////////////////////////////////////////////////////////////////////
Modified: branches/release/boost/accumulators/statistics/extended_p_square.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/extended_p_square.hpp (original)
+++ branches/release/boost/accumulators/statistics/extended_p_square.hpp 2013-03-29 15:44:38 EDT (Fri, 29 Mar 2013)
@@ -18,7 +18,7 @@
#include <boost/iterator/permutation_iterator.hpp>
#include <boost/parameter/keyword.hpp>
#include <boost/mpl/placeholders.hpp>
-#include <boost/accumulators/framework/accumulator_base.hpp>
+#include <boost/accumulators/accumulators_fwd.hpp>
#include <boost/accumulators/framework/extractor.hpp>
#include <boost/accumulators/numeric/functional.hpp>
#include <boost/accumulators/framework/parameters/sample.hpp>
@@ -34,6 +34,8 @@
//
BOOST_PARAMETER_NESTED_KEYWORD(tag, extended_p_square_probabilities, probabilities)
+BOOST_ACCUMULATORS_IGNORE_GLOBAL(extended_p_square_probabilities)
+
namespace impl
{
///////////////////////////////////////////////////////////////////////////////
Modified: branches/release/boost/accumulators/statistics/p_square_cumul_dist.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/p_square_cumul_dist.hpp (original)
+++ branches/release/boost/accumulators/statistics/p_square_cumul_dist.hpp 2013-03-29 15:44:38 EDT (Fri, 29 Mar 2013)
@@ -13,6 +13,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/range.hpp>
#include <boost/mpl/placeholders.hpp>
+#include <boost/accumulators/accumulators_fwd.hpp>
#include <boost/accumulators/framework/accumulator_base.hpp>
#include <boost/accumulators/framework/extractor.hpp>
#include <boost/accumulators/numeric/functional.hpp>
@@ -27,6 +28,8 @@
//
BOOST_PARAMETER_NESTED_KEYWORD(tag, p_square_cumulative_distribution_num_cells, num_cells)
+BOOST_ACCUMULATORS_IGNORE_GLOBAL(p_square_cumulative_distribution_num_cells)
+
namespace impl
{
///////////////////////////////////////////////////////////////////////////////
Modified: branches/release/boost/accumulators/statistics/parameters/quantile_probability.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/parameters/quantile_probability.hpp (original)
+++ branches/release/boost/accumulators/statistics/parameters/quantile_probability.hpp 2013-03-29 15:44:38 EDT (Fri, 29 Mar 2013)
@@ -9,12 +9,15 @@
#define BOOST_ACCUMULATORS_STATISTICS_PARAMETERS_QUANTILE_PROBABILITY_HPP_EAN_03_11_2005
#include <boost/parameter/keyword.hpp>
+#include <boost/accumulators/accumulators_fwd.hpp>
namespace boost { namespace accumulators
{
BOOST_PARAMETER_KEYWORD(tag, quantile_probability)
+BOOST_ACCUMULATORS_IGNORE_GLOBAL(quantile_probability)
+
}} // namespace boost::accumulators
#endif
Modified: branches/release/boost/accumulators/statistics/peaks_over_threshold.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/peaks_over_threshold.hpp (original)
+++ branches/release/boost/accumulators/statistics/peaks_over_threshold.hpp 2013-03-29 15:44:38 EDT (Fri, 29 Mar 2013)
@@ -22,6 +22,7 @@
#include <boost/mpl/placeholders.hpp>
#include <boost/parameter/keyword.hpp>
#include <boost/tuple/tuple.hpp>
+#include <boost/accumulators/accumulators_fwd.hpp>
#include <boost/accumulators/framework/accumulator_base.hpp>
#include <boost/accumulators/framework/extractor.hpp>
#include <boost/accumulators/numeric/functional.hpp>
@@ -46,6 +47,9 @@
BOOST_PARAMETER_NESTED_KEYWORD(tag, pot_threshold_value, threshold_value)
BOOST_PARAMETER_NESTED_KEYWORD(tag, pot_threshold_probability, threshold_probability)
+BOOST_ACCUMULATORS_IGNORE_GLOBAL(pot_threshold_value)
+BOOST_ACCUMULATORS_IGNORE_GLOBAL(pot_threshold_probability)
+
namespace impl
{
///////////////////////////////////////////////////////////////////////////////
Modified: branches/release/boost/accumulators/statistics/rolling_window.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/rolling_window.hpp (original)
+++ branches/release/boost/accumulators/statistics/rolling_window.hpp 2013-03-29 15:44:38 EDT (Fri, 29 Mar 2013)
@@ -13,6 +13,7 @@
#include <boost/assert.hpp>
#include <boost/circular_buffer.hpp>
#include <boost/range/iterator_range.hpp>
+#include <boost/accumulators/accumulators_fwd.hpp>
#include <boost/accumulators/framework/extractor.hpp>
#include <boost/accumulators/framework/depends_on.hpp>
#include <boost/accumulators/framework/accumulator_base.hpp>
@@ -28,6 +29,8 @@
// tag::rolling_window::size named parameter
BOOST_PARAMETER_NESTED_KEYWORD(tag, rolling_window_size, window_size)
+BOOST_ACCUMULATORS_IGNORE_GLOBAL(rolling_window_size)
+
namespace impl
{
///////////////////////////////////////////////////////////////////////////////
Modified: branches/release/boost/accumulators/statistics/tail.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/tail.hpp (original)
+++ branches/release/boost/accumulators/statistics/tail.hpp 2013-03-29 15:44:38 EDT (Fri, 29 Mar 2013)
@@ -18,6 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/iterator/reverse_iterator.hpp>
#include <boost/iterator/permutation_iterator.hpp>
+#include <boost/accumulators/accumulators_fwd.hpp>
#include <boost/accumulators/framework/accumulator_base.hpp>
#include <boost/accumulators/framework/extractor.hpp>
#include <boost/accumulators/numeric/functional.hpp>
@@ -32,6 +33,9 @@
BOOST_PARAMETER_NESTED_KEYWORD(tag, right_tail_cache_size, cache_size)
BOOST_PARAMETER_NESTED_KEYWORD(tag, left_tail_cache_size, cache_size)
+BOOST_ACCUMULATORS_IGNORE_GLOBAL(right_tail_cache_size)
+BOOST_ACCUMULATORS_IGNORE_GLOBAL(left_tail_cache_size)
+
namespace detail
{
///////////////////////////////////////////////////////////////////////////////
Modified: branches/release/boost/accumulators/statistics/variates/covariate.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/variates/covariate.hpp (original)
+++ branches/release/boost/accumulators/statistics/variates/covariate.hpp 2013-03-29 15:44:38 EDT (Fri, 29 Mar 2013)
@@ -9,6 +9,7 @@
#define BOOST_ACCUMULATORS_STATISTICS_VARIATES_COVARIATE_HPP_EAN_03_11_2005
#include <boost/parameter/keyword.hpp>
+#include <boost/accumulators/accumulators_fwd.hpp>
namespace boost { namespace accumulators
{
@@ -16,6 +17,9 @@
BOOST_PARAMETER_KEYWORD(tag, covariate1)
BOOST_PARAMETER_KEYWORD(tag, covariate2)
+BOOST_ACCUMULATORS_IGNORE_GLOBAL(covariate1)
+BOOST_ACCUMULATORS_IGNORE_GLOBAL(covariate2)
+
}} // namespace boost::accumulators
#endif
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