update default value

clEsperanto · Jul 26, 2023 · 10f31e2 · 10f31e2
1 parent 579510c
commit 10f31e2
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 53 deletions.
diff --git a/clic/include/tier3.hpp b/clic/include/tier3.hpp
@@ -5,23 +5,22 @@
 #include "device.hpp"
 #include "execution.hpp"
 
-#include <limits>
 
 namespace cle::tier3
 {
 
 
-// auto bounding_box_func
-// auto center_of_mass_func
-// auto proximal_other_labels_count_func
-// auto divide_by_gaussian_background_func
-// auto exclude_labels_func
-// auto exclude_labels_on_edges_func
-// auto exclude_labels_with_values_equal_to_constant_func
-// auto exclude_labels_with_values_not_equal_to_constant_func
-// auto exclude_labels_outside_size_range_func
-// auto exclude_labels_with_values_out_of_range_func
-// auto exclude_labels_with_values_within_range_func
+// bounding_box
+// center_of_mass
+// proximal_other_labels_count
+// divide_by_gaussian_background
+// exclude_labels
+// exclude_labels_on_edges
+// exclude_labels_with_values_equal_to_constant
+// exclude_labels_with_values_not_equal_to_constant
+// exclude_labels_outside_size_range
+// exclude_labels_with_values_out_of_range
+// exclude_labels_with_values_within_range
 
 auto
 flag_existing_labels_func(const Device::Pointer & device, const Array::Pointer & src, Array::Pointer dst)
@@ -31,57 +30,57 @@ auto
 gamma_correction_func(const Device::Pointer & device, const Array::Pointer & src, Array::Pointer dst, float gamma)
   -> Array::Pointer;
 
-// auto generate_n_nearest_neighbors_matrix_func
-// auto generate_proximal_neighbors_matrix_func
-// auto generate_touch_count_matrix_func
-// auto generate_touch_mean_intensity_matrix_func
+// generate_n_nearest_neighbors_matrix
+// generate_proximal_neighbors_matrix
+// generate_touch_count_matrix
+// generate_touch_mean_intensity_matrix
 
 auto
 histogram_func(const Device::Pointer & device,
                const Array::Pointer &  src,
                Array::Pointer          dst,
                int                     nbins,
-               float                   min = std::numeric_limits<float>::quiet_NaN(),
-               float                   max = std::numeric_limits<float>::quiet_NaN()) -> Array::Pointer;
-
-// auto jaccard_index_func
-// auto labelled_spots_to_pointlist_func
-// auto maximum_of_n_most_touching_neighbors_map_func
-// auto maximum_of_n_nearest_neighbors_map_func
-// auto maximum_of_touch_portion_within_range_neighbors_map_func
-// auto maximum_of_touching_neighbors_map_func
-// auto maximum_of_proximal_neighbors_map_func
-// auto maximum_position_func
+               float                   min = NaN,
+               float                   max = NaN) -> Array::Pointer;
+
+// jaccard_index
+// labelled_spots_to_pointlist
+// maximum_of_n_most_touching_neighbors_map
+// maximum_of_n_nearest_neighbors_map
+// maximum_of_touch_portion_within_range_neighbors_map
+// maximum_of_touching_neighbors_map
+// maximum_of_proximal_neighbors_map
+// maximum_position
 
 auto
 mean_of_all_pixels_func(const Device::Pointer & device, const Array::Pointer & src) -> float;
 
-// auto mean_of_n_most_touching_neighbors_map_func
-// auto mean_of_n_nearest_neighbors_map_func
-// auto mean_of_proximal_neighbors_map_func
-// auto mean_of_touch_portion_within_range_neighbors_map_func
-// auto mean_of_touching_neighbors_map_func
-
-// auto minimum_of_n_most_touching_neighbors_map_func
-// auto minimum_of_n_nearest_neighbors_map_func
-// auto minimum_of_proximal_neighbors_map_func
-// auto minimum_of_touch_portion_within_range_neighbors_map_func
-// auto minimum_of_touching_neighbors_map_func
-// auto minimum_position_func
-// auto mode_of_n_most_touching_neighbors_map_func
-// auto mode_of_n_nearest_neighbors_map_func
-// auto mode_of_proximal_neighbors_map_func
-// auto mode_of_touch_portion_within_range_neighbors_map_func
-// auto mode_of_touching_neighbors_map_func
-
-
-// auto standard_deviation_of_n_most_touching_neighbors_map_func
-// auto standard_deviation_of_n_nearest_neighbors_map_func
-// auto standard_deviation_of_touch_portion_within_range_neighbors_map_func
-// auto standard_deviation_of_touching_neighbors_map_func
-// auto standard_deviation_of_proximal_neighbors_map_func
-// auto subtract_gaussian_background_func
-// auto z_position_range_projection_func
+// mean_of_n_most_touching_neighbors_map
+// mean_of_n_nearest_neighbors_map
+// mean_of_proximal_neighbors_map
+// mean_of_touch_portion_within_range_neighbors_map
+// mean_of_touching_neighbors_map
+
+// minimum_of_n_most_touching_neighbors_map
+// minimum_of_n_nearest_neighbors_map
+// minimum_of_proximal_neighbors_map
+// minimum_of_touch_portion_within_range_neighbors_map
+// minimum_of_touching_neighbors_map
+// minimum_position
+// mode_of_n_most_touching_neighbors_map
+// mode_of_n_nearest_neighbors_map
+// mode_of_proximal_neighbors_map
+// mode_of_touch_portion_within_range_neighbors_map
+// mode_of_touching_neighbors_map
+
+
+// standard_deviation_of_n_most_touching_neighbors_map
+// standard_deviation_of_n_nearest_neighbors_map
+// standard_deviation_of_touch_portion_within_range_neighbors_map
+// standard_deviation_of_touching_neighbors_map
+// standard_deviation_of_proximal_neighbors_map
+// subtract_gaussian_background
+// z_position_range_projection
 
 } // namespace cle::tier3
 

diff --git a/clic/include/utils.hpp b/clic/include/utils.hpp
@@ -3,6 +3,7 @@
 
 #include <fstream>
 #include <iostream>
+#include <limits>
 
 #include <cmath>
 #ifndef M_PI
@@ -12,6 +13,8 @@
 namespace cle
 {
 
+constexpr float NaN = std::numeric_limits<float>::quiet_NaN();
+
 
 enum class mType
 {