Fix nest multimeter expose

pynesci/src/consumer/nest_multimeter_data_view.hpp

@@ -30,21 +30,13 @@ namespace consumer {
 
 SUPPRESS_WARNINGS_BEGIN
 
-boost::python::object IsNestMultimeterValid(
-    nesci::consumer::NestMultimeterDataView* multimeter) {
-  return static_cast<boost::python::object>(multimeter->IsValid());
-}
-
-boost::python::object GetNestMultimeterTimestep(
-    nesci::consumer::NestMultimeterDataView* multimeter) {
-  return static_cast<boost::python::object>(multimeter->GetTimestep());
-}
-
-boost::python::object GetNestMultimeterNeuronIds(
+boost::python::list GetNestMultimeterNeuronIds(
     nesci::consumer::NestMultimeterDataView* multimeter) {
   boost::python::list ret_val;
-  for (const auto& data : nest_multimeter->GetNeuronIds()) {
-    ret_val.append(data);
+  const auto neuron_ids = multimeter->GetNeuronIds();
+  for (conduit::index_t i = 0, count = neuron_ids.number_of_elements();
+       i < count; ++i) {
+    ret_val.append(neuron_ids[i]);
   }
   return ret_val;
 }
@@ -52,7 +44,7 @@ boost::python::object GetNestMultimeterNeuronIds(
 boost::python::list GetNestMultimeterIntegerAttributeNames(
     nesci::consumer::NestMultimeterDataView* multimeter) {
   boost::python::list ret_val;
-  for (const auto& data : nest_multimeter->GetIntegerAttributeNames()) {
+  for (const auto& data : multimeter->GetIntegerAttributeNames()) {
     ret_val.append(data);
   }
   return ret_val;
@@ -61,20 +53,20 @@ boost::python::list GetNestMultimeterIntegerAttributeNames(
 boost::python::list GetNestMultimeterFloatingPointAttributeNames(
     nesci::consumer::NestMultimeterDataView* multimeter) {
   boost::python::list ret_val;
-  for (const auto& data : nest_multimeter->GetFloatingPointAttributeNames()) {
+  for (const auto& data : multimeter->GetFloatingPointAttributeNames()) {
     ret_val.append(data);
   }
   return ret_val;
 }
 
 boost::python::list GetNestMultimeterIntegerAttributeValues(
-    nesci::consumer::NestMultimeterDataView* multimeter,
     nesci::consumer::NestMultimeterDataView* multimeter,
     const std::string& attribute) {
   boost::python::list ret_val;
-  for (const auto& data :
-       nest_multimeter->GetIntegerAttributeValues(attribute)) {
-    ret_val.append(data);
+  const auto int_attributes = multimeter->GetIntegerAttributeValues(attribute);
+  for (conduit::index_t i = 0, count = int_attributes.number_of_elements();
+       i < count; ++i) {
+    ret_val.append(int_attributes[i]);
   }
   return ret_val;
 }
@@ -83,26 +75,30 @@ boost::python::list GetNestMultimeterFloatingPointAttributeValues(
     nesci::consumer::NestMultimeterDataView* multimeter,
     const std::string& attribute) {
   boost::python::list ret_val;
-  for (const auto& data :
-       nest_multimeter->GetFloatingPointAttributeValues(attribute)) {
-    ret_val.append(data);
+  const auto float_attributes =
+      multimeter->GetFloatingPointAttributeValues(attribute);
+  for (conduit::index_t i = 0, count = float_attributes.number_of_elements();
+       i < count; ++i) {
+    ret_val.append(float_attributes[i]);
   }
   return ret_val;
 }
 
 void ExposeNestMultimeterDataView() {
-  class_<nesci::consumer::NestMultimeterDataView>(
-      "NestMultimeterDataView", init<const conduit::Node & node>())
-      .def("IsNestMultimeterValid", &IsValid)
-      .def("GetNestMultimeterTimestep", &GetTimestep)
-      .def("GetNestMultimeterNeuronIds", &GetNeuronIds)
-      .def("GetNestMultimeterIntegerAttributeNames", &GetIntegerAttributeNames)
-      .def("GetNestMultimeterFloatingPointAttributeNames",
-           &GetFloatingPointAttributeNames)
-      .def("GetNestMultimeterIntegerAttributeValues",
-           &GetIntegerAttributeValues)
-      .def("GetNestMultimeterFloatingPointAttributeValues",
-           &GetFloatingPointAttributeValues);
+  class_<nesci::consumer::NestMultimeterDataView,
+         bases<nesci::consumer::DeviceDataView>>("NestMultimeterDataView",
+                                                 init<const conduit::Node&>())
+      .def("IsValid", &nesci::consumer::NestMultimeterDataView::IsValid)
+      .def("GetTimestep", &nesci::consumer::NestMultimeterDataView::GetTimestep)
+      .def("GetNeuronIds",
+           &nesci::consumer::NestMultimeterDataView::GetNeuronIds)
+      .def("GetIntegerAttributeNames", &GetNestMultimeterNeuronIds)
+      .def("GetFloatingPointAttributeNames",
+           &GetNestMultimeterFloatingPointAttributeNames)
+      .def("GetIntegerAttributeValues",
+           &GetNestMultimeterIntegerAttributeValues)
+      .def("GetFloatingPointAttributeValues",
+           &GetNestMultimeterFloatingPointAttributeValues);
 }
 
 SUPPRESS_WARNINGS_END