Remove get_array()

Author: jorblancoa

include/bbp/sonata/report_reader.h

@@ -25,11 +25,6 @@ struct SONATA_API DataFrame {
     std::vector<float> data;
 };
 
-struct SpikeStruct {
-    NodeID node_id;
-    double timestamp;
-};
-using SpikeStruct = struct SpikeStruct;
 using Spike = std::pair<NodeID, double>;
 using Spikes = std::vector<Spike>;
 

python/bindings.cpp

@@ -1177,39 +1177,13 @@ PYBIND11_MODULE(_libsonata, m) {
 
     bindStorageClass<EdgeStorage>(m, "EdgeStorage", "EdgePopulation");
 
-    PYBIND11_NUMPY_DTYPE(SpikeStruct, node_id, timestamp);
-
     py::class_<SpikeReader::Population>(m, "SpikePopulation", "A population inside a SpikeReader")
         .def("get",
              &SpikeReader::Population::get,
              DOC_SPIKEREADER_POP(get),
              "node_ids"_a = nonstd::nullopt,
              "tstart"_a = nonstd::nullopt,
              "tstop"_a = nonstd::nullopt)
-        .def(
-            "get_array",
-            [](const SpikeReader::Population& self,
-               const py::object& node_ids = py::none(),
-               const py::object& tstart = py::none(),
-               const py::object& tstop = py::none()) {
-                auto spikes = self.get(
-                    node_ids.is_none() ? nonstd::nullopt
-                                       : node_ids.cast<nonstd::optional<Selection>>(),
-                    tstart.is_none() ? nonstd::nullopt : tstart.cast<nonstd::optional<double>>(),
-                    tstop.is_none() ? nonstd::nullopt : tstop.cast<nonstd::optional<double>>());
-                std::vector<SpikeStruct> result;
-                result.reserve(spikes.size());
-                std::transform(spikes.begin(),
-                               spikes.end(),
-                               std::back_inserter(result),
-                               [](const Spike& pair) {
-                                   return SpikeStruct{pair.first, pair.second};
-                               });
-                return py::array_t<SpikeStruct>(result.size(), result.data());
-            },
-            "node_ids"_a = nonstd::nullopt,
-            "tstart"_a = nonstd::nullopt,
-            "tstop"_a = nonstd::nullopt)
         .def(
             "get_dict",
             [](const SpikeReader::Population& self,

python/tests/test_reports.py

@@ -48,13 +48,9 @@ def test_get_spikes_from_population(self):
 
         self.assertEqual(len(self.test_obj['All'].get(node_ids=[])), 0)
 
-        structured_data = self.test_obj['All'].get_array()
+        dict_data = self.test_obj['All'].get_dict()
         node_ids_ref = np.asarray([5, 2, 3, 2, 3])
-        self.assertTrue((structured_data["node_id"] == node_ids_ref).all())
         timestamps_ref = np.asarray([0.1, 0.2, 0.3, 0.7, 1.3])
-        self.assertTrue((structured_data["timestamp"] == timestamps_ref).all())
-
-        dict_data = self.test_obj['All'].get_dict()
         self.assertTrue((dict_data["node_ids"] == node_ids_ref).all())
         self.assertTrue((dict_data["timestamps"] == timestamps_ref).all())