Added unit test for std::function<double()> elements

BlueBrain · Apr 28, 2023 · 48b3526 · 48b3526
1 parent ede01d9
commit 48b3526
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 3 deletions.
diff --git a/src/data/node.cpp b/src/data/node.cpp
@@ -45,7 +45,20 @@ void Node::fill_data(std::vector<float>::iterator it) {
 }
 
 void Node::refresh_pointers(std::function<double*(double*)> refresh_function) {
-    std::transform(elements_.begin(), elements_.end(), elements_.begin(), refresh_function);
+    if (!elements_.empty()) {
+        std::transform(elements_.begin(), elements_.end(), elements_.begin(), refresh_function);
+    } else if (!element_handles_.empty()) {
+        std::transform(element_handles_.begin(),
+                       element_handles_.end(),
+                       element_handles_.begin(),
+                       [&refresh_function](auto const& elem) -> std::function<double()> {
+                           return [elem, refresh_function]() -> double {
+                               double value = elem();
+                               double* refreshed_value = refresh_function(&value);
+                               return *refreshed_value;
+                           };
+                       });
+    }
 }
 
 }  // namespace sonata

diff --git a/tests/unit/test_node.cpp b/tests/unit/test_node.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch.hpp>
-#include <memory>
 #include <data/node.h>
 #include <data/soma_node.h>
+#include <memory>
 #include <spdlog/spdlog.h>
 
 using namespace bbp::sonata;
@@ -26,7 +26,7 @@ SCENARIO("Test Node class", "[Node]") {
             REQUIRE_NOTHROW(node.refresh_pointers(&square));
         }
 
-        WHEN("We add a element") {
+        WHEN("We add a raw pointer element") {
             std::vector<double> elements = {10, 11, 12, 13, 14};
             size_t i = 0;
             for (auto& element : elements) {
@@ -53,6 +53,37 @@ SCENARIO("Test Node class", "[Node]") {
                 REQUIRE(result == compare);
             }
         }
+
+        WHEN("We add a std::function<double()> element") {
+            std::vector<std::function<double()>> elements = {[]() { return 10.0; },
+                                                             []() { return 11.0; },
+                                                             []() { return 12.0; }};
+            size_t i = 0;
+            for (auto& element_handle : elements) {
+                node.add_element(element_handle, i);
+                ++i;
+            }
+            THEN("Number of elements is 3") {
+                REQUIRE(node.get_num_elements() == 3);
+            }
+            THEN("The element_ids are") {
+                std::vector<uint32_t> compare = {0, 1, 2};
+                REQUIRE(node.get_element_ids() == compare);
+            }
+            THEN("fill_data will return something correct") {
+                std::vector<float> result(3, -1.0);
+                node.fill_data(result.begin());
+                std::vector<float> compare = {10.0, 11.0, 12.0};
+                REQUIRE(result == compare);
+            }
+            THEN("refresh_pointers will call the function on all elements") {
+                node.refresh_pointers(&square);
+                std::vector<float> compare{100, 121, 144};
+                std::vector<float> result(3, -1);
+                node.fill_data(result.begin());
+                REQUIRE(result == compare);
+            }
+        }
     }
 
     GIVEN("An instance of a soma node") {