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

nicer fill interface and clang-format

Browse Source
This commit is contained in:
Hans Dembinski
2017-05-02 14:22:27 +02:00
parent aecfab98bb
commit 9272cf896b
17 changed files with 351 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/python/histogram.cpp
View File

@@ -231,11 +231,11 @@ python::object histogram_fill(python::tuple args, python::dict kwargs) {
python::object ow;
if (kwargs) {
if (len(kwargs) > 1 || !kwargs.has_key("w")) {
if (len(kwargs) > 1 || !kwargs.has_key("weight")) {
PyErr_SetString(PyExc_RuntimeError, "only keyword w allowed");
python::throw_error_already_set();
}
ow = kwargs.get("w");
ow = kwargs.get("weight");
}
#ifdef HAVE_NUMPY
@@ -286,11 +286,11 @@ python::object histogram_fill(python::tuple args, python::dict kwargs) {
for (unsigned i = 0; i < dims[0]; ++i) {
double *v = reinterpret_cast<double *>(PyArray_GETPTR1(python::array_cast(a), i));
double *w = reinterpret_cast<double *>(PyArray_GETPTR1(python::array_cast(aw), i));
self.wfill(*w, v, v + self.dim());
self.fill(v, v + self.dim(), weight(*w));
}
} else {
PyErr_SetString(PyExc_ValueError, "w is not a sequence");
PyErr_SetString(PyExc_ValueError, "weight is not a sequence");
python::throw_error_already_set();
}
} else {
@@ -326,7 +326,7 @@ python::object histogram_fill(python::tuple args, python::dict kwargs) {
self.fill(v, v + self.dim());
} else {
const double w = python::extract<double>(ow);
self.wfill(w, v, v + self.dim());
self.fill(v, v + self.dim(), weight(w));
}
return python::object();