boost/histogram
2
0
Fork 0
mirror of https://github.com/boostorg/histogram.git synced 2026-01-29 19:42:12 +00:00
Code Issues Projects Releases Wiki Activity

WIP: everything compiles but most of histogram class is broken

Browse Source
This commit is contained in:
Hans Dembinski
2018-08-06 00:31:45 +02:00
parent a84f469944
commit 109a7183ab
28 changed files with 1139 additions and 701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/python/axis.cpp
View File

@@ -84,7 +84,7 @@ bp::object variable_init(bp::tuple args, bp::dict kwargs) {
}
boost::string_view label;
auto uo = bha::uoflow::on;
auto uo = bha::uoflow_type::on;
while (bp::len(kwargs) > 0) {
bp::tuple kv = kwargs.popitem();
const char* key_cstr = bp::extract<const char*>(kv[0]);
@@ -93,7 +93,7 @@ bp::object variable_init(bp::tuple args, bp::dict kwargs) {
if (k == "label")
label = boost::string_view(bp::extract<const char*>(v), bp::len(v));
else if (k == "uoflow") {
if (!bp::extract<bool>(v)) uo = bha::uoflow::off;
if (!bp::extract<bool>(v)) uo = bha::uoflow_type::off;
} else {
std::stringstream s;
s << "keyword " << k << " not recognized";
@@ -227,22 +227,22 @@ struct axis_suite : public bp::def_visitor<axis_suite<T>> {
};
template <typename Transform>
bha::regular<double, Transform>* regular_init(unsigned bin, double lower,
double upper, bp::str pylabel,
bool with_uoflow) {
const auto uo = with_uoflow ? bha::uoflow::on : bha::uoflow::off;
return new bha::regular<double, Transform>(
bha::regular<Transform>* regular_init(unsigned bin, double lower,
double upper, bp::str pylabel,
bool with_uoflow) {
const auto uo = with_uoflow ? bha::uoflow_type::on : bha::uoflow_type::off;
return new bha::regular<Transform>(
bin, lower, upper, {bp::extract<const char*>(pylabel)(),
static_cast<std::size_t>(bp::len(pylabel))},
uo);
}
bha::regular<double, bha::transform::pow>* regular_pow_init(
bha::regular<bha::transform::pow>* regular_pow_init(
unsigned bin, double lower, double upper, double power, bp::str pylabel,
bool with_uoflow) {
using namespace ::boost::python;
const auto uo = with_uoflow ? bha::uoflow::on : bha::uoflow::off;
return new bha::regular<double, bha::transform::pow>(
const auto uo = with_uoflow ? bha::uoflow_type::on : bha::uoflow_type::off;
return new bha::regular<bha::transform::pow>(
bin, lower, upper, {extract<const char*>(pylabel)(),
static_cast<std::size_t>(bp::len(pylabel))},
uo, power);
@@ -251,7 +251,7 @@ bha::regular<double, bha::transform::pow>* regular_pow_init(
bha::integer<>* integer_init(int lower, int upper, bp::str pylabel,
bool with_uoflow) {
using namespace ::boost::python;
const auto uo = with_uoflow ? bha::uoflow::on : bha::uoflow::off;
const auto uo = with_uoflow ? bha::uoflow_type::on : bha::uoflow_type::off;
return new bha::integer<>(lower, upper,
{extract<const char*>(pylabel)(),
static_cast<std::size_t>(bp::len(pylabel))},
@@ -281,7 +281,7 @@ void register_axis_types() {
.def(axis_suite<bha::regular<>>());
#define BOOST_HISTOGRAM_PYTHON_REGULAR_CLASS(x) \
class_<bha::regular<double, bha::transform::x>>( \
class_<bha::regular<bha::transform::x>>( \
"regular_" #x, \
"Axis for real-valued data and bins of equal width in " #x \
"-space." \
@@ -292,13 +292,13 @@ void register_axis_types() {
default_call_policies(), \
(arg("bin"), arg("lower"), arg("upper"), \
arg("label") = "", arg("uoflow") = true))) \
.def(axis_suite<bha::regular<double, bha::transform::x>>())
.def(axis_suite<bha::regular<bha::transform::x>>())
BOOST_HISTOGRAM_PYTHON_REGULAR_CLASS(log);
BOOST_HISTOGRAM_PYTHON_REGULAR_CLASS(sqrt);
// BOOST_HISTOGRAM_PYTHON_REGULAR_CLASS(cos);
class_<bha::regular<double, bha::transform::pow>>(
class_<bha::regular<bha::transform::pow>>(
"regular_pow",
"Axis for real-valued data and bins of equal width in power-space."
"\nBinning is a O(1) operation.",
@@ -308,7 +308,7 @@ void register_axis_types() {
regular_pow_init, default_call_policies(),
(arg("bin"), arg("lower"), arg("upper"), arg("power"),
arg("label") = "", arg("uoflow") = true)))
.def(axis_suite<bha::regular<double, bha::transform::pow>>());
.def(axis_suite<bha::regular<bha::transform::pow>>());
class_<bha::circular<>>(
"circular",
@@ -319,7 +319,7 @@ void register_axis_types() {
no_init)
.def(init<unsigned, double, double, const char*>(
(arg("self"), arg("bin"), arg("phase") = 0.0,
arg("perimeter") = bh::detail::two_pi, arg("label") = "")))
arg("perimeter") = bha::circular<>::two_pi, arg("label") = "")))
.def(axis_suite<bha::circular<>>());
class_<bha::variable<>>(

19
src/python/histogram.cpp
View File

@@ -5,10 +5,11 @@
// or copy at http://www.boost.org/LICENSE_1_0.txt)
#include <boost/histogram/detail/cat.hpp>
#include <boost/histogram/dynamic_histogram.hpp>
#include <boost/histogram/histogram.hpp>
#include <boost/histogram/ostream_operators.hpp>
#include <boost/histogram/serialization.hpp>
#include <boost/histogram/storage/adaptive_storage.hpp>
#include <boost/mp11.hpp>
#include <boost/python.hpp>
#include <boost/python/raw_function.hpp>
#include <boost/shared_ptr.hpp>
@@ -23,14 +24,20 @@ namespace np = boost::python::numpy;
#include <memory>
#ifndef BOOST_HISTOGRAM_AXIS_LIMIT
#define BOOST_HISTOGRAM_AXIS_LIMIT 32
#define BOOST_HISTOGRAM_AXIS_LIMIT 16
#endif
namespace mpl = boost::mpl;
namespace bh = boost::histogram;
namespace bp = boost::python;
namespace mp11 = boost::mp11;
using pyhistogram = bh::dynamic_histogram<>;
class pyhistogram : public bh::histogram<> {
using base_type = bh::histogram<>;
public:
using base_type::base_type;
using iterator = bh::histogram<>::const_iterator;
};
#ifdef HAVE_NUMPY
namespace boost {
@@ -161,7 +168,7 @@ bp::object histogram_init(bp::tuple args, bp::dict kwargs) {
for (unsigned i = 0; i < dim; ++i) {
bp::object pa = args[i + 1];
bool success = false;
boost::mp11::mp_for_each<pyhistogram::any_axis_type::types>(
boost::mp11::mp_for_each<bh::axis::types>(
axes_appender(pa, axes, success));
if (!success) {
std::string msg = "require an axis object, got ";
@@ -170,7 +177,7 @@ bp::object histogram_init(bp::tuple args, bp::dict kwargs) {
bp::throw_error_already_set();
}
}
pyhistogram h(axes.begin(), axes.end());
pyhistogram h(axes, typename pyhistogram::storage_type());
return self.attr("__init__")(std::move(h));
}