Merge pull request #303 from Deltares/chore/75-standardize-module-names

chore: #75 standardize module names

ra2ce/analyses/analysis_config_data/analysis_config_data.py → ra2ce/analysis/analysis_config_data/analysis_config_data.py

@@ -19,24 +19,23 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
 from __future__ import annotations
 
 import math
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Optional
 
-from ra2ce.analyses.analysis_config_data.enums.analysis_direct_enum import (
+from ra2ce.analysis.analysis_config_data.enums.analysis_direct_enum import (
     AnalysisDirectEnum,
 )
-from ra2ce.analyses.analysis_config_data.enums.analysis_indirect_enum import (
+from ra2ce.analysis.analysis_config_data.enums.analysis_indirect_enum import (
     AnalysisIndirectEnum,
 )
-from ra2ce.analyses.analysis_config_data.enums.weighing_enum import WeighingEnum
+from ra2ce.analysis.analysis_config_data.enums.weighing_enum import WeighingEnum
 from ra2ce.common.configuration.config_data_protocol import ConfigDataProtocol
-from ra2ce.graph.network_config_data.enums.aggregate_wl_enum import AggregateWlEnum
-from ra2ce.graph.network_config_data.network_config_data import (
+from ra2ce.network.network_config_data.enums.aggregate_wl_enum import AggregateWlEnum
+from ra2ce.network.network_config_data.network_config_data import (
     NetworkSection,
     OriginsDestinationsSection,
 )

ra2ce/analyses/analysis_config_data/analysis_config_data_reader.py → ra2ce/analysis/analysis_config_data/analysis_config_data_reader.py

@@ -19,13 +19,12 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
 import logging
 from configparser import ConfigParser
 from pathlib import Path
 from shutil import copyfile
 
-from ra2ce.analyses.analysis_config_data.analysis_config_data import (
+from ra2ce.analysis.analysis_config_data.analysis_config_data import (
     AnalysisConfigData,
     AnalysisSectionBase,
     AnalysisSectionDirect,
@@ -34,13 +33,13 @@
     IndirectAnalysisNameList,
     ProjectSection,
 )
-from ra2ce.analyses.analysis_config_data.enums.analysis_direct_enum import (
+from ra2ce.analysis.analysis_config_data.enums.analysis_direct_enum import (
     AnalysisDirectEnum,
 )
-from ra2ce.analyses.analysis_config_data.enums.analysis_indirect_enum import (
+from ra2ce.analysis.analysis_config_data.enums.analysis_indirect_enum import (
     AnalysisIndirectEnum,
 )
-from ra2ce.analyses.analysis_config_data.enums.weighing_enum import WeighingEnum
+from ra2ce.analysis.analysis_config_data.enums.weighing_enum import WeighingEnum
 from ra2ce.common.configuration.ini_configuration_reader_protocol import (
     ConfigDataReaderProtocol,
 )

ra2ce/analyses/analysis_config_data/analysis_config_data_validator.py → ra2ce/analysis/analysis_config_data/analysis_config_data_validator.py

@@ -19,18 +19,17 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
 from typing import Any
 
-from ra2ce.analyses.analysis_config_data.analysis_config_data import (
+from ra2ce.analysis.analysis_config_data.analysis_config_data import (
     AnalysisConfigData,
     DirectAnalysisNameList,
     IndirectAnalysisNameList,
 )
 from ra2ce.common.validation.ra2ce_validator_protocol import Ra2ceIoValidator
 from ra2ce.common.validation.validation_report import ValidationReport
 from ra2ce.configuration.ra2ce_enum_base import Ra2ceEnumBase
-from ra2ce.graph.network_config_data.network_config_data_validator import (
+from ra2ce.network.network_config_data.network_config_data_validator import (
     NetworkDictValues,
 )
 

ra2ce/analyses/analysis_config_wrapper.py → ra2ce/analysis/analysis_config_wrapper.py

@@ -23,13 +23,13 @@
 
 from pathlib import Path
 
-from ra2ce.analyses.analysis_config_data.analysis_config_data import AnalysisConfigData
-from ra2ce.analyses.analysis_config_data.analysis_config_data_validator import (
+from ra2ce.analysis.analysis_config_data.analysis_config_data import AnalysisConfigData
+from ra2ce.analysis.analysis_config_data.analysis_config_data_validator import (
     AnalysisConfigDataValidator,
 )
 from ra2ce.common.configuration.config_wrapper_protocol import ConfigWrapperProtocol
-from ra2ce.graph.graph_files.graph_files_collection import GraphFilesCollection
-from ra2ce.graph.network_config_wrapper import NetworkConfigWrapper
+from ra2ce.network.graph_files.graph_files_collection import GraphFilesCollection
+from ra2ce.network.network_config_wrapper import NetworkConfigWrapper
 
 
 class AnalysisConfigWrapper(ConfigWrapperProtocol):

ra2ce/analyses/direct/analyses_direct.py → ra2ce/analysis/direct/analyses_direct.py

@@ -19,28 +19,27 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
 import logging
 import time
 from pathlib import Path
 from typing import Any
 
 import geopandas as gpd
 
-from ra2ce.analyses.analysis_config_data.analysis_config_data import (
+from ra2ce.analysis.analysis_config_data.analysis_config_data import (
     AnalysisConfigData,
     AnalysisSectionDirect,
 )
-from ra2ce.analyses.analysis_config_data.enums.analysis_direct_enum import (
+from ra2ce.analysis.analysis_config_data.enums.analysis_direct_enum import (
     AnalysisDirectEnum,
 )
-from ra2ce.analyses.direct.cost_benefit_analysis import EffectivenessMeasures
-from ra2ce.analyses.direct.damage.manual_damage_functions import ManualDamageFunctions
-from ra2ce.analyses.direct.damage_calculation import (
+from ra2ce.analysis.direct.cost_benefit_analysis import EffectivenessMeasures
+from ra2ce.analysis.direct.damage.manual_damage_functions import ManualDamageFunctions
+from ra2ce.analysis.direct.damage_calculation import (
     DamageNetworkEvents,
     DamageNetworkReturnPeriods,
 )
-from ra2ce.graph.graph_files.graph_files_collection import GraphFilesCollection
+from ra2ce.network.graph_files.graph_files_collection import GraphFilesCollection
 
 
 class DirectAnalyses:  ### THIS SHOULD ONLY DO COORDINATION

ra2ce/analyses/direct/cost_benefit_analysis.py → ra2ce/analysis/direct/cost_benefit_analysis.py

@@ -19,7 +19,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
 import logging
 import os
 from pathlib import Path
@@ -28,7 +27,7 @@
 import numpy as np
 import pandas as pd
 
-from ra2ce.analyses.analysis_config_data.analysis_config_data import (
+from ra2ce.analysis.analysis_config_data.analysis_config_data import (
     AnalysisConfigData,
     AnalysisSectionDirect,
 )

ra2ce/analyses/direct/damage/damage_function_road_type_lane.py → ra2ce/analysis/direct/damage/damage_function_road_type_lane.py

@@ -19,14 +19,13 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
 import logging
 from pathlib import Path
 
 import pandas as pd
 
-from ra2ce.analyses.direct.damage.damage_fraction_uniform import DamageFractionUniform
-from ra2ce.analyses.direct.damage.max_damage import MaxDamageByRoadTypeByLane
+from ra2ce.analysis.direct.damage.damage_fraction_uniform import DamageFractionUniform
+from ra2ce.analysis.direct.damage.max_damage import MaxDamageByRoadTypeByLane
 
 
 class DamageFunctionByRoadTypeByLane:

ra2ce/analyses/direct/damage/manual_damage_functions.py → ra2ce/analysis/direct/damage/manual_damage_functions.py

@@ -19,11 +19,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
 import logging
 from pathlib import Path
 
-from ra2ce.analyses.direct.damage.damage_function_road_type_lane import (
+from ra2ce.analysis.direct.damage.damage_function_road_type_lane import (
     DamageFunctionByRoadTypeByLane,
 )
 

ra2ce/analysis/direct/damage_calculation/__init__.py

@@ -0,0 +1,6 @@
+from ra2ce.analysis.direct.damage_calculation.damage_network_events import (
+    DamageNetworkEvents,
+)
+from ra2ce.analysis.direct.damage_calculation.damage_network_return_periods import (
+    DamageNetworkReturnPeriods,
+)

ra2ce/analyses/direct/damage_calculation/damage_network_base.py → ra2ce/analysis/direct/damage_calculation/damage_network_base.py

@@ -19,16 +19,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
 import logging
 from abc import ABC, abstractmethod
 
 import numpy as np
 import pandas as pd
 
-from ra2ce.analyses.direct.direct_lookup import LookUp as lookup
-from ra2ce.analyses.direct.direct_lookup import dataframe_lookup
-from ra2ce.analyses.direct.direct_utils import (
+from ra2ce.analysis.direct.direct_lookup import LookUp as lookup
+from ra2ce.analysis.direct.direct_lookup import dataframe_lookup
+from ra2ce.analysis.direct.direct_utils import (
     clean_lane_data,
     create_summary_statistics,
     scale_damage_using_lanes,
@@ -230,7 +229,11 @@ def calculate_damage_HZ(self, events):
 
         df = self._gdf_mask
         df["lanes"] = df["lanes"].astype(int)
-        df["max_dam_hz"] = df.apply(dataframe_lookup, args=(df_max_damages_huizinga, ['lanes', 'road_type']), axis=1)
+        df["max_dam_hz"] = df.apply(
+            dataframe_lookup,
+            args=(df_max_damages_huizinga, ["lanes", "road_type"]),
+            axis=1,
+        )
 
         for event in events:
             df["dam_{}_{}".format(event, curve_name)] = round(

ra2ce/analyses/direct/damage_calculation/damage_network_events.py → ra2ce/analysis/direct/damage_calculation/damage_network_events.py

@@ -19,12 +19,11 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
 from __future__ import annotations
 
 from pathlib import Path
 
-from ra2ce.analyses.direct.damage_calculation.damage_network_base import (
+from ra2ce.analysis.direct.damage_calculation.damage_network_base import (
     DamageNetworkBase,
 )
 

ra2ce/analyses/direct/damage_calculation/damage_network_return_periods.py → ra2ce/analysis/direct/damage_calculation/damage_network_return_periods.py

@@ -19,13 +19,12 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
 import logging
 
 import numpy as np
 import pandas as pd
 
-from ra2ce.analyses.direct.damage_calculation.damage_network_base import (
+from ra2ce.analysis.direct.damage_calculation.damage_network_base import (
     DamageNetworkBase,
 )
 

ra2ce/analyses/direct/road_damage.py → ra2ce/analysis/direct/road_damage.py

@@ -19,10 +19,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
 import logging
 
-from ra2ce.analyses.analysis_config_data.analysis_config_data import AnalysisConfigData
+from ra2ce.analysis.analysis_config_data.analysis_config_data import AnalysisConfigData
 
 
 class DirectAnalyses:

ra2ce/analyses/indirect/analyses_indirect.py → ra2ce/analysis/indirect/analyses_indirect.py

@@ -33,21 +33,21 @@
 from shapely.geometry import LineString, MultiLineString
 from tqdm import tqdm
 
-from ra2ce.analyses.analysis_config_data.analysis_config_data import (
+from ra2ce.analysis.analysis_config_data.analysis_config_data import (
     AnalysisConfigData,
     AnalysisSectionIndirect,
 )
-from ra2ce.analyses.analysis_config_data.enums.analysis_indirect_enum import (
+from ra2ce.analysis.analysis_config_data.enums.analysis_indirect_enum import (
     AnalysisIndirectEnum,
 )
-from ra2ce.analyses.analysis_config_data.enums.weighing_enum import WeighingEnum
-from ra2ce.analyses.indirect.losses import Losses
-from ra2ce.analyses.indirect.origin_closest_destination import OriginClosestDestination
-from ra2ce.analyses.indirect.traffic_analysis.traffic_analysis_factory import (
+from ra2ce.analysis.analysis_config_data.enums.weighing_enum import WeighingEnum
+from ra2ce.analysis.indirect.losses import Losses
+from ra2ce.analysis.indirect.origin_closest_destination import OriginClosestDestination
+from ra2ce.analysis.indirect.traffic_analysis.traffic_analysis_factory import (
     TrafficAnalysisFactory,
 )
-from ra2ce.graph.graph_files.graph_files_collection import GraphFilesCollection
-from ra2ce.graph.networks_utils import buffer_geometry, graph_to_gdf, graph_to_gpkg
+from ra2ce.network.graph_files.graph_files_collection import GraphFilesCollection
+from ra2ce.network.networks_utils import buffer_geometry, graph_to_gdf, graph_to_gpkg
 
 
 class IndirectAnalyses:
@@ -1229,10 +1229,10 @@ def _save_gpkg_analysis(
                             opt_routes_with_hazard,
                         ) = analyzer.multi_link_origin_closest_destination()
 
-                        (
-                            opt_routes_with_hazard
-                        ) = analyzer.difference_length_with_without_hazard(
-                            opt_routes_with_hazard, opt_routes_without_hazard
+                        (opt_routes_with_hazard) = (
+                            analyzer.difference_length_with_without_hazard(
+                                opt_routes_with_hazard, opt_routes_without_hazard
+                            )
                         )
 
                 else:

ra2ce/analyses/indirect/losses.py → ra2ce/analysis/indirect/losses.py

@@ -19,12 +19,12 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
 from pathlib import Path
+
 import numpy as np
 import pandas as pd
 
-from ra2ce.analyses.analysis_config_data.analysis_config_data import (
+from ra2ce.analysis.analysis_config_data.analysis_config_data import (
     AnalysisConfigData,
     AnalysisSectionIndirect,
 )

ra2ce/analyses/indirect/origin_closest_destination.py → ra2ce/analysis/indirect/origin_closest_destination.py

@@ -19,7 +19,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
 # -*- coding: utf-8 -*-
 import copy
 import logging
@@ -31,11 +30,11 @@
 from shapely.geometry import LineString, MultiLineString
 from tqdm import tqdm
 
-from ra2ce.analyses.analysis_config_data.analysis_config_data import (
+from ra2ce.analysis.analysis_config_data.analysis_config_data import (
     AnalysisConfigData,
     AnalysisSectionIndirect,
 )
-from ra2ce.graph.graph_files.graph_files_collection import GraphFilesCollection
+from ra2ce.network.graph_files.graph_files_collection import GraphFilesCollection
 
 
 class OriginClosestDestination:
@@ -435,16 +434,19 @@ def get_nr_without_access(
         ]
 
         pp_no_access = [
-            round(
-                (
-                    origins.loc[
-                        origins[self.od_id].isin(origins_no_access), self.origin_count
-                    ]
-                    * self.origin_out_fraction
-                ).sum()
+            (
+                round(
+                    (
+                        origins.loc[
+                            origins[self.od_id].isin(origins_no_access),
+                            self.origin_count,
+                        ]
+                        * self.origin_out_fraction
+                    ).sum()
+                )
+                if len(origins_no_access) > 0
+                else 0
             )
-            if len(origins_no_access) > 0
-            else 0
         ]
 
         self.results_dict[f"Nr. no access{add_key_name}"] = pp_no_access

ra2ce/analyses/indirect/traffic_analysis/equity_analysis.py → ra2ce/analysis/indirect/traffic_analysis/equity_analysis.py

@@ -23,10 +23,10 @@
 import numpy as np
 import pandas as pd
 
-from ra2ce.analyses.indirect.traffic_analysis.accumulated_traffic_dataclass import (
+from ra2ce.analysis.indirect.traffic_analysis.accumulated_traffic_dataclass import (
     AccumulatedTraffic,
 )
-from ra2ce.analyses.indirect.traffic_analysis.traffic_analysis_base import (
+from ra2ce.analysis.indirect.traffic_analysis.traffic_analysis_base import (
     TrafficAnalysisBase,
 )