From 20830e5f1f81ad1d4ebb5eed8cf574d69b8405fc Mon Sep 17 00:00:00 2001 From: Stephane Rigaud Date: Thu, 10 Oct 2024 20:47:21 +0300 Subject: [PATCH 1/2] fix min/max to minimum maximum --- clic/include/tier5.hpp | 21 +++++++++++---------- clic/include/tier6.hpp | 24 ++++++++++++++---------- clic/src/tier5/filter_label_by_size.cpp | 13 +++++++------ clic/src/tier6/remove_objects.cpp | 24 ++++++++++++++---------- 4 files changed, 46 insertions(+), 36 deletions(-) diff --git a/clic/include/tier5.hpp b/clic/include/tier5.hpp index 42dae349..e4c23ba2 100644 --- a/clic/include/tier5.hpp +++ b/clic/include/tier5.hpp @@ -103,8 +103,9 @@ connected_component_labeling_func(const Device::Pointer & device, * @see https://clij.github.io/clij2-docs/reference_reduceLabelsToCentroids */ auto -reduce_labels_to_centroids_func(const Device::Pointer & device, const Array::Pointer & src, Array::Pointer dst) - -> Array::Pointer; +reduce_labels_to_centroids_func(const Device::Pointer & device, + const Array::Pointer & src, + Array::Pointer dst) -> Array::Pointer; /** * @name filter_label_by_size @@ -113,8 +114,8 @@ reduce_labels_to_centroids_func(const Device::Pointer & device, const Array::Poi * @param device Device to perform the operation on. [const Device::Pointer &] * @param src Input label image. [const Array::Pointer &] * @param dst Output label image. [Array::Pointer ( = None )] - * @param min_size Minimum size of labels to keep. [float ( = 0 )] - * @param max_size Maximum size of labels to keep. [float ( = 100 )] + * @param minimum_size Minimum size of labels to keep. [float ( = 0 )] + * @param maximum_size Maximum size of labels to keep. [float ( = 100 )] * @return Array::Pointer * * @note 'label processing', 'in assistant' @@ -124,8 +125,8 @@ auto filter_label_by_size_func(const Device::Pointer & device, const Array::Pointer & src, Array::Pointer dst, - float min_size, - float max_size) -> Array::Pointer; + float minimum_size, + float maximum_size) -> Array::Pointer; /** * @name exclude_labels_outside_size_range @@ -134,8 +135,8 @@ filter_label_by_size_func(const Device::Pointer & device, * @param device Device to perform the operation on. [const Device::Pointer &] * @param src Input label image. [const Array::Pointer &] * @param dst Output label image. [Array::Pointer ( = None )] - * @param min_size Minimum size of labels to keep. [float ( = 0 )] - * @param max_size Maximum size of labels to keep. [float ( = 100 )] + * @param minimum_size Minimum size of labels to keep. [float ( = 0 )] + * @param maximum_size Maximum size of labels to keep. [float ( = 100 )] * @return Array::Pointer * * @note 'label processing', 'in assistant' @@ -145,8 +146,8 @@ auto exclude_labels_outside_size_range_func(const Device::Pointer & device, const Array::Pointer & src, Array::Pointer dst, - float min_size, - float max_size) -> Array::Pointer; + float minimum_size, + float maximum_size) -> Array::Pointer; } // namespace cle::tier5 diff --git a/clic/include/tier6.hpp b/clic/include/tier6.hpp index 323aa2fa..2b5d7684 100644 --- a/clic/include/tier6.hpp +++ b/clic/include/tier6.hpp @@ -121,15 +121,17 @@ voronoi_labeling_func(const Device::Pointer & device, const Array::Pointer & src * @param device Device to perform the operation on. [const Device::Pointer &] * @param src Label image to filter. [const Array::Pointer &] * @param dst Output label image fitlered. [Array::Pointer ( = None )] - * @param min_size Smallest size object allowed. [float ( = 100 )] + * @param minimum_size Smallest size object allowed. [float ( = 100 )] * @return Array::Pointer * * @note 'label processing', 'in assistant', 'bia-bob-suggestion' * @see https://clij.github.io/clij2-docs/reference_excludeLabelsOutsideSizeRange */ auto -remove_small_labels_func(const Device::Pointer & device, const Array::Pointer & src, Array::Pointer dst, float min_size) - -> Array::Pointer; +remove_small_labels_func(const Device::Pointer & device, + const Array::Pointer & src, + Array::Pointer dst, + float minimum_size) -> Array::Pointer; /** * @name exclude_small_labels @@ -138,7 +140,7 @@ remove_small_labels_func(const Device::Pointer & device, const Array::Pointer & * @param device Device to perform the operation on. [const Device::Pointer &] * @param src Label image to filter. [const Array::Pointer &] * @param dst Output label image fitlered. [Array::Pointer ( = None )] - * @param max_size Largest size object to exclude. [float ( = 100 )] + * @param maximum_size Largest size object to exclude. [float ( = 100 )] * @return Array::Pointer * * @note 'label processing', 'in assistant' @@ -148,7 +150,7 @@ auto exclude_small_labels_func(const Device::Pointer & device, const Array::Pointer & src, Array::Pointer dst, - float max_size) -> Array::Pointer; + float maximum_size) -> Array::Pointer; /** * @name remove_large_labels @@ -157,15 +159,17 @@ exclude_small_labels_func(const Device::Pointer & device, * @param device Device to perform the operation on. [const Device::Pointer &] * @param src Label image to filter. [const Array::Pointer &] * @param dst Output label image fitlered. [Array::Pointer ( = None )] - * @param max_size Biggest size object allowed. [float ( = 100 )] + * @param maximum_size Biggest size object allowed. [float ( = 100 )] * @return Array::Pointer * * @note 'label processing', 'in assistant', 'bia-bob-suggestion' * @see https://clij.github.io/clij2-docs/reference_excludeLabelsOutsideSizeRange */ auto -remove_large_labels_func(const Device::Pointer & device, const Array::Pointer & src, Array::Pointer dst, float max_size) - -> Array::Pointer; +remove_large_labels_func(const Device::Pointer & device, + const Array::Pointer & src, + Array::Pointer dst, + float maximum_size) -> Array::Pointer; /** * @name exclude_large_labels @@ -174,7 +178,7 @@ remove_large_labels_func(const Device::Pointer & device, const Array::Pointer & * @param device Device to perform the operation on. [const Device::Pointer &] * @param src Label image to filter. [const Array::Pointer &] * @param dst Output label image fitlered. [Array::Pointer ( = None )] - * @param min_size Smallest size object to keep. [float ( = 100 )] + * @param minimum_size Smallest size object to keep. [float ( = 100 )] * @return Array::Pointer * * @note 'label processing', 'in assistant' @@ -184,7 +188,7 @@ auto exclude_large_labels_func(const Device::Pointer & device, const Array::Pointer & src, Array::Pointer dst, - float min_size) -> Array::Pointer; + float minimum_size) -> Array::Pointer; } // namespace cle::tier6 diff --git a/clic/src/tier5/filter_label_by_size.cpp b/clic/src/tier5/filter_label_by_size.cpp index 68a167a2..1ba94e21 100644 --- a/clic/src/tier5/filter_label_by_size.cpp +++ b/clic/src/tier5/filter_label_by_size.cpp @@ -15,8 +15,8 @@ auto filter_label_by_size_func(const Device::Pointer & device, const Array::Pointer & src, Array::Pointer dst, - float min_size, - float max_size) -> Array::Pointer + float minimum_size, + float maximum_size) -> Array::Pointer { tier0::create_like(src, dst, dType::LABEL); auto stats = tier3::statistics_of_background_and_labelled_pixels_func(device, src, nullptr); @@ -25,17 +25,18 @@ filter_label_by_size_func(const Device::Pointer & device, auto list_of_area = Array::create(nb_labels, 1, 1, 1, dType::FLOAT, mType::BUFFER, device); list_of_area->writeFrom(stats["area"].data()); - return tier4::remove_labels_with_map_values_out_of_range_func(device, src, list_of_area, dst, min_size, max_size); + return tier4::remove_labels_with_map_values_out_of_range_func( + device, src, list_of_area, dst, minimum_size, maximum_size); } auto exclude_labels_outside_size_range_func(const Device::Pointer & device, const Array::Pointer & src, Array::Pointer dst, - float min_size, - float max_size) -> Array::Pointer + float minimum_size, + float maximum_size) -> Array::Pointer { - return filter_label_by_size_func(device, src, dst, min_size, max_size); + return filter_label_by_size_func(device, src, dst, minimum_size, maximum_size); } } // namespace cle::tier5 diff --git a/clic/src/tier6/remove_objects.cpp b/clic/src/tier6/remove_objects.cpp index 766285bb..320a693e 100644 --- a/clic/src/tier6/remove_objects.cpp +++ b/clic/src/tier6/remove_objects.cpp @@ -13,35 +13,39 @@ namespace cle::tier6 { auto -remove_small_labels_func(const Device::Pointer & device, const Array::Pointer & src, Array::Pointer dst, float min_size) - -> Array::Pointer +remove_small_labels_func(const Device::Pointer & device, + const Array::Pointer & src, + Array::Pointer dst, + float minimum_size) -> Array::Pointer { - return tier5::filter_label_by_size_func(device, src, dst, min_size, std::numeric_limits::max()); + return tier5::filter_label_by_size_func(device, src, dst, minimum_size, std::numeric_limits::max()); } auto -remove_large_labels_func(const Device::Pointer & device, const Array::Pointer & src, Array::Pointer dst, float max_size) - -> Array::Pointer +remove_large_labels_func(const Device::Pointer & device, + const Array::Pointer & src, + Array::Pointer dst, + float maximum_size) -> Array::Pointer { - return tier5::filter_label_by_size_func(device, src, dst, 0, max_size); + return tier5::filter_label_by_size_func(device, src, dst, 0, maximum_size); } auto exclude_small_labels_func(const Device::Pointer & device, const Array::Pointer & src, Array::Pointer dst, - float max_size) -> Array::Pointer + float maximum_size) -> Array::Pointer { - return remove_small_labels_func(device, src, dst, max_size); + return remove_small_labels_func(device, src, dst, maximum_size); } auto exclude_large_labels_func(const Device::Pointer & device, const Array::Pointer & src, Array::Pointer dst, - float min_size) -> Array::Pointer + float minimum_size) -> Array::Pointer { - return remove_large_labels_func(device, src, dst, min_size); + return remove_large_labels_func(device, src, dst, minimum_size); } } // namespace cle::tier6 From 0802b5fdcc143e9c4f1f577c677a512e67562544 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 17:48:49 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- clic/include/tier5.hpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/clic/include/tier5.hpp b/clic/include/tier5.hpp index e4c23ba2..731377a9 100644 --- a/clic/include/tier5.hpp +++ b/clic/include/tier5.hpp @@ -103,9 +103,8 @@ connected_component_labeling_func(const Device::Pointer & device, * @see https://clij.github.io/clij2-docs/reference_reduceLabelsToCentroids */ auto -reduce_labels_to_centroids_func(const Device::Pointer & device, - const Array::Pointer & src, - Array::Pointer dst) -> Array::Pointer; +reduce_labels_to_centroids_func(const Device::Pointer & device, const Array::Pointer & src, Array::Pointer dst) + -> Array::Pointer; /** * @name filter_label_by_size