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

switch from fill to increment

Browse Source
This commit is contained in:
hans.dembinski@gmail.com
2017-02-11 18:41:44 +00:00
parent 719e6036b7
commit fcf9366d89
13 changed files with 213 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/python/histogram.cpp
View File

@@ -75,7 +75,7 @@ histogram_init(python::tuple args, python::dict kwargs) {
}
python::object
histogram_fill(python::tuple args, python::dict kwargs) {
histogram_increment(python::tuple args, python::dict kwargs) {
using namespace python;
const unsigned nargs = len(args);
@@ -143,7 +143,7 @@ histogram_fill(python::tuple args, python::dict kwargs) {
for (unsigned i = 0; i < dims[0]; ++i) {
double* v = reinterpret_cast<double*>(PyArray_GETPTR1(a, i) );
double* w = reinterpret_cast<double*>(PyArray_GETPTR1(aw, i));
self.wfill(*w, v, v+self.dim());
self.wincrement(*w, v, v+self.dim());
}
Py_DECREF(aw);
@@ -154,7 +154,7 @@ histogram_fill(python::tuple args, python::dict kwargs) {
} else {
for (unsigned i = 0; i < dims[0]; ++i) {
double* v = reinterpret_cast<double*>(PyArray_GETPTR1(a, i));
self.fill(v, v+self.dim());
self.increment(v, v+self.dim());
}
}
@@ -175,11 +175,11 @@ histogram_fill(python::tuple args, python::dict kwargs) {
v[i] = extract<double>(args[1 + i]);
if (ow.is_none()) {
self.fill(v, v+self.dim());
self.increment(v, v+self.dim());
} else {
const double w = extract<double>(ow);
self.wfill(w, v, v+self.dim());
self.wincrement(w, v, v+self.dim());
}
return object();
@@ -293,10 +293,10 @@ void register_histogram()
":param int i: index of the axis\n"
":returns: axis object for axis i",
(arg("self"), arg("i") = 0))
.def("fill", raw_function(histogram_fill),
.def("increment", raw_function(histogram_increment),
"Pass a sequence of values with a length n is"
"\nequal to the dimensions of the histogram,"
"\nand optionally a weight w for this fill"
"\nand optionally a weight w for this increment"
"\n(*int* or *float*)."
"\n"
"\nIf Numpy support is enabled, values may also"