Skip to content

Implement 1st and 3rd Quartile #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
e-kwsm wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Implement 1st and 3rd Quartile #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/boost/accumulators/statistics.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <boost/accumulators/statistics/pot_quantile.hpp>
#include <boost/accumulators/statistics/p_square_cumul_dist.hpp>
#include <boost/accumulators/statistics/p_square_quantile.hpp>
#include <boost/accumulators/statistics/quartile.hpp>
#include <boost/accumulators/statistics/skewness.hpp>
#include <boost/accumulators/statistics/stats.hpp>
#include <boost/accumulators/statistics/sum.hpp>
Expand All @@ -47,6 +48,7 @@
#include <boost/accumulators/statistics/weighted_peaks_over_threshold.hpp>
#include <boost/accumulators/statistics/weighted_p_square_cumul_dist.hpp>
#include <boost/accumulators/statistics/weighted_p_square_quantile.hpp>
#include <boost/accumulators/statistics/weighted_quartile.hpp>
#include <boost/accumulators/statistics/weighted_skewness.hpp>
#include <boost/accumulators/statistics/weighted_sum.hpp>
#include <boost/accumulators/statistics/weighted_sum_kahan.hpp>
Expand Down
25 changes: 24 additions & 1 deletion include/boost/accumulators/statistics/p_square_quantile.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ namespace impl

template<typename Args>
p_square_quantile_impl(Args const &args)
: p(is_same<Impl, for_median>::value ? 0.5 : args[quantile_probability | 0.5])
: p(is_same<Impl, for_median>::value ? 0.5
: is_same<Impl, for_first_quartile>::value ? 0.25
: is_same<Impl, for_third_quartile>::value ? 0.75
: args[quantile_probability | 0.5])
, heights()
, actual_positions()
, desired_positions()
Expand Down Expand Up @@ -220,6 +223,20 @@ namespace tag
///
typedef accumulators::impl::p_square_quantile_impl<mpl::_1, for_median> impl;
};
struct p_square_quantile_for_first_quartile
: depends_on<count>
{
/// INTERNAL ONLY
///
typedef accumulators::impl::p_square_quantile_impl<mpl::_1, for_first_quartile> impl;
};
struct p_square_quantile_for_third_quartile
: depends_on<count>
{
/// INTERNAL ONLY
///
typedef accumulators::impl::p_square_quantile_impl<mpl::_1, for_third_quartile> impl;
};
}

///////////////////////////////////////////////////////////////////////////////
Expand All @@ -230,13 +247,19 @@ namespace extract
{
extractor<tag::p_square_quantile> const p_square_quantile = {};
extractor<tag::p_square_quantile_for_median> const p_square_quantile_for_median = {};
extractor<tag::p_square_quantile_for_first_quartile> const p_square_quantile_for_first_quartile = {};
extractor<tag::p_square_quantile_for_third_quartile> const p_square_quantile_for_third_quartile = {};

BOOST_ACCUMULATORS_IGNORE_GLOBAL(p_square_quantile)
BOOST_ACCUMULATORS_IGNORE_GLOBAL(p_square_quantile_for_median)
BOOST_ACCUMULATORS_IGNORE_GLOBAL(p_square_quantile_for_first_quartile)
BOOST_ACCUMULATORS_IGNORE_GLOBAL(p_square_quantile_for_third_quartile)
}

using extract::p_square_quantile;
using extract::p_square_quantile_for_median;
using extract::p_square_quantile_for_first_quartile;
using extract::p_square_quantile_for_third_quartile;

// So that p_square_quantile can be automatically substituted with
// weighted_p_square_quantile when the weight parameter is non-void
Expand Down
Loading