Merge branch 'remove-obsolete-parameter' into 'master'

Enlever paramètre non utilisé See merge request 3d/cars-park/cars!807
CNES · Feb 5, 2025 · e618488 · e618488
2 parents 2055307 + 31c14bb
commit e618488
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 15 deletions.
diff --git a/cars/applications/sparse_matching/sift.py b/cars/applications/sparse_matching/sift.py
@@ -81,11 +81,6 @@ def __init__(self, conf=None):
             "epipolar_error_maximum_bias"
         ]
 
-        # outlier filtering (used after application run, to filter matches)
-        self.disparity_outliers_rejection_percent = self.used_config[
-            "disparity_outliers_rejection_percent"
-        ]
-
         # minimum number of matches to continue with
         self.minimum_nb_matches = self.used_config["minimum_nb_matches"]
 
@@ -152,10 +147,6 @@ def check_conf(self, conf):
         overloaded_conf["epipolar_error_maximum_bias"] = conf.get(
             "epipolar_error_maximum_bias", 0.0
         )
-        # outliers rejections used for matches filtering
-        overloaded_conf["disparity_outliers_rejection_percent"] = conf.get(
-            "disparity_outliers_rejection_percent", 0.1
-        )
 
         # minimum number of matches to continue with
         overloaded_conf["minimum_nb_matches"] = conf.get(
@@ -200,9 +191,6 @@ def check_conf(self, conf):
         sparse_matching_schema = {
             "method": str,
             "disparity_margin": float,
-            "disparity_outliers_rejection_percent": And(
-                float, lambda x: x >= 0, lambda x: x <= 1
-            ),
             "minimum_nb_matches": And(int, lambda x: x > 0),
             "elevation_delta_lower_bound": Or(int, float, None),
             "elevation_delta_upper_bound": Or(int, float, None),

diff --git a/docs/source/usage/configuration.rst b/docs/source/usage/configuration.rst
@@ -987,8 +987,6 @@ The structure follows this organization:
                 +--------------------------------------+------------------------------------------------------------------------------------------------+-------------+------------------------+-------------------------------------------+----------+
                 | Name                                 | Description                                                                                    | Type        | Available value        | Default value                             | Required |
                 +======================================+================================================================================================+=============+========================+===========================================+==========+
-                | disparity_outliers_rejection_percent | Percentage of outliers to reject                                                               | float       | between 0 and 1        | 0.1                                       | No       |
-                +--------------------------------------+------------------------------------------------------------------------------------------------+-------------+------------------------+-------------------------------------------+----------+
                 | sift_matching_threshold              | Threshold for the ratio to nearest second match                                                | float       | should be > 0          | 0.7                                       | No       |
                 +--------------------------------------+------------------------------------------------------------------------------------------------+-------------+------------------------+-------------------------------------------+----------+
                 | sift_n_octave                        | The number of octaves of the Difference of Gaussians scale space                               | int         | should be > 0          | 8                                         | No       |

diff --git a/tests/applications/sparse_matching/test_sparse_matching_config.py b/tests/applications/sparse_matching/test_sparse_matching_config.py
@@ -42,7 +42,6 @@ def test_check_full_conf():
         "strip_margin": 10,
         "epipolar_error_upper_bound": 10.0,
         "epipolar_error_maximum_bias": 0.0,
-        "disparity_outliers_rejection_percent": 0.1,
         "minimum_nb_matches": 100,
         "sift_matching_threshold": 0.6,
         "sift_n_octave": 8,