boost/histogram
2
0
Fork 0
mirror of https://github.com/boostorg/histogram.git synced 2026-01-30 07:52:11 +00:00
Code Issues Projects Releases Wiki Activity

bug-fix in python interface, fill with weight used weight=1

Browse Source
This commit is contained in:
Hans Dembinski
2016-05-08 22:20:03 -04:00
parent 3b3a583e10
commit 14d4ac9b3a
2 changed files with 66 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/python/histogram.cpp
View File

@@ -56,8 +56,13 @@ histogram_fill(python::tuple args, python::dict kwargs) {
histogram& self = extract<histogram&>(args[0]);
object ow;
if (kwargs)
ow = kwargs["w"];
if (kwargs) {
if (len(kwargs) > 1 || !kwargs.has_key("w")) {
PyErr_SetString(PyExc_RuntimeError, "only keyword w allowed");
throw_error_already_set();
}
ow = kwargs.get("w");
}
#ifdef HAVE_NUMPY
if (nargs == 2) {
@@ -90,7 +95,6 @@ histogram_fill(python::tuple args, python::dict kwargs) {
throw_error_already_set();
}
PyArrayObject* aw = 0;
if (!ow.is_none()) {
if (PySequence_Check(ow.ptr())) {
PyArrayObject* aw = (PyArrayObject*)
@@ -109,16 +113,18 @@ histogram_fill(python::tuple args, python::dict kwargs) {
PyErr_SetString(PyExc_ValueError, "sizes do not match");
throw_error_already_set();
}
}
}
if (aw) {
for (unsigned i = 0; i < dims[0]; ++i) {
double* v = (double*)PyArray_GETPTR1(a, i);
double* w = (double*)PyArray_GETPTR1(aw, i);
self.wfill_c(self.dim(), v, *w);
for (unsigned i = 0; i < dims[0]; ++i) {
double* v = (double*)PyArray_GETPTR1(a, i);
double* w = (double*)PyArray_GETPTR1(aw, i);
self.wfill_c(self.dim(), v, *w);
}
Py_DECREF(aw);
} else {
PyErr_SetString(PyExc_ValueError, "w is not a sequence");
throw_error_already_set();
}
Py_DECREF(aw);
} else {
for (unsigned i = 0; i < dims[0]; ++i) {
double* v = (double*)PyArray_GETPTR1(a, i);