|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r55076 - in trunk: boost/accumulators/framework/accumulators boost/accumulators/statistics libs/accumulators/example libs/accumulators/test
From: eric_at_[hidden]
Date: 2009-07-21 21:34:14
Author: eric_niebler
Date: 2009-07-21 21:34:11 EDT (Tue, 21 Jul 2009)
New Revision: 55076
URL: http://svn.boost.org/trac/boost/changeset/55076
Log:
portability fixed for gcc-4.4
Text files modified:
trunk/boost/accumulators/framework/accumulators/external_accumulator.hpp | 2 +-
trunk/boost/accumulators/statistics/kurtosis.hpp | 10 +++++-----
trunk/boost/accumulators/statistics/skewness.hpp | 8 ++++----
trunk/boost/accumulators/statistics/variance.hpp | 2 +-
trunk/boost/accumulators/statistics/weighted_kurtosis.hpp | 10 +++++-----
trunk/boost/accumulators/statistics/weighted_skewness.hpp | 8 ++++----
trunk/boost/accumulators/statistics/weighted_variance.hpp | 2 +-
trunk/libs/accumulators/example/main.cpp | 2 +-
trunk/libs/accumulators/test/error_of.cpp | 8 ++++----
trunk/libs/accumulators/test/kurtosis.cpp | 6 +++---
trunk/libs/accumulators/test/mean.cpp | 12 ++++++------
trunk/libs/accumulators/test/moment.cpp | 4 ++--
trunk/libs/accumulators/test/reference.cpp | 4 ++--
trunk/libs/accumulators/test/skewness.cpp | 4 ++--
trunk/libs/accumulators/test/variance.cpp | 2 +-
trunk/libs/accumulators/test/weighted_kurtosis.cpp | 6 +++---
trunk/libs/accumulators/test/weighted_mean.cpp | 12 ++++++------
trunk/libs/accumulators/test/weighted_moment.cpp | 4 ++--
trunk/libs/accumulators/test/weighted_skewness.cpp | 4 ++--
trunk/libs/accumulators/test/weighted_variance.cpp | 2 +-
20 files changed, 56 insertions(+), 56 deletions(-)
Modified: trunk/boost/accumulators/framework/accumulators/external_accumulator.hpp
==============================================================================
--- trunk/boost/accumulators/framework/accumulators/external_accumulator.hpp (original)
+++ trunk/boost/accumulators/framework/accumulators/external_accumulator.hpp 2009-07-21 21:34:11 EDT (Tue, 21 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: trunk/boost/accumulators/statistics/kurtosis.hpp
==============================================================================
--- trunk/boost/accumulators/statistics/kurtosis.hpp (original)
+++ trunk/boost/accumulators/statistics/kurtosis.hpp 2009-07-21 21:34:11 EDT (Tue, 21 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.;
}
};
Modified: trunk/boost/accumulators/statistics/skewness.hpp
==============================================================================
--- trunk/boost/accumulators/statistics/skewness.hpp (original)
+++ trunk/boost/accumulators/statistics/skewness.hpp 2009-07-21 21:34:11 EDT (Tue, 21 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) )
);
}
};
Modified: trunk/boost/accumulators/statistics/variance.hpp
==============================================================================
--- trunk/boost/accumulators/statistics/variance.hpp (original)
+++ trunk/boost/accumulators/statistics/variance.hpp 2009-07-21 21:34:11 EDT (Tue, 21 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;
}
};
Modified: trunk/boost/accumulators/statistics/weighted_kurtosis.hpp
==============================================================================
--- trunk/boost/accumulators/statistics/weighted_kurtosis.hpp (original)
+++ trunk/boost/accumulators/statistics/weighted_kurtosis.hpp 2009-07-21 21:34:11 EDT (Tue, 21 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.;
}
};
Modified: trunk/boost/accumulators/statistics/weighted_skewness.hpp
==============================================================================
--- trunk/boost/accumulators/statistics/weighted_skewness.hpp (original)
+++ trunk/boost/accumulators/statistics/weighted_skewness.hpp 2009-07-21 21:34:11 EDT (Tue, 21 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) )
);
}
};
Modified: trunk/boost/accumulators/statistics/weighted_variance.hpp
==============================================================================
--- trunk/boost/accumulators/statistics/weighted_variance.hpp (original)
+++ trunk/boost/accumulators/statistics/weighted_variance.hpp 2009-07-21 21:34:11 EDT (Tue, 21 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;
}
};
Modified: trunk/libs/accumulators/example/main.cpp
==============================================================================
--- trunk/libs/accumulators/example/main.cpp (original)
+++ trunk/libs/accumulators/example/main.cpp 2009-07-21 21:34:11 EDT (Tue, 21 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: trunk/libs/accumulators/test/error_of.cpp
==============================================================================
--- trunk/libs/accumulators/test/error_of.cpp (original)
+++ trunk/libs/accumulators/test/error_of.cpp 2009-07-21 21:34:11 EDT (Tue, 21 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: trunk/libs/accumulators/test/kurtosis.cpp
==============================================================================
--- trunk/libs/accumulators/test/kurtosis.cpp (original)
+++ trunk/libs/accumulators/test/kurtosis.cpp 2009-07-21 21:34:11 EDT (Tue, 21 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: trunk/libs/accumulators/test/mean.cpp
==============================================================================
--- trunk/libs/accumulators/test/mean.cpp (original)
+++ trunk/libs/accumulators/test/mean.cpp 2009-07-21 21:34:11 EDT (Tue, 21 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: trunk/libs/accumulators/test/moment.cpp
==============================================================================
--- trunk/libs/accumulators/test/moment.cpp (original)
+++ trunk/libs/accumulators/test/moment.cpp 2009-07-21 21:34:11 EDT (Tue, 21 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: trunk/libs/accumulators/test/reference.cpp
==============================================================================
--- trunk/libs/accumulators/test/reference.cpp (original)
+++ trunk/libs/accumulators/test/reference.cpp 2009-07-21 21:34:11 EDT (Tue, 21 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: trunk/libs/accumulators/test/skewness.cpp
==============================================================================
--- trunk/libs/accumulators/test/skewness.cpp (original)
+++ trunk/libs/accumulators/test/skewness.cpp 2009-07-21 21:34:11 EDT (Tue, 21 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: trunk/libs/accumulators/test/variance.cpp
==============================================================================
--- trunk/libs/accumulators/test/variance.cpp (original)
+++ trunk/libs/accumulators/test/variance.cpp 2009-07-21 21:34:11 EDT (Tue, 21 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: trunk/libs/accumulators/test/weighted_kurtosis.cpp
==============================================================================
--- trunk/libs/accumulators/test/weighted_kurtosis.cpp (original)
+++ trunk/libs/accumulators/test/weighted_kurtosis.cpp 2009-07-21 21:34:11 EDT (Tue, 21 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: trunk/libs/accumulators/test/weighted_mean.cpp
==============================================================================
--- trunk/libs/accumulators/test/weighted_mean.cpp (original)
+++ trunk/libs/accumulators/test/weighted_mean.cpp 2009-07-21 21:34:11 EDT (Tue, 21 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: trunk/libs/accumulators/test/weighted_moment.cpp
==============================================================================
--- trunk/libs/accumulators/test/weighted_moment.cpp (original)
+++ trunk/libs/accumulators/test/weighted_moment.cpp 2009-07-21 21:34:11 EDT (Tue, 21 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: trunk/libs/accumulators/test/weighted_skewness.cpp
==============================================================================
--- trunk/libs/accumulators/test/weighted_skewness.cpp (original)
+++ trunk/libs/accumulators/test/weighted_skewness.cpp 2009-07-21 21:34:11 EDT (Tue, 21 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: trunk/libs/accumulators/test/weighted_variance.cpp
==============================================================================
--- trunk/libs/accumulators/test/weighted_variance.cpp (original)
+++ trunk/libs/accumulators/test/weighted_variance.cpp 2009-07-21 21:34:11 EDT (Tue, 21 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;
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