diff --git a/clic/include/tier4.hpp b/clic/include/tier4.hpp index 655f5b42..b60f58ea 100644 --- a/clic/include/tier4.hpp +++ b/clic/include/tier4.hpp @@ -104,10 +104,10 @@ threshold_otsu_func(const Device::Pointer & device, const Array::Pointer & src, /** * @name mean_intensity_map - * @brief Takes an image and a corresponding label map, determines the mean + * @brief Takes an image and a corresponding label map, determines the mean * intensity per label and replaces every label with the that number. - * - * This results in a parametric image expressing mean object intensity. + * + * This results in a parametric image expressing mean object intensity. * * @param device Device to perform the operation on. [const Device::Pointer &] * @param src intensity image [const Array::Pointer &] @@ -119,7 +119,10 @@ threshold_otsu_func(const Device::Pointer & device, const Array::Pointer & src, * @see https://clij.github.io/clij2-docs/reference_meanIntensityMap */ auto -mean_intensity_map_func(const Device::Pointer & device, const Array::Pointer & src, const Array::Pointer & labels, Array::Pointer dst) -> Array::Pointer; +mean_intensity_map_func(const Device::Pointer & device, + const Array::Pointer & src, + const Array::Pointer & labels, + Array::Pointer dst) -> Array::Pointer; /** diff --git a/clic/src/tier4/parametrics_map.cpp b/clic/src/tier4/parametrics_map.cpp index 78703df2..2bd73eaf 100644 --- a/clic/src/tier4/parametrics_map.cpp +++ b/clic/src/tier4/parametrics_map.cpp @@ -45,7 +45,10 @@ extension_ratio_map_func(const Device::Pointer & device, const Array::Pointer & } auto -mean_intensity_map_func(const Device::Pointer & device, const Array::Pointer & src, const Array::Pointer & labels, Array::Pointer dst) -> Array::Pointer +mean_intensity_map_func(const Device::Pointer & device, + const Array::Pointer & src, + const Array::Pointer & labels, + Array::Pointer dst) -> Array::Pointer { tier0::create_like(src, dst, dType::FLOAT); auto props = tier3::statistics_of_background_and_labelled_pixels_func(device, src, labels); diff --git a/tests/tier4/test_mean_intensity_map.cpp b/tests/tier4/test_mean_intensity_map.cpp index 544212ce..47aa10ff 100644 --- a/tests/tier4/test_mean_intensity_map.cpp +++ b/tests/tier4/test_mean_intensity_map.cpp @@ -6,23 +6,11 @@ class TestMeanIntensityMap : public ::testing::TestWithParam { protected: - std::array intensity = { -1, 1, 2, -4, 0, 0, -5, 3, 0 - }; + std::array intensity = { 1, 1, 2, 4, 0, 0, 5, 3, 0 }; - std::array label = { - 1, 1, 2, - 1, 0, 0, - 3, 3, 0 - }; + std::array label = { 1, 1, 2, 1, 0, 0, 3, 3, 0 }; -std::array valid = { -2, 2, 2, -2, 0, 0, -4, 4, 0 -}; + std::array valid = { 2, 2, 2, 2, 0, 0, 4, 4, 0 }; }; TEST_P(TestMeanIntensityMap, execute)