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

reverted removing generic_iterator

Browse Source
This commit is contained in:
Hans Dembinski
2018-08-13 00:59:07 +02:00
parent be5d706769
commit 826dfaddb6
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/python/axis.cpp
View File

@@ -37,6 +37,23 @@ bp::str generic_repr(const T& t) {
return os.str().c_str();
}
struct generic_iterator {
generic_iterator(bp::object o) : iterable(o), size(bp::len(iterable)) {}
bp::object next() {
if (idx == size) {
PyErr_SetString(PyExc_StopIteration, "No more items.");
bp::throw_error_already_set();
}
return iterable[idx++];
}
generic_iterator& self() { return *this; }
bp::object iterable;
unsigned idx = 0;
unsigned size = 0;
};
generic_iterator make_generic_iterator(bp::object self) { return generic_iterator(self); }
template <typename Axis>
struct axis_value_view_to_python {
static PyObject* convert(const bha::value_view<Axis>& i) {
@@ -192,7 +209,7 @@ struct axis_suite : public bp::def_visitor<axis_suite<T>> {
":param integer i: bin index"
"\n:returns: bin corresponding to index",
bp::args("self", "i"));
cl.def("__iter__", bp::iterator<const T>());
cl.def("__iter__", make_generic_iterator);
cl.def("__repr__", generic_repr<T>, ":returns: string representation of this axis",
bp::arg("self"));
cl.def(bp::self == bp::self);
@@ -236,6 +253,12 @@ void register_axis_types() {
using bp::arg; // resolve ambiguity
docstring_options dopt(true, true, false);
class_<generic_iterator>("generic_iterator", init<object>())
.def("__iter__", &generic_iterator::self, return_internal_reference<>())
.def("__next__", &generic_iterator::next) // Python3
.def("next", &generic_iterator::next) // Python2
;
class_<bha::regular<>>("regular",
"Axis for real-valued data and bins of equal width."
"\nBinning is a O(1) operation.",