Subject: [Boost-commit] svn:boost r55084 - in branches/release: . boost/accumulators boost/accumulators/framework boost/accumulators/framework/accumulators boost/accumulators/statistics libs/accumulators/example libs/accumulators/test
From: eric_at_[hidden]
Date: 2009-07-22 13:02:55
Author: eric_niebler
Date: 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
New Revision: 55084
URL: http://svn.boost.org/trac/boost/changeset/55084
Log:
Merged revisions 55050,55076 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r55050 | eric_niebler | 2009-07-20 16:04:55 -0700 (Mon, 20 Jul 2009) | 1 line
eliminate shadow warnings and unused variable warnings
........
r55076 | eric_niebler | 2009-07-21 18:34:11 -0700 (Tue, 21 Jul 2009) | 1 line
portability fixed for gcc-4.4
........
Properties modified:
branches/release/ (props changed)
Text files modified:
branches/release/boost/accumulators/accumulators_fwd.hpp | 5 +++++
branches/release/boost/accumulators/framework/accumulator_set.hpp | 4 ++--
branches/release/boost/accumulators/framework/accumulators/droppable_accumulator.hpp | 4 ++--
branches/release/boost/accumulators/framework/accumulators/external_accumulator.hpp | 2 +-
branches/release/boost/accumulators/statistics/count.hpp | 2 ++
branches/release/boost/accumulators/statistics/covariance.hpp | 2 ++
branches/release/boost/accumulators/statistics/density.hpp | 2 ++
branches/release/boost/accumulators/statistics/extended_p_square.hpp | 2 ++
branches/release/boost/accumulators/statistics/extended_p_square_quantile.hpp | 13 +++++++++----
branches/release/boost/accumulators/statistics/kurtosis.hpp | 12 +++++++-----
branches/release/boost/accumulators/statistics/max.hpp | 2 ++
branches/release/boost/accumulators/statistics/mean.hpp | 3 +++
branches/release/boost/accumulators/statistics/median.hpp | 4 ++++
branches/release/boost/accumulators/statistics/min.hpp | 2 ++
branches/release/boost/accumulators/statistics/p_square_cumulative_distribution.hpp | 2 ++
branches/release/boost/accumulators/statistics/p_square_quantile.hpp | 3 +++
branches/release/boost/accumulators/statistics/peaks_over_threshold.hpp | 2 ++
branches/release/boost/accumulators/statistics/rolling_count.hpp | 2 ++
branches/release/boost/accumulators/statistics/rolling_mean.hpp | 2 ++
branches/release/boost/accumulators/statistics/rolling_sum.hpp | 2 ++
branches/release/boost/accumulators/statistics/rolling_window.hpp | 4 ++++
branches/release/boost/accumulators/statistics/skewness.hpp | 10 ++++++----
branches/release/boost/accumulators/statistics/sum.hpp | 4 ++++
branches/release/boost/accumulators/statistics/tail.hpp | 12 +++++++-----
branches/release/boost/accumulators/statistics/tail_mean.hpp | 3 +++
branches/release/boost/accumulators/statistics/tail_quantile.hpp | 2 ++
branches/release/boost/accumulators/statistics/tail_variate.hpp | 3 +++
branches/release/boost/accumulators/statistics/tail_variate_means.hpp | 3 +++
branches/release/boost/accumulators/statistics/variance.hpp | 5 ++++-
branches/release/boost/accumulators/statistics/weighted_covariance.hpp | 2 ++
branches/release/boost/accumulators/statistics/weighted_density.hpp | 2 ++
branches/release/boost/accumulators/statistics/weighted_extended_p_square.hpp | 2 ++
branches/release/boost/accumulators/statistics/weighted_kurtosis.hpp | 12 +++++++-----
branches/release/boost/accumulators/statistics/weighted_mean.hpp | 2 ++
branches/release/boost/accumulators/statistics/weighted_median.hpp | 2 ++
branches/release/boost/accumulators/statistics/weighted_p_square_cumulative_distribution.hpp | 2 ++
branches/release/boost/accumulators/statistics/weighted_p_square_quantile.hpp | 3 +++
branches/release/boost/accumulators/statistics/weighted_peaks_over_threshold.hpp | 2 ++
branches/release/boost/accumulators/statistics/weighted_skewness.hpp | 10 ++++++----
branches/release/boost/accumulators/statistics/weighted_sum.hpp | 3 +++
branches/release/boost/accumulators/statistics/weighted_tail_mean.hpp | 2 ++
branches/release/boost/accumulators/statistics/weighted_tail_quantile.hpp | 2 ++
branches/release/boost/accumulators/statistics/weighted_tail_variate_means.hpp | 3 +++
branches/release/boost/accumulators/statistics/weighted_variance.hpp | 5 ++++-
branches/release/boost/accumulators/statistics_fwd.hpp | 4 ++++
branches/release/libs/accumulators/example/main.cpp | 2 +-
branches/release/libs/accumulators/test/error_of.cpp | 8 ++++----
branches/release/libs/accumulators/test/kurtosis.cpp | 6 +++---
branches/release/libs/accumulators/test/mean.cpp | 12 ++++++------
branches/release/libs/accumulators/test/moment.cpp | 4 ++--
branches/release/libs/accumulators/test/reference.cpp | 4 ++--
branches/release/libs/accumulators/test/skewness.cpp | 4 ++--
branches/release/libs/accumulators/test/variance.cpp | 2 +-
branches/release/libs/accumulators/test/weighted_kurtosis.cpp | 6 +++---
branches/release/libs/accumulators/test/weighted_mean.cpp | 12 ++++++------
branches/release/libs/accumulators/test/weighted_moment.cpp | 4 ++--
branches/release/libs/accumulators/test/weighted_skewness.cpp | 4 ++--
branches/release/libs/accumulators/test/weighted_variance.cpp | 2 +-
58 files changed, 177 insertions(+), 69 deletions(-)
Modified: branches/release/boost/accumulators/accumulators_fwd.hpp
==============================================================================
--- branches/release/boost/accumulators/accumulators_fwd.hpp (original)
+++ branches/release/boost/accumulators/accumulators_fwd.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -179,6 +179,11 @@
template<typename T>
struct is_accumulator_set;
+
+ 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); } }
}
}} // namespace boost::accumulators
Modified: branches/release/boost/accumulators/framework/accumulator_set.hpp
==============================================================================
--- branches/release/boost/accumulators/framework/accumulator_set.hpp (original)
+++ branches/release/boost/accumulators/framework/accumulator_set.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -42,8 +42,8 @@
template<typename Args>
struct accumulator_visitor
{
- explicit accumulator_visitor(Args const &args)
- : args(args)
+ explicit accumulator_visitor(Args const &a)
+ : args(a)
{
}
Modified: branches/release/boost/accumulators/framework/accumulators/droppable_accumulator.hpp
==============================================================================
--- branches/release/boost/accumulators/framework/accumulators/droppable_accumulator.hpp (original)
+++ branches/release/boost/accumulators/framework/accumulators/droppable_accumulator.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -218,9 +218,9 @@
private:
with_cached_result &operator =(with_cached_result const &);
- void set(result_type const &result)
+ void set(result_type const &r)
{
- ::new(this->cache.address()) result_type(result);
+ ::new(this->cache.address()) result_type(r);
}
result_type const &get() const
Modified: branches/release/boost/accumulators/framework/accumulators/external_accumulator.hpp
==============================================================================
--- branches/release/boost/accumulators/framework/accumulators/external_accumulator.hpp (original)
+++ branches/release/boost/accumulators/framework/accumulators/external_accumulator.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -45,7 +45,7 @@
// No named parameter passed to the extractor. Maybe the external
// feature is held by reference<>.
extractor<feature_tag> extract;
- return extract(reference_tag<Tag>(args));
+ return extract(accumulators::reference_tag<Tag>(args));
}
template<typename Args, typename AccumulatorSet>
Modified: branches/release/boost/accumulators/statistics/count.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/count.hpp (original)
+++ branches/release/boost/accumulators/statistics/count.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -69,6 +69,8 @@
namespace extract
{
extractor<tag::count> const count = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(count)
}
using extract::count;
Modified: branches/release/boost/accumulators/statistics/covariance.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/covariance.hpp (original)
+++ branches/release/boost/accumulators/statistics/covariance.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -190,6 +190,8 @@
namespace extract
{
extractor<tag::abstract_covariance> const covariance = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(covariance)
}
using extract::covariance;
Modified: branches/release/boost/accumulators/statistics/density.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/density.hpp (original)
+++ branches/release/boost/accumulators/statistics/density.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -221,6 +221,8 @@
namespace extract
{
extractor<tag::density> const density = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(density)
}
using extract::density;
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 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -268,6 +268,8 @@
namespace extract
{
extractor<tag::extended_p_square> const extended_p_square = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(extended_p_square)
}
using extract::extended_p_square;
Modified: branches/release/boost/accumulators/statistics/extended_p_square_quantile.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/extended_p_square_quantile.hpp (original)
+++ branches/release/boost/accumulators/statistics/extended_p_square_quantile.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -124,7 +124,7 @@
}
else
{
- result_type result;
+ result_type res;
if (is_same<Impl2, linear>::value)
{
@@ -139,7 +139,7 @@
float_type a = numeric::average(h1 - h0, p1 - p0);
float_type b = h1 - p1 * a;
- result = a * this->probability + b;
+ res = a * this->probability + b;
}
else
{
@@ -177,10 +177,10 @@
float_type b = hp21 - a * p21;
float_type c = h2 - a * p2 * p2 - b * p2;
- result = a * this->probability * this-> probability + b * this->probability + c;
+ res = a * this->probability * this-> probability + b * this->probability + c;
}
- return result;
+ return res;
}
}
@@ -230,6 +230,11 @@
extractor<tag::extended_p_square_quantile_quadratic> const extended_p_square_quantile_quadratic = {};
extractor<tag::weighted_extended_p_square_quantile> const weighted_extended_p_square_quantile = {};
extractor<tag::weighted_extended_p_square_quantile_quadratic> const weighted_extended_p_square_quantile_quadratic = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(extended_p_square_quantile)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(extended_p_square_quantile_quadratic)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(weighted_extended_p_square_quantile)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(weighted_extended_p_square_quantile_quadratic)
}
using extract::extended_p_square_quantile;
Modified: branches/release/boost/accumulators/statistics/kurtosis.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/kurtosis.hpp (original)
+++ branches/release/boost/accumulators/statistics/kurtosis.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -55,12 +55,12 @@
result_type result(Args const &args) const
{
return numeric::average(
- moment<4>(args)
- - 4. * moment<3>(args) * mean(args)
- + 6. * moment<2>(args) * mean(args) * mean(args)
+ accumulators::moment<4>(args)
+ - 4. * accumulators::moment<3>(args) * mean(args)
+ + 6. * accumulators::moment<2>(args) * mean(args) * mean(args)
- 3. * mean(args) * mean(args) * mean(args) * mean(args)
- , ( moment<2>(args) - mean(args) * mean(args) )
- * ( moment<2>(args) - mean(args) * mean(args) )
+ , ( accumulators::moment<2>(args) - mean(args) * mean(args) )
+ * ( accumulators::moment<2>(args) - mean(args) * mean(args) )
) - 3.;
}
};
@@ -87,6 +87,8 @@
namespace extract
{
extractor<tag::kurtosis> const kurtosis = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(kurtosis)
}
using extract::kurtosis;
Modified: branches/release/boost/accumulators/statistics/max.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/max.hpp (original)
+++ branches/release/boost/accumulators/statistics/max.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -74,6 +74,8 @@
namespace extract
{
extractor<tag::max> const max = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(max)
}
using extract::max;
Modified: branches/release/boost/accumulators/statistics/mean.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/mean.hpp (original)
+++ branches/release/boost/accumulators/statistics/mean.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -145,6 +145,9 @@
extractor<tag::mean> const mean = {};
extractor<tag::mean_of_weights> const mean_of_weights = {};
BOOST_ACCUMULATORS_DEFINE_EXTRACTOR(tag, mean_of_variates, (typename)(typename))
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(mean)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(mean_of_weights)
}
using extract::mean;
Modified: branches/release/boost/accumulators/statistics/median.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/median.hpp (original)
+++ branches/release/boost/accumulators/statistics/median.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -208,6 +208,10 @@
extractor<tag::median> const median = {};
extractor<tag::with_density_median> const with_density_median = {};
extractor<tag::with_p_square_cumulative_distribution_median> const with_p_square_cumulative_distribution_median = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(median)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(with_density_median)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(with_p_square_cumulative_distribution_median)
}
using extract::median;
Modified: branches/release/boost/accumulators/statistics/min.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/min.hpp (original)
+++ branches/release/boost/accumulators/statistics/min.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -74,6 +74,8 @@
namespace extract
{
extractor<tag::min> const min = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(min)
}
using extract::min;
Modified: branches/release/boost/accumulators/statistics/p_square_cumulative_distribution.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/p_square_cumulative_distribution.hpp (original)
+++ branches/release/boost/accumulators/statistics/p_square_cumulative_distribution.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -235,6 +235,8 @@
namespace extract
{
extractor<tag::p_square_cumulative_distribution> const p_square_cumulative_distribution = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(p_square_cumulative_distribution)
}
using extract::p_square_cumulative_distribution;
Modified: branches/release/boost/accumulators/statistics/p_square_quantile.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/p_square_quantile.hpp (original)
+++ branches/release/boost/accumulators/statistics/p_square_quantile.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -230,6 +230,9 @@
{
extractor<tag::p_square_quantile> const p_square_quantile = {};
extractor<tag::p_square_quantile_for_median> const p_square_quantile_for_median = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(p_square_quantile)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(p_square_quantile_for_median)
}
using extract::p_square_quantile;
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 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -334,6 +334,8 @@
namespace extract
{
extractor<tag::abstract_peaks_over_threshold> const peaks_over_threshold = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(peaks_over_threshold)
}
using extract::peaks_over_threshold;
Modified: branches/release/boost/accumulators/statistics/rolling_count.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/rolling_count.hpp (original)
+++ branches/release/boost/accumulators/statistics/rolling_count.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -69,6 +69,8 @@
namespace extract
{
extractor<tag::rolling_count> const rolling_count = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(rolling_count)
}
using extract::rolling_count;
Modified: branches/release/boost/accumulators/statistics/rolling_mean.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/rolling_mean.hpp (original)
+++ branches/release/boost/accumulators/statistics/rolling_mean.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -70,6 +70,8 @@
namespace extract
{
extractor<tag::rolling_mean> const rolling_mean = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(rolling_mean)
}
using extract::rolling_mean;
Modified: branches/release/boost/accumulators/statistics/rolling_sum.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/rolling_sum.hpp (original)
+++ branches/release/boost/accumulators/statistics/rolling_sum.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -82,6 +82,8 @@
namespace extract
{
extractor<tag::rolling_sum> const rolling_sum = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(rolling_sum)
}
using extract::rolling_sum;
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 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -19,6 +19,7 @@
#include <boost/accumulators/framework/parameters/sample.hpp>
#include <boost/accumulators/framework/parameters/accumulator.hpp>
#include <boost/accumulators/numeric/functional.hpp>
+#include <boost/accumulators/statistics_fwd.hpp>
namespace boost { namespace accumulators
{
@@ -155,6 +156,9 @@
{
extractor<tag::rolling_window_plus1> const rolling_window_plus1 = {};
extractor<tag::rolling_window> const rolling_window = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(rolling_window_plus1)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(rolling_window)
}
using extract::rolling_window_plus1;
Modified: branches/release/boost/accumulators/statistics/skewness.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/skewness.hpp (original)
+++ branches/release/boost/accumulators/statistics/skewness.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -58,11 +58,11 @@
result_type result(Args const &args) const
{
return numeric::average(
- moment<3>(args)
- - 3. * moment<2>(args) * mean(args)
+ accumulators::moment<3>(args)
+ - 3. * accumulators::moment<2>(args) * mean(args)
+ 2. * mean(args) * mean(args) * mean(args)
- , ( moment<2>(args) - mean(args) * mean(args) )
- * std::sqrt( moment<2>(args) - mean(args) * mean(args) )
+ , ( accumulators::moment<2>(args) - mean(args) * mean(args) )
+ * std::sqrt( accumulators::moment<2>(args) - mean(args) * mean(args) )
);
}
};
@@ -89,6 +89,8 @@
namespace extract
{
extractor<tag::skewness> const skewness = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(skewness)
}
using extract::skewness;
Modified: branches/release/boost/accumulators/statistics/sum.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/sum.hpp (original)
+++ branches/release/boost/accumulators/statistics/sum.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -107,6 +107,10 @@
extractor<tag::sum> const sum = {};
extractor<tag::sum_of_weights> const sum_of_weights = {};
extractor<tag::abstract_sum_of_variates> const sum_of_variates = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(sum)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(sum_of_weights)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(sum_of_variates)
}
using extract::sum;
Modified: branches/release/boost/accumulators/statistics/tail.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/tail.hpp (original)
+++ branches/release/boost/accumulators/statistics/tail.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -71,9 +71,9 @@
template<typename Args>
struct stat_assign_visitor
{
- stat_assign_visitor(Args const &args, std::size_t index)
- : args(args)
- , index(index)
+ stat_assign_visitor(Args const &a, std::size_t i)
+ : args(a)
+ , index(i)
{
}
@@ -246,8 +246,8 @@
struct indirect_cmp
: std::binary_function<std::size_t, std::size_t, bool>
{
- indirect_cmp(std::vector<Sample> const &samples)
- : samples(samples)
+ indirect_cmp(std::vector<Sample> const &s)
+ : samples(s)
{
}
@@ -317,6 +317,8 @@
namespace extract
{
extractor<tag::abstract_tail> const tail = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(tail)
}
using extract::tail;
Modified: branches/release/boost/accumulators/statistics/tail_mean.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/tail_mean.hpp (original)
+++ branches/release/boost/accumulators/statistics/tail_mean.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -198,6 +198,9 @@
{
extractor<tag::abstract_non_coherent_tail_mean> const non_coherent_tail_mean = {};
extractor<tag::tail_mean> const coherent_tail_mean = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(non_coherent_tail_mean)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(coherent_tail_mean)
}
using extract::non_coherent_tail_mean;
Modified: branches/release/boost/accumulators/statistics/tail_quantile.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/tail_quantile.hpp (original)
+++ branches/release/boost/accumulators/statistics/tail_quantile.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -122,6 +122,8 @@
namespace extract
{
extractor<tag::quantile> const tail_quantile = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(tail_quantile)
}
using extract::tail_quantile;
Modified: branches/release/boost/accumulators/statistics/tail_variate.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/tail_variate.hpp (original)
+++ branches/release/boost/accumulators/statistics/tail_variate.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -116,6 +116,9 @@
{
extractor<tag::abstract_tail_variate> const tail_variate = {};
extractor<tag::abstract_tail_weights> const tail_weights = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(tail_variate)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(tail_weights)
}
using extract::tail_variate;
Modified: branches/release/boost/accumulators/statistics/tail_variate_means.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/tail_variate_means.hpp (original)
+++ branches/release/boost/accumulators/statistics/tail_variate_means.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -185,6 +185,9 @@
{
extractor<tag::abstract_absolute_tail_variate_means> const tail_variate_means = {};
extractor<tag::abstract_relative_tail_variate_means> const relative_tail_variate_means = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(tail_variate_means)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(relative_tail_variate_means)
}
using extract::tail_variate_means;
Modified: branches/release/boost/accumulators/statistics/variance.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/variance.hpp (original)
+++ branches/release/boost/accumulators/statistics/variance.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -51,7 +51,7 @@
{
extractor<MeanFeature> mean;
result_type tmp = mean(args);
- return moment<2>(args) - tmp * tmp;
+ return accumulators::moment<2>(args) - tmp * tmp;
}
};
@@ -150,6 +150,9 @@
{
extractor<tag::lazy_variance> const lazy_variance = {};
extractor<tag::variance> const variance = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(lazy_variance)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(variance)
}
using extract::lazy_variance;
Modified: branches/release/boost/accumulators/statistics/weighted_covariance.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/weighted_covariance.hpp (original)
+++ branches/release/boost/accumulators/statistics/weighted_covariance.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -122,6 +122,8 @@
namespace extract
{
extractor<tag::abstract_covariance> const weighted_covariance = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(weighted_covariance)
}
using extract::weighted_covariance;
Modified: branches/release/boost/accumulators/statistics/weighted_density.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/weighted_density.hpp (original)
+++ branches/release/boost/accumulators/statistics/weighted_density.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -210,6 +210,8 @@
namespace extract
{
extractor<tag::density> const weighted_density = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(weighted_density)
}
using extract::weighted_density;
Modified: branches/release/boost/accumulators/statistics/weighted_extended_p_square.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/weighted_extended_p_square.hpp (original)
+++ branches/release/boost/accumulators/statistics/weighted_extended_p_square.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -279,6 +279,8 @@
namespace extract
{
extractor<tag::weighted_extended_p_square> const weighted_extended_p_square = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(weighted_extended_p_square)
}
using extract::weighted_extended_p_square;
Modified: branches/release/boost/accumulators/statistics/weighted_kurtosis.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/weighted_kurtosis.hpp (original)
+++ branches/release/boost/accumulators/statistics/weighted_kurtosis.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -62,12 +62,12 @@
result_type result(Args const &args) const
{
return numeric::average(
- weighted_moment<4>(args)
- - 4. * weighted_moment<3>(args) * weighted_mean(args)
- + 6. * weighted_moment<2>(args) * weighted_mean(args) * weighted_mean(args)
+ accumulators::weighted_moment<4>(args)
+ - 4. * accumulators::weighted_moment<3>(args) * weighted_mean(args)
+ + 6. * accumulators::weighted_moment<2>(args) * weighted_mean(args) * weighted_mean(args)
- 3. * weighted_mean(args) * weighted_mean(args) * weighted_mean(args) * weighted_mean(args)
- , ( weighted_moment<2>(args) - weighted_mean(args) * weighted_mean(args) )
- * ( weighted_moment<2>(args) - weighted_mean(args) * weighted_mean(args) )
+ , ( accumulators::weighted_moment<2>(args) - weighted_mean(args) * weighted_mean(args) )
+ * ( accumulators::weighted_moment<2>(args) - weighted_mean(args) * weighted_mean(args) )
) - 3.;
}
};
@@ -94,6 +94,8 @@
namespace extract
{
extractor<tag::weighted_kurtosis> const weighted_kurtosis = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(weighted_kurtosis)
}
using extract::weighted_kurtosis;
Modified: branches/release/boost/accumulators/statistics/weighted_mean.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/weighted_mean.hpp (original)
+++ branches/release/boost/accumulators/statistics/weighted_mean.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -149,6 +149,8 @@
{
extractor<tag::mean> const weighted_mean = {};
BOOST_ACCUMULATORS_DEFINE_EXTRACTOR(tag, weighted_mean_of_variates, (typename)(typename))
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(weighted_mean)
}
using extract::weighted_mean;
Modified: branches/release/boost/accumulators/statistics/weighted_median.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/weighted_median.hpp (original)
+++ branches/release/boost/accumulators/statistics/weighted_median.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -206,6 +206,8 @@
namespace extract
{
extractor<tag::median> const weighted_median = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(weighted_median)
}
using extract::weighted_median;
Modified: branches/release/boost/accumulators/statistics/weighted_p_square_cumulative_distribution.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/weighted_p_square_cumulative_distribution.hpp (original)
+++ branches/release/boost/accumulators/statistics/weighted_p_square_cumulative_distribution.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -251,6 +251,8 @@
namespace extract
{
extractor<tag::weighted_p_square_cumulative_distribution> const weighted_p_square_cumulative_distribution = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(weighted_p_square_cumulative_distribution)
}
using extract::weighted_p_square_cumulative_distribution;
Modified: branches/release/boost/accumulators/statistics/weighted_p_square_quantile.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/weighted_p_square_quantile.hpp (original)
+++ branches/release/boost/accumulators/statistics/weighted_p_square_quantile.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -241,6 +241,9 @@
{
extractor<tag::weighted_p_square_quantile> const weighted_p_square_quantile = {};
extractor<tag::weighted_p_square_quantile_for_median> const weighted_p_square_quantile_for_median = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(weighted_p_square_quantile)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(weighted_p_square_quantile_for_median)
}
using extract::weighted_p_square_quantile;
Modified: branches/release/boost/accumulators/statistics/weighted_peaks_over_threshold.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/weighted_peaks_over_threshold.hpp (original)
+++ branches/release/boost/accumulators/statistics/weighted_peaks_over_threshold.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -259,6 +259,8 @@
namespace extract
{
extractor<tag::abstract_peaks_over_threshold> const weighted_peaks_over_threshold = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(weighted_peaks_over_threshold)
}
using extract::weighted_peaks_over_threshold;
Modified: branches/release/boost/accumulators/statistics/weighted_skewness.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/weighted_skewness.hpp (original)
+++ branches/release/boost/accumulators/statistics/weighted_skewness.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -59,11 +59,11 @@
result_type result(Args const &args) const
{
return numeric::average(
- weighted_moment<3>(args)
- - 3. * weighted_moment<2>(args) * weighted_mean(args)
+ accumulators::weighted_moment<3>(args)
+ - 3. * accumulators::weighted_moment<2>(args) * weighted_mean(args)
+ 2. * weighted_mean(args) * weighted_mean(args) * weighted_mean(args)
- , ( weighted_moment<2>(args) - weighted_mean(args) * weighted_mean(args) )
- * std::sqrt( weighted_moment<2>(args) - weighted_mean(args) * weighted_mean(args) )
+ , ( accumulators::weighted_moment<2>(args) - weighted_mean(args) * weighted_mean(args) )
+ * std::sqrt( accumulators::weighted_moment<2>(args) - weighted_mean(args) * weighted_mean(args) )
);
}
};
@@ -90,6 +90,8 @@
namespace extract
{
extractor<tag::weighted_skewness> const weighted_skewness = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(weighted_skewness)
}
using extract::weighted_skewness;
Modified: branches/release/boost/accumulators/statistics/weighted_sum.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/weighted_sum.hpp (original)
+++ branches/release/boost/accumulators/statistics/weighted_sum.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -97,6 +97,9 @@
{
extractor<tag::weighted_sum> const weighted_sum = {};
extractor<tag::abstract_weighted_sum_of_variates> const weighted_sum_of_variates = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(weighted_sum)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(weighted_sum_of_variates)
}
using extract::weighted_sum;
Modified: branches/release/boost/accumulators/statistics/weighted_tail_mean.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/weighted_tail_mean.hpp (original)
+++ branches/release/boost/accumulators/statistics/weighted_tail_mean.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -154,6 +154,8 @@
namespace extract
{
extractor<tag::abstract_non_coherent_tail_mean> const non_coherent_weighted_tail_mean = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(non_coherent_weighted_tail_mean)
}
using extract::non_coherent_weighted_tail_mean;
Modified: branches/release/boost/accumulators/statistics/weighted_tail_quantile.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/weighted_tail_quantile.hpp (original)
+++ branches/release/boost/accumulators/statistics/weighted_tail_quantile.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -131,6 +131,8 @@
namespace extract
{
extractor<tag::quantile> const weighted_tail_quantile = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(weighted_tail_quantile)
}
using extract::weighted_tail_quantile;
Modified: branches/release/boost/accumulators/statistics/weighted_tail_variate_means.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/weighted_tail_variate_means.hpp (original)
+++ branches/release/boost/accumulators/statistics/weighted_tail_variate_means.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -211,6 +211,9 @@
{
extractor<tag::abstract_absolute_tail_variate_means> const weighted_tail_variate_means = {};
extractor<tag::abstract_relative_tail_variate_means> const relative_weighted_tail_variate_means = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(weighted_tail_variate_means)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(relative_weighted_tail_variate_means)
}
using extract::weighted_tail_variate_means;
Modified: branches/release/boost/accumulators/statistics/weighted_variance.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics/weighted_variance.hpp (original)
+++ branches/release/boost/accumulators/statistics/weighted_variance.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -50,7 +50,7 @@
{
extractor<MeanFeature> const some_mean = {};
result_type tmp = some_mean(args);
- return weighted_moment<2>(args) - tmp * tmp;
+ return accumulators::weighted_moment<2>(args) - tmp * tmp;
}
};
@@ -140,6 +140,9 @@
{
extractor<tag::lazy_weighted_variance> const lazy_weighted_variance = {};
extractor<tag::weighted_variance> const weighted_variance = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(lazy_weighted_variance)
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(weighted_variance)
}
using extract::lazy_weighted_variance;
Modified: branches/release/boost/accumulators/statistics_fwd.hpp
==============================================================================
--- branches/release/boost/accumulators/statistics_fwd.hpp (original)
+++ branches/release/boost/accumulators/statistics_fwd.hpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -31,6 +31,8 @@
namespace extract
{
extractor<tag::quantile> const quantile = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(quantile)
}
using extract::quantile;
@@ -47,6 +49,8 @@
namespace extract
{
extractor<tag::tail_mean> const tail_mean = {};
+
+ BOOST_ACCUMULATORS_IGNORE_GLOBAL(tail_mean)
}
using extract::tail_mean;
Modified: branches/release/libs/accumulators/example/main.cpp
==============================================================================
--- branches/release/libs/accumulators/example/main.cpp (original)
+++ branches/release/libs/accumulators/example/main.cpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -60,7 +60,7 @@
// since mean depends on count and sum, we can get their results, too.
std::cout << " count(acc) = " << count(acc) << std::endl;
std::cout << " sum(acc) = " << sum(acc) << std::endl;
- std::cout << " moment<2>(acc) = " << moment<2>(acc) << std::endl;
+ std::cout << " moment<2>(acc) = " << accumulators::moment<2>(acc) << std::endl;
}
///////////////////////////////////////////////////////////////////////////////
Modified: branches/release/libs/accumulators/test/error_of.cpp
==============================================================================
--- branches/release/libs/accumulators/test/error_of.cpp (original)
+++ branches/release/libs/accumulators/test/error_of.cpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -23,25 +23,25 @@
acc(1.1);
acc(1.2);
acc(1.3);
- BOOST_CHECK_CLOSE(0.057735, error_of<tag::mean(lazy)>(acc), 1e-4);
+ BOOST_CHECK_CLOSE(0.057735, accumulators::error_of<tag::mean(lazy)>(acc), 1e-4);
accumulator_set<double, stats<tag::error_of<tag::mean(immediate)> > > acc2;
acc2(1.1);
acc2(1.2);
acc2(1.3);
- BOOST_CHECK_CLOSE(0.057735, error_of<tag::mean(immediate)>(acc2), 1e-4);
+ BOOST_CHECK_CLOSE(0.057735, accumulators::error_of<tag::mean(immediate)>(acc2), 1e-4);
accumulator_set<double, stats<with_error<tag::mean(lazy)> > > acc3;
acc3(1.1);
acc3(1.2);
acc3(1.3);
- BOOST_CHECK_CLOSE(0.057735, error_of<tag::mean(lazy)>(acc3), 1e-4);
+ BOOST_CHECK_CLOSE(0.057735, accumulators::error_of<tag::mean(lazy)>(acc3), 1e-4);
accumulator_set<double, stats<with_error<tag::mean(immediate)> > > acc4;
acc4(1.1);
acc4(1.2);
acc4(1.3);
- BOOST_CHECK_CLOSE(0.057735, error_of<tag::mean(immediate)>(acc4), 1e-4);
+ BOOST_CHECK_CLOSE(0.057735, accumulators::error_of<tag::mean(immediate)>(acc4), 1e-4);
}
///////////////////////////////////////////////////////////////////////////////
Modified: branches/release/libs/accumulators/test/kurtosis.cpp
==============================================================================
--- branches/release/libs/accumulators/test/kurtosis.cpp (original)
+++ branches/release/libs/accumulators/test/kurtosis.cpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -50,9 +50,9 @@
acc2(3);
BOOST_CHECK_EQUAL( mean(acc2), 5 );
- BOOST_CHECK_EQUAL( moment<2>(acc2), 159./5. );
- BOOST_CHECK_EQUAL( moment<3>(acc2), 1171./5. );
- BOOST_CHECK_EQUAL( moment<4>(acc2), 1863 );
+ BOOST_CHECK_EQUAL( accumulators::moment<2>(acc2), 159./5. );
+ BOOST_CHECK_EQUAL( accumulators::moment<3>(acc2), 1171./5. );
+ BOOST_CHECK_EQUAL( accumulators::moment<4>(acc2), 1863 );
BOOST_CHECK_CLOSE( kurtosis(acc2), -1.39965397924, 1e-6 );
}
Modified: branches/release/libs/accumulators/test/mean.cpp
==============================================================================
--- branches/release/libs/accumulators/test/mean.cpp (original)
+++ branches/release/libs/accumulators/test/mean.cpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -37,19 +37,19 @@
BOOST_CHECK_CLOSE(1., mean(acc), 1e-5);
BOOST_CHECK_EQUAL(1u, count(acc));
BOOST_CHECK_EQUAL(1, sum(acc));
- BOOST_CHECK_CLOSE(3., (mean_of_variates<int, tag::covariate1>(acc)), 1e-5);
+ BOOST_CHECK_CLOSE(3., (accumulators::mean_of_variates<int, tag::covariate1>(acc)), 1e-5);
acc(0, covariate1 = 4);
BOOST_CHECK_CLOSE(0.5, mean(acc), 1e-5);
BOOST_CHECK_EQUAL(2u, count(acc));
BOOST_CHECK_EQUAL(1, sum(acc));
- BOOST_CHECK_CLOSE(3.5, (mean_of_variates<int, tag::covariate1>(acc)), 1e-5);
+ BOOST_CHECK_CLOSE(3.5, (accumulators::mean_of_variates<int, tag::covariate1>(acc)), 1e-5);
acc(2, covariate1 = 8);
BOOST_CHECK_CLOSE(1., mean(acc), 1e-5);
BOOST_CHECK_EQUAL(3u, count(acc));
BOOST_CHECK_EQUAL(3, sum(acc));
- BOOST_CHECK_CLOSE(5., (mean_of_variates<int, tag::covariate1>(acc)), 1e-5);
+ BOOST_CHECK_CLOSE(5., (accumulators::mean_of_variates<int, tag::covariate1>(acc)), 1e-5);
assert_is_double(mean(acc));
@@ -64,17 +64,17 @@
acc2(1, covariate1 = 3);
BOOST_CHECK_CLOSE(1., mean(acc2), 1e-5);
BOOST_CHECK_EQUAL(1u, count(acc2));
- BOOST_CHECK_CLOSE(3., (mean_of_variates<int, tag::covariate1>(acc2)), 1e-5);
+ BOOST_CHECK_CLOSE(3., (accumulators::mean_of_variates<int, tag::covariate1>(acc2)), 1e-5);
acc2(0, covariate1 = 4);
BOOST_CHECK_CLOSE(0.5, mean(acc2), 1e-5);
BOOST_CHECK_EQUAL(2u, count(acc2));
- BOOST_CHECK_CLOSE(3.5, (mean_of_variates<int, tag::covariate1>(acc2)), 1e-5);
+ BOOST_CHECK_CLOSE(3.5, (accumulators::mean_of_variates<int, tag::covariate1>(acc2)), 1e-5);
acc2(2, covariate1 = 8);
BOOST_CHECK_CLOSE(1., mean(acc2), 1e-5);
BOOST_CHECK_EQUAL(3u, count(acc2));
- BOOST_CHECK_CLOSE(5., (mean_of_variates<int, tag::covariate1>(acc2)), 1e-5);
+ BOOST_CHECK_CLOSE(5., (accumulators::mean_of_variates<int, tag::covariate1>(acc2)), 1e-5);
assert_is_double(mean(acc2));
}
Modified: branches/release/libs/accumulators/test/moment.cpp
==============================================================================
--- branches/release/libs/accumulators/test/moment.cpp (original)
+++ branches/release/libs/accumulators/test/moment.cpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -25,7 +25,7 @@
acc1(5); // + 25
// = 45 / 3 = 15
- BOOST_CHECK_CLOSE(15., moment<2>(acc1), 1e-5);
+ BOOST_CHECK_CLOSE(15., accumulators::moment<2>(acc1), 1e-5);
accumulator_set<int, stats<tag::moment<5> > > acc2;
@@ -35,7 +35,7 @@
acc2(5); // + 3125
// = 4424 / 4 = 1106
- BOOST_CHECK_CLOSE(1106., moment<5>(acc2), 1e-5);
+ BOOST_CHECK_CLOSE(1106., accumulators::moment<5>(acc2), 1e-5);
}
///////////////////////////////////////////////////////////////////////////////
Modified: branches/release/libs/accumulators/test/reference.cpp
==============================================================================
--- branches/release/libs/accumulators/test/reference.cpp (original)
+++ branches/release/libs/accumulators/test/reference.cpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -27,8 +27,8 @@
accumulator_set<double, stats<tag::reference<int, my::tag::int_ref> > > acc(
my::int_ref = i);
- int &ref1 = reference<int, my::tag::int_ref>(acc);
- int &ref2 = reference_tag<my::tag::int_ref>(acc);
+ int &ref1 = accumulators::reference<int, my::tag::int_ref>(acc);
+ int &ref2 = accumulators::reference_tag<my::tag::int_ref>(acc);
BOOST_CHECK_EQUAL(&i, &ref1);
BOOST_CHECK_EQUAL(&i, &ref2);
Modified: branches/release/libs/accumulators/test/skewness.cpp
==============================================================================
--- branches/release/libs/accumulators/test/skewness.cpp (original)
+++ branches/release/libs/accumulators/test/skewness.cpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -50,8 +50,8 @@
acc2(3);
BOOST_CHECK_EQUAL( mean(acc2), 5 );
- BOOST_CHECK_EQUAL( moment<2>(acc2), 159./5. );
- BOOST_CHECK_EQUAL( moment<3>(acc2), 1171./5. );
+ BOOST_CHECK_EQUAL( accumulators::moment<2>(acc2), 159./5. );
+ BOOST_CHECK_EQUAL( accumulators::moment<3>(acc2), 1171./5. );
BOOST_CHECK_CLOSE( skewness(acc2), 0.406040288214, 1e-6 );
}
Modified: branches/release/libs/accumulators/test/variance.cpp
==============================================================================
--- branches/release/libs/accumulators/test/variance.cpp (original)
+++ branches/release/libs/accumulators/test/variance.cpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -38,7 +38,7 @@
BOOST_CHECK_EQUAL(5u, count(acc1));
BOOST_CHECK_CLOSE(3., mean(acc1), 1e-5);
- BOOST_CHECK_CLOSE(11., moment<2>(acc1), 1e-5);
+ BOOST_CHECK_CLOSE(11., accumulators::moment<2>(acc1), 1e-5);
BOOST_CHECK_CLOSE(2., variance(acc1), 1e-5);
// immediate variance
Modified: branches/release/libs/accumulators/test/weighted_kurtosis.cpp
==============================================================================
--- branches/release/libs/accumulators/test/weighted_kurtosis.cpp (original)
+++ branches/release/libs/accumulators/test/weighted_kurtosis.cpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -50,9 +50,9 @@
acc2(3, weight = 2);
BOOST_CHECK_EQUAL( weighted_mean(acc2), 42./11. );
- BOOST_CHECK_EQUAL( weighted_moment<2>(acc2), 212./11. );
- BOOST_CHECK_EQUAL( weighted_moment<3>(acc2), 1350./11. );
- BOOST_CHECK_EQUAL( weighted_moment<4>(acc2), 9956./11. );
+ BOOST_CHECK_EQUAL( accumulators::weighted_moment<2>(acc2), 212./11. );
+ BOOST_CHECK_EQUAL( accumulators::weighted_moment<3>(acc2), 1350./11. );
+ BOOST_CHECK_EQUAL( accumulators::weighted_moment<4>(acc2), 9956./11. );
BOOST_CHECK_CLOSE( weighted_kurtosis(acc2), 0.58137026432, 1e-6 );
}
Modified: branches/release/libs/accumulators/test/weighted_mean.cpp
==============================================================================
--- branches/release/libs/accumulators/test/weighted_mean.cpp (original)
+++ branches/release/libs/accumulators/test/weighted_mean.cpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -40,21 +40,21 @@
BOOST_CHECK_EQUAL(1u, count(acc));
BOOST_CHECK_EQUAL(2, sum(acc));
BOOST_CHECK_CLOSE(2., mean_of_weights(acc), 1e-5);
- BOOST_CHECK_CLOSE(3., (weighted_mean_of_variates<int, tag::covariate1>(acc)), 1e-5);
+ BOOST_CHECK_CLOSE(3., (accumulators::weighted_mean_of_variates<int, tag::covariate1>(acc)), 1e-5);
acc(0, weight = 4, covariate1 = 4);
BOOST_CHECK_CLOSE(1./3., weighted_mean(acc), 1e-5);
BOOST_CHECK_EQUAL(2u, count(acc));
BOOST_CHECK_EQUAL(2, sum(acc));
BOOST_CHECK_CLOSE(3., mean_of_weights(acc), 1e-5);
- BOOST_CHECK_CLOSE(11./3., (weighted_mean_of_variates<int, tag::covariate1>(acc)), 1e-5);
+ BOOST_CHECK_CLOSE(11./3., (accumulators::weighted_mean_of_variates<int, tag::covariate1>(acc)), 1e-5);
acc(2, weight = 9, covariate1 = 8);
BOOST_CHECK_CLOSE(4./3., weighted_mean(acc), 1e-5);
BOOST_CHECK_EQUAL(3u, count(acc));
BOOST_CHECK_EQUAL(20, sum(acc));
BOOST_CHECK_CLOSE(5., mean_of_weights(acc), 1e-5);
- BOOST_CHECK_CLOSE(94./15., (weighted_mean_of_variates<int, tag::covariate1>(acc)), 1e-5);
+ BOOST_CHECK_CLOSE(94./15., (accumulators::weighted_mean_of_variates<int, tag::covariate1>(acc)), 1e-5);
assert_is_double(mean(acc));
@@ -72,19 +72,19 @@
BOOST_CHECK_CLOSE(1., weighted_mean(acc2), 1e-5);
BOOST_CHECK_EQUAL(1u, count(acc2));
BOOST_CHECK_CLOSE(2., mean_of_weights(acc2), 1e-5);
- BOOST_CHECK_CLOSE(3., (weighted_mean_of_variates<int, tag::covariate1>(acc2)), 1e-5);
+ BOOST_CHECK_CLOSE(3., (accumulators::weighted_mean_of_variates<int, tag::covariate1>(acc2)), 1e-5);
acc2(0, weight = 4, covariate1 = 4);
BOOST_CHECK_CLOSE(1./3., weighted_mean(acc2), 1e-5);
BOOST_CHECK_EQUAL(2u, count(acc2));
BOOST_CHECK_CLOSE(3., mean_of_weights(acc2), 1e-5);
- BOOST_CHECK_CLOSE(11./3., (weighted_mean_of_variates<int, tag::covariate1>(acc2)), 1e-5);
+ BOOST_CHECK_CLOSE(11./3., (accumulators::weighted_mean_of_variates<int, tag::covariate1>(acc2)), 1e-5);
acc2(2, weight = 9, covariate1 = 8);
BOOST_CHECK_CLOSE(4./3., weighted_mean(acc2), 1e-5);
BOOST_CHECK_EQUAL(3u, count(acc2));
BOOST_CHECK_CLOSE(5., mean_of_weights(acc2), 1e-5);
- BOOST_CHECK_CLOSE(94./15., (mean_of_variates<int, tag::covariate1>(acc2)), 1e-5);
+ BOOST_CHECK_CLOSE(94./15., (accumulators::mean_of_variates<int, tag::covariate1>(acc2)), 1e-5);
assert_is_double(mean(acc2));
}
Modified: branches/release/libs/accumulators/test/weighted_moment.cpp
==============================================================================
--- branches/release/libs/accumulators/test/weighted_moment.cpp (original)
+++ branches/release/libs/accumulators/test/weighted_moment.cpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -29,8 +29,8 @@
acc7(2.7, weight = 1.4);
acc7(1.8, weight = 0.9);
- BOOST_CHECK_CLOSE(5.403, weighted_moment<2>(acc2), 1e-5);
- BOOST_CHECK_CLOSE(548.54182, weighted_moment<7>(acc7), 1e-5);
+ BOOST_CHECK_CLOSE(5.403, accumulators::weighted_moment<2>(acc2), 1e-5);
+ BOOST_CHECK_CLOSE(548.54182, accumulators::weighted_moment<7>(acc7), 1e-5);
}
///////////////////////////////////////////////////////////////////////////////
Modified: branches/release/libs/accumulators/test/weighted_skewness.cpp
==============================================================================
--- branches/release/libs/accumulators/test/weighted_skewness.cpp (original)
+++ branches/release/libs/accumulators/test/weighted_skewness.cpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -50,8 +50,8 @@
acc2(3, weight = 2);
BOOST_CHECK_EQUAL( weighted_mean(acc2), 42./11. );
- BOOST_CHECK_EQUAL( weighted_moment<2>(acc2), 212./11. );
- BOOST_CHECK_EQUAL( weighted_moment<3>(acc2), 1350./11. );
+ BOOST_CHECK_EQUAL( accumulators::weighted_moment<2>(acc2), 212./11. );
+ BOOST_CHECK_EQUAL( accumulators::weighted_moment<3>(acc2), 1350./11. );
BOOST_CHECK_CLOSE( weighted_skewness(acc2), 1.30708406282, 1e-6 );
}
Modified: branches/release/libs/accumulators/test/weighted_variance.cpp
==============================================================================
--- branches/release/libs/accumulators/test/weighted_variance.cpp (original)
+++ branches/release/libs/accumulators/test/weighted_variance.cpp 2009-07-22 13:02:50 EDT (Wed, 22 Jul 2009)
@@ -32,7 +32,7 @@
BOOST_CHECK_EQUAL(5u, count(acc1));
BOOST_CHECK_CLOSE(2.9090909, weighted_mean(acc1), 1e-5);
- BOOST_CHECK_CLOSE(10.1818182, weighted_moment<2>(acc1), 1e-5);
+ BOOST_CHECK_CLOSE(10.1818182, accumulators::weighted_moment<2>(acc1), 1e-5);
BOOST_CHECK_CLOSE(1.7190083, weighted_variance(acc1), 1e-5);
accumulator_set<int, stats<tag::weighted_variance>, int> acc2;