From 5eed8c27d801c13fa3f21818e27ae730d906ceea Mon Sep 17 00:00:00 2001
From: alavenant <antoine.lavenant@ign.fr>
Date: Thu, 6 Jun 2024 14:20:57 +0200
Subject: [PATCH] Update test radius (#6)

* update test radius

* update test radius

* delete comment

* Uncomment checks in test_radius_assign

* update comment + let "numeric_precision" do the job of digital precisions

---------

Co-authored-by: Lea Vauchier <lea.vauchier@ign.fr>
---
 test/test_radius_assign.py | 71 ++++++++++++++++++++++++--------------
 1 file changed, 46 insertions(+), 25 deletions(-)

diff --git a/test/test_radius_assign.py b/test/test_radius_assign.py
index 5e1ba83..3c38244 100755
--- a/test/test_radius_assign.py
+++ b/test/test_radius_assign.py
@@ -7,14 +7,22 @@
 import numpy as np
 import pdal
 
+pt_x = 1639825.1
+pt_y = 1454924.6
+pt_z = 7072.1
+pt_ini = (pt_x, pt_y, pt_z, 1)
+
+numeric_precision = 4
+
 
 def distance2d(pt1, pt2):
-    return round(math.sqrt((pt1[0] - pt2[0]) ** 2 + (pt1[1] - pt2[1]) ** 2), 2)
+    return round(math.sqrt((pt1[0] - pt2[0]) ** 2 + (pt1[1] - pt2[1]) ** 2), numeric_precision)
 
 
 def distance3d(pt1, pt2):
     return round(
-        math.sqrt((pt1[0] - pt2[0]) ** 2 + (pt1[1] - pt2[1]) ** 2 + (pt1[2] - pt2[2]) ** 2), 2
+        math.sqrt((pt1[0] - pt2[0]) ** 2 + (pt1[1] - pt2[1]) ** 2 + (pt1[2] - pt2[2]) ** 2),
+        numeric_precision,
     )
 
 
@@ -65,29 +73,39 @@ def run_filter(arrays_las, distance_radius, search_3d, distance_cylinder=0.0):
     return nb_pts_radius_search
 
 
-def build_random_points_around_one_point(test_function):
-
-    pt_x = 1639825.15
-    pt_y = 1454924.63
-    pt_z = 7072.17
-    pt_ini = (pt_x, pt_y, pt_z, 1)
+def build_random_points_around_one_point(test_function, distance_radius):
 
     dtype = [("X", "<f8"), ("Y", "<f8"), ("Z", "<f8"), ("Classification", "u1")]
     arrays_las = np.array([pt_ini], dtype=dtype)
 
+    pt_limit = (pt_x + distance_radius, pt_y, pt_z, 2)
+    arrays_pti = np.array([pt_limit], dtype=dtype)
+    arrays_las = np.concatenate((arrays_las, arrays_pti), axis=0)
+    nb_points_take = test_function(pt_limit)
+
+    pt_limit = (pt_x + distance_radius + 1 / numeric_precision, pt_y, pt_z, 2)
+    arrays_pti = np.array([pt_limit], dtype=dtype)
+    arrays_las = np.concatenate((arrays_las, arrays_pti), axis=0)
+    nb_points_take += test_function(pt_limit)
+
     nb_points = rand.randint(20, 50)
-    nb_points_take = 0
     for i in range(nb_points):
         # round at 1 to avoid precision numeric pb
-        pti_x = round(pt_ini[0] + rand.uniform(-1.5, 1.5), 1)
-        pti_y = round(pt_ini[1] + rand.uniform(-1.5, 1.5), 1)
-        pti_z = round(pt_ini[2] + rand.uniform(-1.5, 1.5), 1)
+        pti_x = pt_ini[0] + rand.uniform(-1.5, 1.5)
+        pti_y = pt_ini[1] + rand.uniform(-1.5, 1.5)
+        pti_z = pt_ini[2] + rand.uniform(-1.5, 1.5)
         pt_i = (pti_x, pti_y, pti_z, 2)
 
+        # too much uncertainty between the digital precisions of pdal and the tests
+        if abs(distance2d(pt_i, pt_ini) - distance_radius) < numeric_precision:
+            continue
+        if abs(distance3d(pt_i, pt_ini) - distance_radius) < numeric_precision:
+            continue
+
         arrays_pti = np.array([pt_i], dtype=dtype)
         arrays_las = np.concatenate((arrays_las, arrays_pti), axis=0)
 
-        nb_points_take += test_function(pt_ini, pt_i)
+        nb_points_take += test_function(pt_i)
 
     return arrays_las, nb_points_take
 
@@ -96,32 +114,34 @@ def test_radius_assign_3d():
 
     distance_radius = 1
 
-    def func_test(pt_ini, pt):
+    def func_test(pt):
         distance_i = distance3d(pt_ini, pt)
         if distance_i < distance_radius:
             return 1
         return 0
 
-    arrays_las, nb_points_take_3d = build_random_points_around_one_point(func_test)
+    arrays_las, nb_points_take_3d = build_random_points_around_one_point(
+        func_test, distance_radius
+    )
     nb_pts_radius_3d = run_filter(arrays_las, distance_radius, True)
-    # fix in other PR
-    #assert nb_pts_radius_3d == nb_points_take_3d
+    assert nb_pts_radius_3d == nb_points_take_3d
 
 
 def test_radius_assign_2d():
 
     distance_radius = 1
 
-    def func_test(pt_ini, pt):
+    def func_test(pt):
         distance_i = distance2d(pt_ini, pt)
         if distance_i < distance_radius:
             return 1
         return 0
 
-    arrays_las, nb_points_take_2d = build_random_points_around_one_point(func_test)
+    arrays_las, nb_points_take_2d = build_random_points_around_one_point(
+        func_test, distance_radius
+    )
     nb_pts_radius_2d = run_filter(arrays_las, distance_radius, False)
-    # fix in other PR
-    #assert nb_pts_radius_2d == nb_points_take_2d
+    assert nb_pts_radius_2d == nb_points_take_2d
 
 
 def test_radius_assign_2d_cylinder():
@@ -129,14 +149,15 @@ def test_radius_assign_2d_cylinder():
     distance_radius = 1
     distance_cylinder = 0.25
 
-    def func_test(pt_ini, pt):
+    def func_test(pt):
         distance_i = distance2d(pt_ini, pt)
         if distance_i < distance_radius:
             if abs(pt_ini[2] - pt[2]) <= distance_cylinder:
                 return 1
         return 0
 
-    arrays_las, nb_points_take_2d = build_random_points_around_one_point(func_test)
+    arrays_las, nb_points_take_2d = build_random_points_around_one_point(
+        func_test, distance_radius
+    )
     nb_pts_radius_2d_cylinder = run_filter(arrays_las, distance_radius, False, distance_cylinder)
-    #fix in other PR
-    #assert nb_pts_radius_2d_cylinder == nb_points_take_2d
+    assert nb_pts_radius_2d_cylinder == nb_points_take_2d