cars 1.0.0a3__cp39-cp39-win_amd64.whl → 1.0.0a4__cp39-cp39-win_amd64.whl

cars/applications/dsm_filling/exogenous_filling_app.py

@@ -56,7 +56,6 @@ class ExogenousFilling(DsmFilling, short_name="exogenous_filling"):
 
         # check conf
         self.used_method = self.used_config["method"]
-        self.activated = self.used_config["activated"]
         self.classification = self.used_config["classification"]
         self.fill_with_geoid = self.used_config["fill_with_geoid"]
         self.interpolation_method = self.used_config["interpolation_method"]
@@ -73,7 +72,6 @@ class ExogenousFilling(DsmFilling, short_name="exogenous_filling"):
 
         # Overload conf
         overloaded_conf["method"] = conf.get("method", "bulldozer")
-        overloaded_conf["activated"] = conf.get("activated", False)
         overloaded_conf["classification"] = conf.get("classification", "nodata")
         if isinstance(overloaded_conf["classification"], str):
             overloaded_conf["classification"] = [
@@ -85,10 +83,11 @@ class ExogenousFilling(DsmFilling, short_name="exogenous_filling"):
         )
 
         if overloaded_conf["interpolation_method"] not in ["bilinear", "cubic"]:
+            # pylint: disable=inconsistent-quotes
             raise RuntimeError(
-                "Invalid interpolation method"
+                f"Invalid interpolation method"
                 f"{overloaded_conf['interpolation_method']}, "
-                "supported modes are bilinear and cubic."
+                f"supported modes are bilinear and cubic."
             )
 
         overloaded_conf["save_intermediate_data"] = conf.get(
@@ -97,7 +96,6 @@ class ExogenousFilling(DsmFilling, short_name="exogenous_filling"):
 
         rectification_schema = {
             "method": str,
-            "activated": bool,
             "classification": Or(None, [str]),
             "fill_with_geoid": Or(None, [str]),
             "interpolation_method": str,
@@ -111,7 +109,7 @@ class ExogenousFilling(DsmFilling, short_name="exogenous_filling"):
         return overloaded_conf
 
     @cars_profile(name="Exogeneous filling")
-    def run(  # noqa C901
+    def run(  # pylint: disable=too-many-positional-arguments  # noqa C901
         self,
         dsm_file,
         classif_file,
@@ -133,9 +131,6 @@ class ExogenousFilling(DsmFilling, short_name="exogenous_filling"):
             - a Shapely Polygon
         """
 
-        if not self.activated:
-            return
-
         if self.classification is None:
             self.classification = ["nodata"]
 

cars/applications/grid_generation/abstract_grid_generation_app.py

@@ -104,7 +104,7 @@ class GridGeneration(ApplicationTemplate, metaclass=ABCMeta):
         """
 
     @abstractmethod
-    def run(
+    def run(  # pylint: disable=too-many-positional-arguments
         self,
         image_left,
         image_right,

cars/applications/grid_generation/epipolar_grid_generation_app.py

@@ -31,7 +31,9 @@ from json_checker import And, Checker
 
 import cars.orchestrator.orchestrator as ocht
 from cars.applications import application_constants
-from cars.applications.grid_generation import grid_generation_algo
+from cars.applications.grid_generation import (
+    grid_generation_algo,
+)
 from cars.applications.grid_generation import (
     grid_generation_constants as grid_constants,
 )
@@ -119,7 +121,7 @@ class EpipolarGridGeneration(GridGeneration, short_name="epipolar"):
         return self.save_intermediate_data
 
     @cars_profile(name="Epi Grid Generation")
-    def run(
+    def run(  # pylint: disable=too-many-positional-arguments
         self,
         image_left,
         image_right,

cars/applications/grid_generation/grid_correction_app.py

@@ -37,7 +37,9 @@ from scipy.spatial import Delaunay  # pylint: disable=E0611
 
 import cars.orchestrator.orchestrator as ocht
 from cars.applications import application_constants
-from cars.applications.grid_generation import grid_generation_algo
+from cars.applications.grid_generation import (
+    grid_generation_algo,
+)
 from cars.applications.grid_generation import (
     grid_generation_constants as grid_constants,
 )
@@ -165,6 +167,7 @@ def correct_grid(grid, grid_correction, pair_folder, save_grid=None):
     return corrected_grid_right
 
 
+# pylint: disable=too-many-positional-arguments
 @cars_profile(name="Grid correction estimation")
 def estimate_right_grid_correction(
     matches,

cars/applications/grid_generation/grid_generation_algo.py

@@ -43,6 +43,7 @@ from cars.applications.triangulation.triangulation_algo import (
 )
 from cars.core import constants as cst
 from cars.core import inputs, projection, tiling
+from cars.orchestrator.cluster.log_wrapper import cars_profile
 
 
 def get_new_path(path):
@@ -106,7 +107,7 @@ def write_grid(grid, fname, origin, spacing):
         dst.write_band(2, grid[:, :, 1])
 
 
-def generate_epipolar_grids(
+def generate_epipolar_grids(  # pylint: disable=too-many-positional-arguments
     sensor1, sensor2, geomodel1, geomodel2, geometry_plugin, epipolar_step
 ):
     """
@@ -140,6 +141,8 @@ def generate_epipolar_grids(
     )
 
 
+# pylint: disable=too-many-positional-arguments
+@cars_profile(name="Compute epipolar grid min max", interval=0.5)
 def compute_epipolar_grid_min_max(
     geometry_plugin,
     grid,
@@ -239,6 +242,7 @@ def compute_epipolar_grid_min_max(
         grid1,
         grid2,
         matches_min,
+        interpolation_method="linear",
     )
     pc_max = triangulate_matches(
         geometry_plugin,
@@ -249,6 +253,7 @@ def compute_epipolar_grid_min_max(
         grid1,
         grid2,
         matches_max,
+        interpolation_method="linear",
     )
 
     # Convert to correct EPSG
@@ -278,7 +283,7 @@ def compute_epipolar_grid_min_max(
     return grid_min, grid_max
 
 
-def terrain_region_to_epipolar(
+def terrain_region_to_epipolar(  # pylint: disable=too-many-positional-arguments
     region,
     sensor1,
     sensor2,

cars/applications/ground_truth_reprojection/abstract_ground_truth_reprojection_app.py

@@ -97,7 +97,7 @@ class GroundTruthReprojection(ApplicationTemplate, metaclass=ABCMeta):
         super().__init__(conf=conf)
 
     @abstractmethod
-    def run(
+    def run(  # pylint: disable=too-many-positional-arguments
         self,
         sensor_left,
         sensor_right,

cars/applications/ground_truth_reprojection/direct_localization_app.py

@@ -117,7 +117,7 @@ class DirectLocalization(
 
         return overloaded_conf
 
-    def run(  # noqa: C901
+    def run(  # pylint: disable=too-many-positional-arguments  # noqa: C901
         self,
         sensor_left,
         sensor_right,
@@ -495,7 +495,7 @@ class DirectLocalization(
                     )
 
 
-def maps_generation_wrapper(
+def maps_generation_wrapper(  # pylint: disable=too-many-positional-arguments
     sensor_left,
     grid_left,
     geom_plugin,

cars/applications/ground_truth_reprojection/ground_truth_reprojection_algo.py

@@ -32,7 +32,7 @@ from cars.core.projection import point_cloud_conversion
 from cars.pipelines.parameters import sensor_inputs_constants as sens_cst
 
 
-def get_ground_truth(
+def get_ground_truth(  # pylint: disable=too-many-positional-arguments
     geom_plugin,
     grid,
     sensor,
@@ -76,6 +76,7 @@ def get_ground_truth(
 
     (positions_col, positions_row) = np.meshgrid(cols, rows)
 
+    direct_loc = None
     if target == "epipolar":
 
         positions = np.stack([positions_col, positions_row], axis=2)

cars/applications/point_cloud_fusion/abstract_pc_fusion_app.py

@@ -1,155 +0,0 @@
-#!/usr/bin/env python
-# coding: utf8
-#
-# Copyright (c) 2020 Centre National d'Etudes Spatiales (CNES).
-#
-# This file is part of CARS
-# (see https://github.com/CNES/cars).
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-"""
-this module contains the abstract PointCloudFusion application class.
-"""
-import logging
-from abc import ABCMeta, abstractmethod
-from typing import Dict
-
-from cars.applications.application import Application
-from cars.applications.application_template import ApplicationTemplate
-
-
-@Application.register("point_cloud_fusion")
-class PointCloudFusion(ApplicationTemplate, metaclass=ABCMeta):
-    """
-    PointCloudFusion
-    """
-
-    available_applications: Dict = {}
-    default_application = "mapping_to_terrain_tiles"
-
-    def __new__(cls, conf=None):  # pylint: disable=W0613
-        """
-        Return the required application
-        :raises:
-         - KeyError when the required application is not registered
-
-        :param conf: configuration for fusion
-        :return: a application_to_use object
-        """
-
-        fusion_method = cls.default_application
-        if bool(conf) is False or "method" not in conf:
-            logging.info(
-                "Fusion method not specified, "
-                "default {} is used".format(fusion_method)
-            )
-        else:
-            fusion_method = conf.get("method", cls.default_application)
-
-        if fusion_method not in cls.available_applications:
-            logging.error(
-                "No Fusion application named {} registered".format(
-                    fusion_method
-                )
-            )
-            raise KeyError(
-                "No Fusion application named {} registered".format(
-                    fusion_method
-                )
-            )
-
-        logging.info(
-            "The PointCloudFusion({}) application will be used".format(
-                fusion_method
-            )
-        )
-
-        return super(PointCloudFusion, cls).__new__(
-            cls.available_applications[fusion_method]
-        )
-
-    def __init_subclass__(cls, short_name, **kwargs):  # pylint: disable=E0302
-        super().__init_subclass__(**kwargs)
-        cls.available_applications[short_name] = cls
-
-    def __init__(self, conf=None):
-        """
-        Init function of PointCloudFusion
-
-        :param conf: configuration
-        :return: an application_to_use object
-        """
-
-        super().__init__(conf=conf)
-
-    @abstractmethod
-    def run(
-        self,
-        list_epipolar_point_clouds,
-        bounds,
-        epsg,
-        source_pc_names=None,
-        orchestrator=None,
-        margins=0,
-        optimal_terrain_tile_width=500,
-        roi=None,
-    ):
-        """
-        Run EpipolarCloudFusion application.
-
-        Creates a CarsDataset corresponding to the merged point clouds,
-        tiled with the terrain grid used during rasterization.
-
-        :param list_epipolar_point_clouds: list with point clouds\
-            Each CarsDataset contains:
-
-            - N x M Delayed tiles. \
-                Each tile will be a future xarray Dataset containing:
-
-                - data : with keys : "x", "y", "z", "corr_msk" \
-                    optional: "texture", "msk", "z_inf", "z_sup"
-                - attrs with keys: "margins", "epi_full_size", "epsg"
-            - attributes containing: "disp_lower_bound",  "disp_upper_bound" \
-                "elevation_delta_lower_bound", "elevation_delta_upper_bound"
-        :type list_epipolar_point_clouds: list(CarsDataset) filled with
-          xr.Dataset
-        :param bounds: terrain bounds
-        :type bounds: list
-        :param epsg: epsg to use
-        :type epsg: str
-        :param source_pc_names: source pc names
-        :type source_pc_names: list[str]
-        :param orchestrator: orchestrator used
-        :type orchestrator: Orchestrator
-        :param margins: margins needed for tiles, meter or degree
-        :type margins: float
-        :param optimal_terrain_tile_width: optimal terrain tile width
-        :type optimal_terrain_tile_width: int
-
-        :return: Merged point clouds
-
-            CarsDataset contains:
-
-            - Z x W Delayed tiles\
-                Each tile will be a future pandas DataFrame containing:
-
-                - data : with keys : "x", "y", "z", "corr_msk" \
-                    optional: "clr", "msk", "data_valid","coord_epi_geom_i",\
-                     "coord_epi_geom_j","idx_im_epi", "z_inf", "z_sup"
-                - attrs with keys: "epsg"
-            - attributes containing: "bounds", "epsg"
-
-        :rtype: CarsDataset filled with pandas.DataFrame
-
-        """