add test for max filter

Author: joeljonsson

test/APRTest.cpp

@@ -3270,6 +3270,19 @@ bool test_min_filter(TestData &test_data) {
 }
 
 
+template<int size_y, int size_x, int size_z>
+bool test_max_filter(TestData &test_data) {
+
+    ParticleData<float> output;
+    APRFilter::max_filter<size_y, size_x, size_z>(test_data.apr, test_data.particles_intensities, output);
+
+    ParticleData<float> output_gt;
+    FilterTestHelpers::compute_max_filter_gt(test_data.apr, test_data.particles_intensities, output_gt, size_y, size_x, size_z);
+
+    return compareParticles(output_gt, output) == 0;
+}
+
+
 bool test_convolve_pencil(TestData &test_data, const bool boundary = false, const std::vector<int>& stencil_size = {3, 3, 3}) {
 
     auto it = test_data.apr.iterator();
@@ -4356,6 +4369,12 @@ TEST_F(CreateDiffDimsSphereTest, APR_FILTER) {
     success1D = test_min_filter<7, 1, 1>(test_data);
     ASSERT_TRUE(success3D && success2D && success1D);
 
+    // Max filter
+    success3D = test_max_filter<7, 5, 3>(test_data);
+    success2D = test_max_filter<5, 3, 1>(test_data);
+    success1D = test_max_filter<7, 1, 1>(test_data);
+    ASSERT_TRUE(success3D && success2D && success1D);
+
 }
 
 TEST_F(CreateAPRTest, READ_PARTICLE_TYPE){

test/FilterTestHelpers.hpp

@@ -20,11 +20,16 @@ T compute_median(std::vector<T>& input) {
 }
 
 template<typename T>
-T compute_min(std::vector<T>& input){
+T compute_min(std::vector<T>& input) {
     return *std::min_element(input.begin(), input.end());
+}
 
+template<typename T>
+T compute_max(std::vector<T>& input) {
+    return *std::max_element(input.begin(), input.end());
 }
 
+
 namespace FilterTestHelpers {
 
     template<typename InputType, typename StencilType, typename OutputType>
@@ -73,6 +78,20 @@ namespace FilterTestHelpers {
         compute_generic_filter_gt(apr, input_particles, tree_particles, output_particles, size_y, size_x, size_z, true, compute_min);
     }
 
+
+    template<typename InputType, typename OutputType>
+    void compute_max_filter_gt(APR& apr,
+                               ParticleData<InputType>& input_particles,
+                               ParticleData<OutputType>& output_particles,
+                               int size_y,
+                               int size_x,
+                               int size_z) {
+
+        ParticleData<OutputType> tree_particles;
+        APRTreeNumerics::fill_tree_max(apr, input_particles, tree_particles);
+        compute_generic_filter_gt(apr, input_particles, tree_particles, output_particles, size_y, size_x, size_z, true, compute_max);
+    }
+
 }