diff options
Diffstat (limited to 'src/python/include/pybind11_diagram_utils.h')
-rw-r--r-- | src/python/include/pybind11_diagram_utils.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/python/include/pybind11_diagram_utils.h b/src/python/include/pybind11_diagram_utils.h index 2d5194f4..5cb7c48b 100644 --- a/src/python/include/pybind11_diagram_utils.h +++ b/src/python/include/pybind11_diagram_utils.h @@ -17,16 +17,9 @@ namespace py = pybind11; typedef py::array_t<double> Dgm; -// Get m[i,0] and m[i,1] as a pair -static auto pairify(void* p, py::ssize_t h, py::ssize_t w) { - return [=](py::ssize_t i){ - char* birth = (char*)p + i * h; - char* death = birth + w; - return std::make_pair(*(double*)birth, *(double*)death); - }; -} - -inline auto numpy_to_range_of_pairs(py::array_t<double> dgm) { +// build_point(double birth, double death, ssize_t index) -> Point +template<class BuildPoint> +inline auto numpy_to_range_of_pairs(py::array_t<double> dgm, BuildPoint build_point) { py::buffer_info buf = dgm.request(); // shape (n,2) or (0) for empty if((buf.ndim!=2 || buf.shape[1]!=2) && (buf.ndim!=1 || buf.shape[0]!=0)) @@ -34,6 +27,16 @@ inline auto numpy_to_range_of_pairs(py::array_t<double> dgm) { // In the case of shape (0), avoid reading non-existing strides[1] even if we won't use it. py::ssize_t stride1 = buf.ndim == 2 ? buf.strides[1] : 0; auto cnt = boost::counting_range<py::ssize_t>(0, buf.shape[0]); - return boost::adaptors::transform(cnt, pairify(buf.ptr, buf.strides[0], stride1)); + + char* p = static_cast<char*>(buf.ptr); + auto h = buf.strides[0]; + auto w = stride1; + // Get m[i,0] and m[i,1] as a pair + auto pairify = [=](py::ssize_t i){ + char* birth = p + i * h; + char* death = birth + w; + return build_point(*(double*)birth, *(double*)death, i); + }; + return boost::adaptors::transform(cnt, pairify); // Be careful that the returned range cannot contain references to dead temporaries. } |