boost_mirror/histogram
1
0
Fork 0
mirror of https://github.com/boostorg/histogram.git synced 2025-05-11 21:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplification

Browse Source
This commit is contained in:
Hans Dembinski 2016-04-14 23:37:40 -04:00
parent aaf672d9a3
commit f2b51bcb11
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/histogram/axis.hpp
View File

@ -197,6 +197,8 @@ public:
const std::string& operator[](int idx) const const std::string& operator[](int idx) const
{ return categories_[idx]; } { return categories_[idx]; }
inline bool uoflow() const { return false; }
bool operator==(const category_axis&) const; bool operator==(const category_axis&) const;
private: private:
std::vector<std::string> categories_; std::vector<std::string> categories_;

7
include/boost/histogram/basic_histogram.hpp
View File

@ -30,6 +30,8 @@ public:
~basic_histogram() {} ~basic_histogram() {}
unsigned dim() const { return axes_.size(); } unsigned dim() const { return axes_.size(); }
unsigned bins(unsigned i) const { return size_[i]; }
unsigned shape(unsigned i) const { return size_[i] + 2 * uoflow_[i]; }
template <typename T> template <typename T>
T& axis(unsigned i) T& axis(unsigned i)
@ -41,9 +43,6 @@ public:
{ if (is_same<T, axis_type>::value) return axes_[i]; { if (is_same<T, axis_type>::value) return axes_[i];
return boost::get<const T&>(axes_[i]); } return boost::get<const T&>(axes_[i]); }
unsigned bins(unsigned i) const { return size_[i]; }
unsigned shape(unsigned i) const { return size_[i] + 2 * uoflow_[i]; }
protected: protected:
basic_histogram() {} basic_histogram() {}
explicit basic_histogram(const axes_type& axes); explicit basic_histogram(const axes_type& axes);
@ -61,8 +60,6 @@ protected:
BOOST_PP_REPEAT_FROM_TO(1, BOOST_HISTOGRAM_AXIS_LIMIT, BOOST_HISTOGRAM_BASE_CTOR, nil) BOOST_PP_REPEAT_FROM_TO(1, BOOST_HISTOGRAM_AXIS_LIMIT, BOOST_HISTOGRAM_BASE_CTOR, nil)
bool operator==(const basic_histogram&) const; bool operator==(const basic_histogram&) const;
bool operator!=(const basic_histogram& o) const
{ return !operator==(o); }
template <typename Array> template <typename Array>
inline inline

4
include/boost/histogram/visitors.hpp
View File

@ -16,16 +16,12 @@ namespace detail {
struct fields_visitor : public static_visitor<unsigned> struct fields_visitor : public static_visitor<unsigned>
{ {
unsigned operator()(const category_axis& a) const { return a.bins(); }
template <typename A> template <typename A>
unsigned operator()(const A& a) const { return a.bins() + 2 * a.uoflow(); } unsigned operator()(const A& a) const { return a.bins() + 2 * a.uoflow(); }
}; };
struct uoflow_visitor : public static_visitor<bool> struct uoflow_visitor : public static_visitor<bool>
{ {
bool operator()(const category_axis& a) const { return false; }
template <typename A> template <typename A>
bool operator()(const A& a) const { return a.uoflow(); } bool operator()(const A& a) const { return a.uoflow(); }
}; };