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

cleanup

Browse Source
This commit is contained in:
Hans Dembinski 2018-07-13 01:35:34 +02:00
parent 39a3d1ad69
commit c7bca32b59
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/python/histogram.cpp
View File

@ -16,7 +16,6 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/variant/apply_visitor.hpp> #include <boost/variant/apply_visitor.hpp>
#include <boost/variant/static_visitor.hpp> #include <boost/variant/static_visitor.hpp>
#include <boost/mpl/for_each.hpp>
#ifdef HAVE_NUMPY #ifdef HAVE_NUMPY
#include <boost/python/numpy.hpp> #include <boost/python/numpy.hpp>
namespace np = boost::python::numpy; namespace np = boost::python::numpy;
@ -163,7 +162,7 @@ bp::object histogram_init(bp::tuple args, bp::dict kwargs) {
for (unsigned i = 0; i < dim; ++i) { for (unsigned i = 0; i < dim; ++i) {
bp::object pa = args[i + 1]; bp::object pa = args[i + 1];
bool success = false; bool success = false;
mpl::for_each<pyhistogram::any_axis_type::types>( boost::mp11::mp_for_each<pyhistogram::any_axis_type::types>(
axes_appender(pa, axes, success) axes_appender(pa, axes, success)
); );
if (!success) { if (!success) {

14
test/histogram_test.cpp
View File

@ -18,7 +18,7 @@
#include <boost/histogram/storage/adaptive_storage.hpp> #include <boost/histogram/storage/adaptive_storage.hpp>
#include <boost/histogram/storage/array_storage.hpp> #include <boost/histogram/storage/array_storage.hpp>
#include <boost/histogram/storage/weight_counter.hpp> #include <boost/histogram/storage/weight_counter.hpp>
#include <boost/mpl/int.hpp> #include <boost/mp11.hpp>
#include <cstdlib> #include <cstdlib>
#include <limits> #include <limits>
#include <numeric> #include <numeric>
@ -30,7 +30,7 @@
using namespace boost::histogram; using namespace boost::histogram;
using namespace boost::histogram::literals; // to get _c suffix using namespace boost::histogram::literals; // to get _c suffix
namespace mpl = boost::mpl; namespace mp11 = boost::mp11;
template <typename S, typename... Axes> template <typename S, typename... Axes>
auto make_histogram(static_tag, Axes &&... axes) auto make_histogram(static_tag, Axes &&... axes)
@ -146,7 +146,7 @@ template <typename Type> void run_tests() {
h(0, 0); h(0, 0);
auto h2 = decltype(h)(h); auto h2 = decltype(h)(h);
BOOST_TEST(h2 == h); BOOST_TEST(h2 == h);
auto h3 = static_histogram<mpl::vector<axis::integer<>, axis::integer<>>, auto h3 = static_histogram<mp11::mp_list<axis::integer<>, axis::integer<>>,
array_storage<unsigned>>(h); array_storage<unsigned>>(h);
BOOST_TEST_EQ(h3, h); BOOST_TEST_EQ(h3, h);
} }
@ -163,7 +163,7 @@ template <typename Type> void run_tests() {
// test self-assign // test self-assign
h2 = h2; h2 = h2;
BOOST_TEST_EQ(h, h2); BOOST_TEST_EQ(h, h2);
auto h3 = static_histogram<mpl::vector<axis::integer<>, axis::integer<>>, auto h3 = static_histogram<mp11::mp_list<axis::integer<>, axis::integer<>>,
array_storage<unsigned>>(); array_storage<unsigned>>();
h3 = h; h3 = h;
BOOST_TEST_EQ(h, h3); BOOST_TEST_EQ(h, h3);
@ -940,7 +940,11 @@ int main() {
// init // init
{ {
auto v = std::vector<axis::any<>>(); auto v = std::vector<
axis::any<
axis::regular<>, axis::integer<>
>
>();
v.push_back(axis::regular<>(4, -1, 1)); v.push_back(axis::regular<>(4, -1, 1));
v.push_back(axis::integer<>(1, 7)); v.push_back(axis::integer<>(1, 7));
auto h = make_dynamic_histogram(v.begin(), v.end()); auto h = make_dynamic_histogram(v.begin(), v.end());