added test for returning a struct of std::vector as a python class of numpy arrays

DC23 · DC23 · commit fcbaf0ff0f31 · 2018-09-14T17:10:49.000+08:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -21,6 +21,12 @@
         "initializer_list": "cpp",
         "string_view": "cpp",
         "valarray": "cpp",
-        "stdexcept": "cpp"
+        "stdexcept": "cpp",
+        "optional": "cpp",
+        "istream": "cpp",
+        "ostream": "cpp",
+        "system_error": "cpp",
+        "type_traits": "cpp",
+        "variant": "cpp"
     }
 }
diff --git a/src/main.cpp b/src/main.cpp
@@ -42,6 +42,24 @@ py::array_t<double> get_ndarray(int n, double value)
     return py::array(result.size(), result.data());
 }
 
+struct VectorResults
+{
+    const py::array_t<double> temperature;
+    const py::array_t<double> humidity;
+};
+
+VectorResults get_vector_results(int len, double temp_value, double hum_value)
+{
+    auto tmp = std::vector<double>(len, temp_value);
+    auto hum = std::vector<double>(len, hum_value);
+    VectorResults results = {
+        py::array(tmp.size(), tmp.data()), // temperature
+        py::array(hum.size(), hum.data()), // humidity
+    };
+
+    return results;
+}
+
 PYBIND11_MODULE(python_example, m)
 {
     m.doc() = R"pbdoc(
@@ -80,6 +98,12 @@ PYBIND11_MODULE(python_example, m)
     m.def("range_error", &range_error);
     m.def("get_ndarray", &get_ndarray);
 
+    py::class_<VectorResults>(m, "VectorResults")
+        .def_readonly("temperature", &VectorResults::temperature)
+        .def_readonly("humidity", &VectorResults::humidity);
+
+    m.def("get_vector_results", &get_vector_results);
+
 #ifdef VERSION_INFO
     m.attr("__version__") = VERSION_INFO;
 #else
diff --git a/tests/test_python_example.py b/tests/test_python_example.py
@@ -35,3 +35,14 @@ def test_return_ndarray():
     assert isinstance(a, np.ndarray)
     np.testing.assert_allclose(a, 5.0)
     assert len(a) == 10
+
+
+def test_get_class_with_vector_results():
+    n = 10
+    t = 4.3
+    h = 88.3
+    results = m.get_vector_results(n, t, h)
+    assert len(results.temperature) == n
+    np.testing.assert_allclose(results.temperature, t)
+    assert len(results.humidity) == n
+    np.testing.assert_allclose(results.humidity, h)

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,12 @@`
`21`	`21`	`"initializer_list": "cpp",`
`22`	`22`	`"string_view": "cpp",`
`23`	`23`	`"valarray": "cpp",`
`24`		`- "stdexcept": "cpp"`
	`24`	`+ "stdexcept": "cpp",`
	`25`	`+ "optional": "cpp",`
	`26`	`+ "istream": "cpp",`
	`27`	`+ "ostream": "cpp",`
	`28`	`+ "system_error": "cpp",`
	`29`	`+ "type_traits": "cpp",`
	`30`	`+ "variant": "cpp"`
`25`	`31`	`}`
`26`	`32`	`}`