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

allocator support for adaptive_storage, fix for empty tiny_string, more test coverage

Browse Source
This commit is contained in:
hans.dembinski@gmail.com
2017-01-30 17:28:17 +01:00
parent 1cea27fe72
commit 6c87c931e2
14 changed files with 190 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/python/histogram.cpp
View File

@@ -103,7 +103,7 @@ histogram_fill(python::tuple args, python::dict kwargs) {
npy_intp* dims = PyArray_DIMS(a);
switch (PyArray_NDIM(a)) {
case 1:
case 1:
if (self.dim() > 1) {
PyErr_SetString(PyExc_ValueError, "array has to be two-dimensional");
throw_error_already_set();
@@ -127,7 +127,7 @@ histogram_fill(python::tuple args, python::dict kwargs) {
(PyArray_FROM_OTF(ow.ptr(), NPY_DOUBLE, NPY_ARRAY_IN_ARRAY));
if (!aw) {
PyErr_SetString(PyExc_ValueError, "could not convert sequence into array");
throw_error_already_set();
throw_error_already_set();
}
if (PyArray_NDIM(aw) != 1) {
@@ -167,7 +167,7 @@ histogram_fill(python::tuple args, python::dict kwargs) {
const unsigned dim = nargs - 1;
if (dim != self.dim()) {
PyErr_SetString(PyExc_RuntimeError, "wrong number of arguments");
throw_error_already_set();
throw_error_already_set();
}
double v[BOOST_HISTOGRAM_AXIS_LIMIT];
@@ -192,12 +192,12 @@ histogram_value(python::tuple args, python::dict kwargs) {
if (self.dim() != (len(args) - 1)) {
PyErr_SetString(PyExc_RuntimeError, "wrong number of arguments");
throw_error_already_set();
throw_error_already_set();
}
if (kwargs) {
PyErr_SetString(PyExc_ValueError, "no keyword arguments allowed");
throw_error_already_set();
PyErr_SetString(PyExc_RuntimeError, "no keyword arguments allowed");
throw_error_already_set();
}
int idx[BOOST_HISTOGRAM_AXIS_LIMIT];
@@ -214,12 +214,12 @@ histogram_variance(python::tuple args, python::dict kwargs) {
if (self.dim() != (len(args) - 1)) {
PyErr_SetString(PyExc_RuntimeError, "wrong number of arguments");
throw_error_already_set();
throw_error_already_set();
}
if (kwargs) {
PyErr_SetString(PyExc_RuntimeError, "no keyword arguments allowed");
throw_error_already_set();
throw_error_already_set();
}
int idx[BOOST_HISTOGRAM_AXIS_LIMIT];