From bf93f81e1973d3db4e680fd6c43c3ed4bebf521b Mon Sep 17 00:00:00 2001 From: Ardt Klapwijk <59741981+ArdtK@users.noreply.github.com> Date: Thu, 31 Oct 2024 15:36:51 +0100 Subject: [PATCH] chore: normalize characteristic points releated properties (#207) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: replace dikeside with waterside * chore: adjust readmes * chore: configuration io changes * chore: rename variables configuration\io\ini * chore: rename configuration\io\ini * chore: fix issues * docs: adjust readme * chore: delete koswat.log * chore: rename last configs * chore: small changes * chore: rename sheet_pile to sheetpile * chore: rename input_profile base and protocol variables * chore: some leftovers * chore: fix koswat_scenario * chore: revert scenario changes * chore: fix issues * chore: revert section to traject * docs: update readme files * test: update reference summary_costs.csv * chore: add translations to READMEs --------- Co-authored-by: Carles S. Soriano Pérez --- docs/reference/koswat_cost_report.md | 4 +- docs/reference/koswat_dike.md | 16 +- docs/reference/koswat_reinforced_profile.md | 4 +- docs/reference/koswat_surroundings.md | 5 +- docs/user_manual.md | 29 +- .../io/csv/koswat_surroundings_csv_fom.py | 16 +- .../io/csv/koswat_surroundings_csv_reader.py | 2 +- .../io/ini/koswat_costs_ini_fom.py | 158 +++++------ .../io/ini/koswat_general_ini_fom.py | 140 +++++----- .../ini/koswat_section_scenarios_ini_fom.py | 8 +- .../configuration/io/koswat_costs_importer.py | 84 +++--- .../io/koswat_input_profile_list_importer.py | 28 +- .../io/koswat_run_settings_importer.py | 30 +-- ...urroundings_wrapper_collection_importer.py | 16 +- .../costs/construction_costs_settings.py | 30 +-- .../costs/dike_profile_costs_settings.py | 2 +- .../configuration/settings/koswat_scenario.py | 4 +- .../koswat_cofferdam_settings.py | 4 +- .../koswat_piping_wall_settings.py | 6 +- .../reinforcements/koswat_soil_settings.py | 6 +- .../koswat_stability_wall_settings.py | 8 +- .../reinforcements/koswat_vps_settings.py | 2 +- .../profile/quantity_cost_parameters.py | 4 +- .../quantity_cost_parameters_builder.py | 18 +- .../quantity_cost_parameters_calculator.py | 8 +- .../summary/koswat_summary_builder.py | 11 +- .../characteristic_points_builder.py | 47 ++-- koswat/dike/koswat_input_profile_protocol.py | 30 +-- .../dike/profile/koswat_input_profile_base.py | 32 +-- .../infrastructure_surroundings_wrapper.py | 10 +- .../wrapper/obstacle_surroundings_wrapper.py | 6 +- .../wrapper/surroundings_wrapper_builder.py | 34 ++- .../cofferdam_input_profile_calculation.py | 84 +++--- .../piping_wall_input_profile_calculation.py | 69 ++--- ...orcement_input_profile_calculation_base.py | 24 +- .../input_profile/soil/soil_input_profile.py | 4 +- .../soil/soil_input_profile_calculation.py | 64 ++--- ...tability_wall_input_profile_calculation.py | 75 +++--- .../vps_input_profile.py | 4 +- .../vps_input_profile_calculation.py | 30 ++- .../standard_reinforcement_profile_builder.py | 5 +- koswat/strategies/README.md | 2 +- .../koswat_input_profile_base_cases.py | 168 ++++++------ .../koswat_scenario_test_cases.py | 16 +- .../test_koswat_section_scenarios_ini_fom.py | 4 +- .../io/ini/test_read_ini_configurations.py | 250 +++++++++--------- ...test_koswat_input_profile_list_importer.py | 28 +- ...urroundings_wrapper_collection_importer.py | 32 +-- .../costs/test_construction_costs_settings.py | 14 +- .../test_summary_costs_csv_exporter.py | 6 +- .../test_quantity_cost_parameters_builder.py | 26 +- tests/dike/input_profile_cases.py | 28 +- ...est_infrastructure_surroundings_wrapper.py | 10 +- .../test_obstacle_surroundings_wrapper.py | 6 +- .../wrapper/test_surroundings_wrapper.py | 30 +-- tests/dike_reinforcements/__init__.py | 8 +- .../cofferdam/test_cofferdam_input_profile.py | 14 +- ...est_cofferdam_input_profile_calculation.py | 144 +++++----- .../test_piping_wall_input_profile.py | 14 +- ...t_piping_wall_input_profile_calculation.py | 62 ++--- .../soil/test_soil_input_profile.py | 14 +- .../test_soil_input_profile_calculation.py | 102 +++---- .../test_stability_wall_input_profile.py | 14 +- ...tability_wall_input_profile_calculation.py | 124 ++++----- .../test_vps_input_profile.py | 14 +- .../test_vps_input_profile_calculation.py | 50 ++-- ...t_reinforcement_profile_builder_factory.py | 24 +- .../reinforcement_profile_cases.py | 112 ++++---- tests/test_acceptance.py | 104 ++++---- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- .../summary_costs.csv | 6 +- 111 files changed, 1449 insertions(+), 1384 deletions(-) diff --git a/docs/reference/koswat_cost_report.md b/docs/reference/koswat_cost_report.md index d71d9e7e..7d47ffd6 100644 --- a/docs/reference/koswat_cost_report.md +++ b/docs/reference/koswat_cost_report.md @@ -26,12 +26,12 @@ These characteristics are then used to estimate how much surface of the infrastr A reinforced profile can be different from its original state in many ways, however here we are only intestered in two things: -1. The new profile's width from the original outsides (waterside) crest point. +1. The new profile's width from the original waterside crest point. 2. Whether there is a crest's height increase (`dh0`), By using the old and the reinforced profile's geometries, we can determine what we call zone `A` and zone `B`, `A + B = {profile's width from waterside crest point}`. -- Zone `A` represents the length of the dike old profile's crest (highest surface). +- Zone `A` represents the width of the dike old profile's crest (highest surface). - Zone `B` the distance between said crest and the end of the dike's reinforcement. |![Dike profile with zone A and B](./imgs/surroundings_zone_a_b.png)| diff --git a/docs/reference/koswat_dike.md b/docs/reference/koswat_dike.md index d7a77411..ee0a66fe 100644 --- a/docs/reference/koswat_dike.md +++ b/docs/reference/koswat_dike.md @@ -7,15 +7,23 @@ In this section we will describe how a Koswat dike is defined and what its parts A koswat dike is represented by an instance of a `KoswatProfileProtocol`. And its properties represent different aspects of a 'real domain'. With _Image 1. Base profile properties_ as reference, we can see the mapping between said 'real domain' and the koswat properties: - `input_data`: The parts of a dike (written on the image reference), which are directly mapped as an implementation of the `KoswatInputProfileProtocol`. -- `characteristic_points`: 8 points given by the user describing the dike on (x,y) coordinates, the first four represent the waterside, the last four the polderside. Numbered in the reference picture from 1 to 8. +- `characteristic_points`: 8 points given by the user describing the dike on (x,y) coordinates, the first four represent the waterside (_buitendijks_), the last four the polderside (_binnendijks_). Numbered in the reference picture from 1 to 8. Point 4 is considered to be the reference value (0) with respect to distances of e.g. surroundings and widths of certain parts of the dike. - `layers_wrapper`: The description on how the layers of the dike are built. Further described in [Dike layers](#dike-layers). -- `location`: coordinate (x, y) where the dike is situated. -- `profile_width`: The difference between the lowest and the highest 'x' coordinates of the profile characteristic points. The distance between characteristic point 1 and 8. +- `location`: Geospatial coordinates (x, y) where the dike is situated. +- `profile_width`: The difference between the lowest and the highest 'x' coordinates of the profile characteristic points. The distance between characteristic points 1 and 8. This can be broken down into: + - `waterside_width`: The distance between characteristics points 1 and 4. + - `polderside_width`: The distance between characteristics points 4 and 8. |![Base profile properties](./imgs/base_profile_properties.png)| |:--:| |Image 1. Base profile properties| +The geometry of a dike has certain additional characteristics: +- `crest` (_kruin_): The flat part on top of the dike. +- `berm` (_berm_): The flat part between either point 2 and 3 (waterside) or point 6 an 7 (polderside). +- `slope` (_talud_): The (steepness of the) diagonal parts between points 1 and 4 (waterside) or points 5 and 8 (polderside). +- `ground level` (_maaiveld_): The level of the area to the left of point 1 (waterside) or to the right of point 8 (polderside). + ## Dike layers A dike is composed by three layers: @@ -34,7 +42,7 @@ Using _Image 3. Clay layer highlighted_ as an example, we can map the previous p - `material_type`: Clay, the 'in-between' layer. - `upper_points`: Line with the 'orange' points, without 'closing' the polygon, something like: [(-18, 0), (0, 5.5), (8, 5.5), (21, 0)]. -- `outer_geometry`: Closed geometry using the `upper points` and the 'ground floor' points: [(-18, 0), (0, 5.5), (8, 5.5), (21, 0), __(-18, 0)__]. +- `outer_geometry`: Closed geometry using the `upper points` and the 'ground level' (_maaiveld_) points: [(-18, 0), (0, 5.5), (8, 5.5), (21, 0), __(-18, 0)__]. - `material_geometry`: Closed geometry using the `upper_points` from Clay and the `upper_points` from the layer below (Sand, green points). Should be something like: [(-18, 0), (0, 5.5), (8, 5.5), (21, 0), __(19, 0), (8, 4.75), (0, 4.75), (-14, 0), (-18, 0)__] |![Base profile sand layer](./imgs/base_profile/base_profile_sand.png)| diff --git a/docs/reference/koswat_reinforced_profile.md b/docs/reference/koswat_reinforced_profile.md index 21a38f7a..e2efaab3 100644 --- a/docs/reference/koswat_reinforced_profile.md +++ b/docs/reference/koswat_reinforced_profile.md @@ -16,7 +16,9 @@ A reinforcement profile implements the `ReinforcementProfileProtocol`, which is We have two main different sort of reinfocements which contain also subtypes for said reinforcements: -- __Outside slope reinforcement__: Cofferdam (_kistdam_), based on the `OutsideSlopeReinforcementProfile`. +- __Outside slope reinforcement__: Cofferdam (_kistdam_), based on the `OutsideSlopeReinforcementProfile`. With this reinforcement the outside slope (_buiten talud_) of the dike is impacted. - __Standard reinforcement__: Piping wall (_kwelscherm_), soil (_grondmaatregel profiel_), stability wall (_stabiliteitswand_), vertical piping solution (_verticale piping oplossing_). The previous being based on the `StandardReinforcementProfile`. + - A piping wall can be implemented by a cb wall (_cement-bentoniet wand_) and an unanchored sheet pile (_onverankerde damwand_). + - A stability wall can be implemented by a diaphragm wall (_diepwand_) and an anchored sheet pile (_verankerde damwand_). In addition, the above mentioned reinforcements can also implement their own `ReinforcementInputProfileProtocol`, which are after all extensions of the `KoswatInputProfileBase` with extra properties. \ No newline at end of file diff --git a/docs/reference/koswat_surroundings.md b/docs/reference/koswat_surroundings.md index 32b8566f..ec92d550 100644 --- a/docs/reference/koswat_surroundings.md +++ b/docs/reference/koswat_surroundings.md @@ -29,12 +29,13 @@ Their headers are divided in the following columns: - `SECTIE`, section of the location in the dike's traject, - `Xcoord`, x coordinate of the location, - `Ycoord`, y coordinate of the location, -- `afst_{x}m`, distance from the location, where 'x' are all the values between `5` and `200` with steps of 5, thus 40 columns. The values in these cells are called define whether there are obstacles at this distance or not and in `Koswat` are usually built in the `SurroundingsPoint.surroundings_matrix`, each type of surrounding interprets the weights in a different manner. +- `afst_{x}m`, distance from the reference point of the location, where 'x' are all the values between `5` and `200` with steps of 5, thus 40 columns. The values in these cells define whether there are obstacles or infrastructures at this distance or not and in `Koswat` are usually built in the `SurroundingsPoint.surroundings_matrix`, each type of surrounding interprets the weights in a different manner. ## Obstacles An obstacle usually represents a building, because they cannot be removed they become a constraint to the possible reinforcements that can be applied at a given location. For instance, if a dike's reinforcement will become 5 meters wider, but within that distance there are obstacles, said reinforcement will be discarded as a possible option at that location. +The distance from the reference point of the dike to the closes point of the obstacle is given. The values in the columns `afst_{x}m` are either `1` or `0` and are simply interpreted as having a surrounding or not. Thus ignoring other characteristics of the surrounding and just focusing on its presence. @@ -59,6 +60,8 @@ Infrastructures are mostly "roads". Contrary to the [obstacles](#obstacles) thes With the above values we know what's the __affected area__ of an infrastructure when a reinforced profile needs to be applied and therefore can estimate their costs. +The distance from the reference point of the dike to the center point of the infrastructure is given. + ### Infrastructures types Currently we identify and support the following surroundings as written in the `.csv` file names: diff --git a/docs/user_manual.md b/docs/user_manual.md index bc8c4ae7..df202f56 100644 --- a/docs/user_manual.md +++ b/docs/user_manual.md @@ -26,7 +26,6 @@ from koswat.dike.profile.koswat_input_profile_base import KoswatInputProfileBase from koswat.dike.material.koswat_material_type import KoswatMaterialType from koswat.configuration.settings.koswat_scenario import KoswatScenario from koswat.dike.profile import KoswatProfileBase, KoswatProfileBuilder -from koswat.cost_report.profile.profile_cost_report import ProfileCostReport from koswat.cost_report.summary import KoswatSummary, KoswatSummaryBuilder from koswat.configuration.settings.koswat_run_scenario_settings import ( KoswatRunScenarioSettings, @@ -50,17 +49,17 @@ assert _shp_trajects_file.is_file() ## Define input profile case input_profile_case = KoswatInputProfileBase() input_profile_case.dike_section = "test_data" -input_profile_case.buiten_maaiveld = 0 -input_profile_case.buiten_talud = 3 -input_profile_case.buiten_berm_hoogte = 0 -input_profile_case.buiten_berm_breedte = 0 -input_profile_case.kruin_hoogte = 6 -input_profile_case.kruin_breedte = 5 -input_profile_case.binnen_talud = 3 -input_profile_case.binnen_berm_hoogte = 0 -input_profile_case.binnen_berm_breedte = 0 -input_profile_case.binnen_maaiveld = 0 -input_profile_case.pleistoceen = -5 +input_profile_case.waterside_ground_level = 0 +input_profile_case.waterside_slope = 3 +input_profile_case.waterside_berm_width = 0 +input_profile_case.waterside_berm_height = 0 +input_profile_case.crest_height = 6 +input_profile_case.crest_width = 5 +input_profile_case.polderside_slope = 3 +input_profile_case.polderside_berm_height = 0 +input_profile_case.polderside_berm_width = 0 +input_profile_case.polderside_ground_level = 0 +input_profile_case.pleistocene = -5 input_profile_case.aquifer = -2 ## Define the scenario case @@ -70,8 +69,8 @@ scenario_case.scenario_section = "" scenario_case.d_h = 1 scenario_case.d_s = 10 scenario_case.d_p = 30 -scenario_case.kruin_breedte = 5 -scenario_case.buiten_talud = 3 +scenario_case.crest_width = 5 +scenario_case.waterside_slope = 3 ## Define the layers case layers_case = dict( @@ -82,7 +81,7 @@ layers_case = dict( ], ) -## Import surroundings +## Import surroundings (TODO: update with latest implementation of SurroundingsWrapperCollectionImporter) _surroundings_importer = KoswatSurroundingsImporter() _surroundings_importer.traject_loc_shp_file = _shp_trajects_file _surroundings = _surroundings_importer.import_from(_test_dir)[0] diff --git a/koswat/configuration/io/csv/koswat_surroundings_csv_fom.py b/koswat/configuration/io/csv/koswat_surroundings_csv_fom.py index 332fa1f3..e70df0ce 100644 --- a/koswat/configuration/io/csv/koswat_surroundings_csv_fom.py +++ b/koswat/configuration/io/csv/koswat_surroundings_csv_fom.py @@ -10,13 +10,13 @@ class KoswatSurroundingsWrapperCsvFom(KoswatCsvFomProtocol): traject: str = "" buildings_polderside: KoswatSurroundingsCsvFom = None - buildings_dikeside: KoswatSurroundingsCsvFom = None + buildings_waterside: KoswatSurroundingsCsvFom = None railways_polderside: KoswatSurroundingsCsvFom = None - railways_dikeside: KoswatSurroundingsCsvFom = None + railways_waterside: KoswatSurroundingsCsvFom = None waters_polderside: KoswatSurroundingsCsvFom = None - waters_dikeside: KoswatSurroundingsCsvFom = None + waters_waterside: KoswatSurroundingsCsvFom = None roads_class_2_polderside: KoswatSurroundingsCsvFom = None roads_class_7_polderside: KoswatSurroundingsCsvFom = None @@ -24,11 +24,11 @@ class KoswatSurroundingsWrapperCsvFom(KoswatCsvFomProtocol): roads_class_47_polderside: KoswatSurroundingsCsvFom = None roads_class_unknown_polderside: KoswatSurroundingsCsvFom = None - roads_class_2_dikeside: KoswatSurroundingsCsvFom = None - roads_class_7_dikeside: KoswatSurroundingsCsvFom = None - roads_class_24_dikeside: KoswatSurroundingsCsvFom = None - roads_class_47_dikeside: KoswatSurroundingsCsvFom = None - roads_class_unknown_dikeside: KoswatSurroundingsCsvFom = None + roads_class_2_waterside: KoswatSurroundingsCsvFom = None + roads_class_7_waterside: KoswatSurroundingsCsvFom = None + roads_class_24_waterside: KoswatSurroundingsCsvFom = None + roads_class_47_waterside: KoswatSurroundingsCsvFom = None + roads_class_unknown_waterside: KoswatSurroundingsCsvFom = None def is_valid(self) -> bool: _surroundings = [ diff --git a/koswat/configuration/io/csv/koswat_surroundings_csv_reader.py b/koswat/configuration/io/csv/koswat_surroundings_csv_reader.py index e7764de6..c847018f 100644 --- a/koswat/configuration/io/csv/koswat_surroundings_csv_reader.py +++ b/koswat/configuration/io/csv/koswat_surroundings_csv_reader.py @@ -16,7 +16,7 @@ class KoswatSurroundingsCsvReader(KoswatReaderProtocol): def read(self, file_path: Path) -> KoswatSurroundingsCsvFom: _csv_fom = KoswatCsvReader().read(file_path) - # First three columns are section x and y coordinate. + # First three columns are section, x and y coordinate. _koswat_fom = KoswatSurroundingsCsvFom() _koswat_fom.distances_list = self._get_surroundings_distances( _csv_fom.headers[3:] diff --git a/koswat/configuration/io/ini/koswat_costs_ini_fom.py b/koswat/configuration/io/ini/koswat_costs_ini_fom.py index e34c54a0..f648e3ab 100644 --- a/koswat/configuration/io/ini/koswat_costs_ini_fom.py +++ b/koswat/configuration/io/ini/koswat_costs_ini_fom.py @@ -4,110 +4,114 @@ class UnitPricesSectionFom(KoswatIniFomProtocol): - prijspeil: float + price_level: float @classmethod def from_config(cls, ini_config: ConfigParser) -> KoswatIniFomProtocol: _section = cls() - _section.prijspeil = ini_config.getint("prijspeil") + _section.price_level = ini_config.getint("prijspeil") return _section class DikeProfileCostsSectionFom(KoswatIniFomProtocol): - aanleg_graslaag_m3: float - aanleg_kleilaag_m3: float - aanleg_kern_m3: float - hergebruik_graslaag_m3: float - hergebruik_kern_m3: float - afvoeren_materiaal_m3: float - profileren_graslaag_m2: float - profileren_kleilaag_m2: float - profileren_kern_m2: float - bewerken_maaiveld_m2: float + construction_grass_layer_m3: float + construction_clay_layer_m3: float + construction_core_m3: float + reuse_grass_layer_m3: float + reuse_core_m3: float + dispose_material_m3: float + profile_grass_layer_m2: float + profile_clay_layer_m2: float + profile_core_m2: float + process_ground_level_surface_m2: float @classmethod def from_config(cls, ini_config: ConfigParser) -> KoswatIniFomProtocol: _section = cls() - _section.aanleg_graslaag_m3 = ini_config.getfloat("aanleg_graslaag_m3") - _section.aanleg_kleilaag_m3 = ini_config.getfloat("aanleg_kleilaag_m3") - _section.aanleg_kern_m3 = ini_config.getfloat("aanleg_kern_m3") - _section.hergebruik_graslaag_m3 = ini_config.getfloat("hergebruik_graslaag_m3") - _section.hergebruik_kern_m3 = ini_config.getfloat("hergebruik_kern_m3") - _section.afvoeren_materiaal_m3 = ini_config.getfloat("afvoeren_materiaal_m3") - _section.profileren_graslaag_m2 = ini_config.getfloat("profileren_graslaag_m2") - _section.profileren_kleilaag_m2 = ini_config.getfloat("profileren_kleilaag_m2") - _section.profileren_kern_m2 = ini_config.getfloat("profileren_kern_m2") - _section.bewerken_maaiveld_m2 = ini_config.getfloat("bewerken_maaiveld_m2") + _section.construction_grass_layer_m3 = ini_config.getfloat("aanleg_graslaag_m3") + _section.construction_clay_layer_m3 = ini_config.getfloat("aanleg_kleilaag_m3") + _section.construction_core_m3 = ini_config.getfloat("aanleg_kern_m3") + _section.reuse_grass_layer_m3 = ini_config.getfloat("hergebruik_graslaag_m3") + _section.reuse_core_m3 = ini_config.getfloat("hergebruik_kern_m3") + _section.dispose_material_m3 = ini_config.getfloat("afvoeren_materiaal_m3") + _section.profile_grass_layer_m2 = ini_config.getfloat("profileren_graslaag_m2") + _section.profile_clay_layer_m2 = ini_config.getfloat("profileren_kleilaag_m2") + _section.profile_core_m2 = ini_config.getfloat("profileren_kern_m2") + _section.process_ground_level_surface_m2 = ini_config.getfloat( + "bewerken_maaiveld_m2" + ) return _section class InfrastructureCostsSectionFom(KoswatIniFomProtocol): - wegen_klasse2_verwijderen: float - wegen_klasse24_verwijderen: float - wegen_klasse47_verwijderen: float - wegen_klasse7_verwijderen: float - wegen_onbekend_verwijderen: float - wegen_klasse2_aanleg: float - wegen_klasse24_aanleg: float - wegen_klasse47_aanleg: float - wegen_klasse7_aanleg: float - wegen_onbekend_aanleg: float + roads_class2_removal: float + roads_class24_removal: float + roads_class47_removal: float + roads_class7_removal: float + roads_unknown_removal: float + roads_class2_construction: float + roads_class24_construction: float + roads_class47_construction: float + roads_class7_construction: float + roads_unknown_construction: float @classmethod def from_config(cls, ini_config: ConfigParser) -> KoswatIniFomProtocol: _section = cls() - _section.wegen_klasse2_verwijderen = ini_config.getfloat( - "wegen_klasse2_verwijderen" - ) - _section.wegen_klasse24_verwijderen = ini_config.getfloat( + _section.roads_class2_removal = ini_config.getfloat("wegen_klasse2_verwijderen") + _section.roads_class24_removal = ini_config.getfloat( "wegen_klasse24_verwijderen" ) - _section.wegen_klasse47_verwijderen = ini_config.getfloat( + _section.roads_class47_removal = ini_config.getfloat( "wegen_klasse47_verwijderen" ) - _section.wegen_klasse7_verwijderen = ini_config.getfloat( - "wegen_klasse7_verwijderen" - ) - _section.wegen_onbekend_verwijderen = ini_config.getfloat( + _section.roads_class7_removal = ini_config.getfloat("wegen_klasse7_verwijderen") + _section.roads_unknown_removal = ini_config.getfloat( "wegen_onbekend_verwijderen" ) - _section.wegen_klasse2_aanleg = ini_config.getfloat("wegen_klasse2_aanleg") - _section.wegen_klasse24_aanleg = ini_config.getfloat("wegen_klasse24_aanleg") - _section.wegen_klasse47_aanleg = ini_config.getfloat("wegen_klasse47_aanleg") - _section.wegen_klasse7_aanleg = ini_config.getfloat("wegen_klasse7_aanleg") - _section.wegen_onbekend_aanleg = ini_config.getfloat("wegen_onbekend_aanleg") + _section.roads_class2_construction = ini_config.getfloat("wegen_klasse2_aanleg") + _section.roads_class24_construction = ini_config.getfloat( + "wegen_klasse24_aanleg" + ) + _section.roads_class47_construction = ini_config.getfloat( + "wegen_klasse47_aanleg" + ) + _section.roads_class7_construction = ini_config.getfloat("wegen_klasse7_aanleg") + _section.roads_unknown_construction = ini_config.getfloat( + "wegen_onbekend_aanleg" + ) return _section class SurtaxCostsSectionFom(KoswatIniFomProtocol): - grond_makkelijk: float - grond_normaal: float - grond_moeilijk: float - constructief_makkelijk: float - constructief_normaal: float - constructief_moeilijk: float - wegen_makkelijk: float - wegen_normaal: float - wegen_moeilijk: float - grondaankoop_makkelijk: float - grondaankoop_normaal: float - grondaankoop_moeilijk: float + soil_easy: float + soil_normal: float + soil_hard: float + constructive_easy: float + constructive_normal: float + constructive_hard: float + road_easy: float + roads_normal: float + roads_hard: float + land_purchase_easy: float + land_purchase_normal: float + land_purchase_hard: float @classmethod def from_config(cls, ini_config: ConfigParser) -> KoswatIniFomProtocol: _section = cls() - _section.grond_makkelijk = ini_config.getfloat("grond_makkelijk") - _section.grond_normaal = ini_config.getfloat("grond_normaal") - _section.grond_moeilijk = ini_config.getfloat("grond_moeilijk") - _section.constructief_makkelijk = ini_config.getfloat("constructief_makkelijk") - _section.constructief_normaal = ini_config.getfloat("constructief_normaal") - _section.constructief_moeilijk = ini_config.getfloat("constructief_moeilijk") - _section.wegen_makkelijk = ini_config.getfloat("wegen_makkelijk") - _section.wegen_normaal = ini_config.getfloat("wegen_normaal") - _section.wegen_moeilijk = ini_config.getfloat("wegen_moeilijk") - _section.grondaankoop_makkelijk = ini_config.getfloat("grondaankoop_makkelijk") - _section.grondaankoop_normaal = ini_config.getfloat("grondaankoop_normaal") - _section.grondaankoop_moeilijk = ini_config.getfloat("grondaankoop_moeilijk") + _section.soil_easy = ini_config.getfloat("grond_makkelijk") + _section.soil_normal = ini_config.getfloat("grond_normaal") + _section.soil_hard = ini_config.getfloat("grond_moeilijk") + _section.constructive_easy = ini_config.getfloat("constructief_makkelijk") + _section.constructive_normal = ini_config.getfloat("constructief_normaal") + _section.constructive_hard = ini_config.getfloat("constructief_moeilijk") + _section.road_easy = ini_config.getfloat("wegen_makkelijk") + _section.roads_normal = ini_config.getfloat("wegen_normaal") + _section.roads_hard = ini_config.getfloat("wegen_moeilijk") + _section.land_purchase_easy = ini_config.getfloat("grondaankoop_makkelijk") + _section.land_purchase_normal = ini_config.getfloat("grondaankoop_normaal") + _section.land_purchase_hard = ini_config.getfloat("grondaankoop_moeilijk") return _section @@ -137,9 +141,9 @@ class KoswatCostsIniFom(KoswatIniFomProtocol): surtax_costs_excl_tax_section: SurtaxCostsSectionFom construction_cost_cb_wall: ConstructionCostsSectionFom construction_cost_vzg: ConstructionCostsSectionFom - construction_cost_damwall_unanchored: ConstructionCostsSectionFom - construction_cost_damwall_anchored: ConstructionCostsSectionFom - construction_cost_deep_wall: ConstructionCostsSectionFom + construction_cost_sheetpile_unanchored: ConstructionCostsSectionFom + construction_cost_sheetpile_anchored: ConstructionCostsSectionFom + construction_cost_diaphragm_wall: ConstructionCostsSectionFom construction_cost_cofferdam: ConstructionCostsSectionFom @classmethod @@ -166,16 +170,16 @@ def from_config(cls, ini_dict: ConfigParser) -> KoswatIniFomProtocol: _ini_fom.construction_cost_cb_wall = ConstructionCostsSectionFom.from_config( ini_dict["KostenCBwand"] ) - _ini_fom.construction_cost_damwall_unanchored = ( + _ini_fom.construction_cost_sheetpile_unanchored = ( ConstructionCostsSectionFom.from_config( ini_dict["KostenDamwandOnverankerd"] ) ) - _ini_fom.construction_cost_damwall_anchored = ( + _ini_fom.construction_cost_sheetpile_anchored = ( ConstructionCostsSectionFom.from_config(ini_dict["KostenDamwandVerankerd"]) ) - _ini_fom.construction_cost_deep_wall = ConstructionCostsSectionFom.from_config( - ini_dict["KostenDiepwand"] + _ini_fom.construction_cost_diaphragm_wall = ( + ConstructionCostsSectionFom.from_config(ini_dict["KostenDiepwand"]) ) _ini_fom.construction_cost_cofferdam = ConstructionCostsSectionFom.from_config( ini_dict["KostenKistdam"] diff --git a/koswat/configuration/io/ini/koswat_general_ini_fom.py b/koswat/configuration/io/ini/koswat_general_ini_fom.py index b425772b..59e1127c 100644 --- a/koswat/configuration/io/ini/koswat_general_ini_fom.py +++ b/koswat/configuration/io/ini/koswat_general_ini_fom.py @@ -65,18 +65,18 @@ def _set_properties_from_dict(self, properties_dict: dict) -> None: class SoilReinforcementSectionFom(ReinforcementProfileSectionFomBase): - min_bermhoogte: float - max_bermhoogte_factor: float - factor_toename_bermhoogte: float + min_berm_height: float + max_berm_height_factor: float + factor_increase_berm_height: float land_purchase_surtax_factor: SurtaxFactorEnum @classmethod def from_config(cls, ini_config: ConfigParser) -> KoswatIniFomProtocol: _section = cls() _section._set_properties_from_dict(ini_config) - _section.min_bermhoogte = ini_config.getfloat("min_bermhoogte") - _section.max_bermhoogte_factor = ini_config.getfloat("max_bermhoogte_factor") - _section.factor_toename_bermhoogte = ini_config.getfloat( + _section.min_berm_height = ini_config.getfloat("min_bermhoogte") + _section.max_berm_height_factor = ini_config.getfloat("max_bermhoogte_factor") + _section.factor_increase_berm_height = ini_config.getfloat( "factor_toename_bermhoogte" ) _section.land_purchase_surtax_factor = SurtaxFactorEnum[ @@ -88,7 +88,7 @@ def from_config(cls, ini_config: ConfigParser) -> KoswatIniFomProtocol: class VPSReinforcementSectionFom(ReinforcementProfileSectionFomBase): - binnen_berm_breedte_vps: float + polderside_berm_width_vps: float constructive_surtax_factor: float land_purchase_surtax_factor: SurtaxFactorEnum @@ -96,7 +96,7 @@ class VPSReinforcementSectionFom(ReinforcementProfileSectionFomBase): def from_config(cls, ini_config: ConfigParser) -> KoswatIniFomProtocol: _section = cls() _section._set_properties_from_dict(ini_config) - _section.binnen_berm_breedte_vps = ini_config.getfloat( + _section.polderside_berm_width_vps = ini_config.getfloat( "binnen_berm_breedte_vps" ) _section.constructive_surtax_factor = SurtaxFactorEnum[ @@ -113,9 +113,9 @@ def from_config(cls, ini_config: ConfigParser) -> KoswatIniFomProtocol: class PipingwallReinforcementSectionFom(ReinforcementProfileSectionFomBase): - min_lengte_kwelscherm: float - overgang_cbwand_damwand: float - max_lengte_kwelscherm: float + min_length_piping_wall: float + transition_cbwall_sheetpile: float + max_length_piping_wall: float constructive_surtax_factor: SurtaxFactorEnum land_purchase_surtax_factor: SurtaxFactorEnum @@ -123,11 +123,11 @@ class PipingwallReinforcementSectionFom(ReinforcementProfileSectionFomBase): def from_config(cls, ini_config: ConfigParser) -> KoswatIniFomProtocol: _section = cls() _section._set_properties_from_dict(ini_config) - _section.min_lengte_kwelscherm = ini_config.getfloat("min_lengte_kwelscherm") - _section.overgang_cbwand_damwand = ini_config.getfloat( + _section.min_length_piping_wall = ini_config.getfloat("min_lengte_kwelscherm") + _section.transition_cbwall_sheetpile = ini_config.getfloat( "overgang_cbwand_damwand" ) - _section.max_lengte_kwelscherm = ini_config.getfloat("max_lengte_kwelscherm") + _section.max_length_piping_wall = ini_config.getfloat("max_lengte_kwelscherm") _section.constructive_surtax_factor = SurtaxFactorEnum[ ini_config.get( "opslagfactor_constructief", SurtaxFactorEnum.NORMAAL.name @@ -142,10 +142,10 @@ def from_config(cls, ini_config: ConfigParser) -> KoswatIniFomProtocol: class StabilitywallReinforcementSectionFom(ReinforcementProfileSectionFomBase): - versteiling_binnentalud: float - min_lengte_stabiliteitswand: float - overgang_damwand_diepwand: float - max_lengte_stabiliteitswand: float + steepening_polderside_slope: float + min_length_stability_wall: float + transition_sheetpile_diaphragm_wall: float + max_length_stability_wall: float constructive_surtax_factor: SurtaxFactorEnum land_purchase_surtax_factor: SurtaxFactorEnum @@ -153,16 +153,16 @@ class StabilitywallReinforcementSectionFom(ReinforcementProfileSectionFomBase): def from_config(cls, ini_config: ConfigParser) -> KoswatIniFomProtocol: _section = cls() _section._set_properties_from_dict(ini_config) - _section.versteiling_binnentalud = ini_config.getfloat( + _section.steepening_polderside_slope = ini_config.getfloat( "versteiling_binnentalud" ) - _section.min_lengte_stabiliteitswand = ini_config.getfloat( + _section.min_length_stability_wall = ini_config.getfloat( "min_lengte_stabiliteitswand" ) - _section.overgang_damwand_diepwand = ini_config.getfloat( + _section.transition_sheetpile_diaphragm_wall = ini_config.getfloat( "overgang_damwand_diepwand" ) - _section.max_lengte_stabiliteitswand = ini_config.getfloat( + _section.max_length_stability_wall = ini_config.getfloat( "max_lengte_stabiliteitswand" ) _section.constructive_surtax_factor = SurtaxFactorEnum[ @@ -179,16 +179,16 @@ def from_config(cls, ini_config: ConfigParser) -> KoswatIniFomProtocol: class CofferdamReinforcementSectionFom(ReinforcementProfileSectionFomBase): - min_lengte_kistdam: float - max_lengte_kistdam: float + min_length_cofferdam: float + max_length_cofferdam: float constructive_surtax_factor: SurtaxFactorEnum @classmethod def from_config(cls, ini_config: ConfigParser) -> KoswatIniFomProtocol: _section = cls() _section._set_properties_from_dict(ini_config) - _section.min_lengte_kistdam = ini_config.getfloat("min_lengte_kistdam") - _section.max_lengte_kistdam = ini_config.getfloat("max_lengte_kistdam") + _section.min_length_cofferdam = ini_config.getfloat("min_lengte_kistdam") + _section.max_length_cofferdam = ini_config.getfloat("max_lengte_kistdam") _section.constructive_surtax_factor = SurtaxFactorEnum[ ini_config.get( "opslagfactor_constructief", SurtaxFactorEnum.NORMAAL.name @@ -200,64 +200,66 @@ def from_config(cls, ini_config: ConfigParser) -> KoswatIniFomProtocol: @dataclass class SurroundingsSectionFom(KoswatIniFomProtocol): surroundings_database_dir: Path - constructieafstand: float - constructieovergang: float - buitendijks: bool - bebouwing: bool - spoorwegen: bool - water: bool + construction_distance: float + construction_buffer: float + waterside: bool + buildings: bool + railways: bool + waters: bool @classmethod def from_config(cls, ini_config: ConfigParser) -> KoswatIniFomProtocol: _section = cls( surroundings_database_dir=Path(ini_config["omgevingsdatabases"]), - constructieafstand=ini_config.getfloat("constructieafstand"), - constructieovergang=ini_config.getfloat("constructieovergang"), - buitendijks=ini_config.getboolean("buitendijks"), - bebouwing=ini_config.getboolean("bebouwing"), - spoorwegen=ini_config.getboolean("spoorwegen"), - water=ini_config.getboolean("water"), + construction_distance=ini_config.getfloat("constructieafstand"), + construction_buffer=ini_config.getfloat("constructieovergang"), + waterside=ini_config.getboolean("buitendijks"), + buildings=ini_config.getboolean("bebouwing"), + railways=ini_config.getboolean("spoorwegen"), + waters=ini_config.getboolean("water"), ) return _section @dataclass class InfrastructureSectionFom(KoswatIniFomProtocol): - infrastructuur: bool - opslagfactor_wegen: SurtaxFactorEnum - infrakosten_0dh: InfraCostsEnum - buffer_buitendijks: float - wegen_klasse2_breedte: float - wegen_klasse24_breedte: float - wegen_klasse47_breedte: float - wegen_klasse7_breedte: float - wegen_onbekend_breedte: float + infrastructure: bool + surtax_factor_roads: SurtaxFactorEnum + infrastructure_costs_0dh: InfraCostsEnum + buffer_waterside: float + roads_class2_width: float + roads_class24_width: float + roads_class47_width: float + roads_class7_width: float + roads_unknown_width: float @classmethod def from_config(cls, ini_config: ConfigParser) -> KoswatIniFomProtocol: return cls( - infrastructuur=ini_config.getboolean("infrastructuur"), - opslagfactor_wegen=SurtaxFactorEnum[ + infrastructure=ini_config.getboolean("infrastructuur"), + surtax_factor_roads=SurtaxFactorEnum[ ini_config["opslagfactor_wegen"].upper() ], - infrakosten_0dh=InfraCostsEnum[ini_config["infrakosten_0dh"].upper()], - buffer_buitendijks=ini_config.getfloat("buffer_buitendijks"), - wegen_klasse2_breedte=ini_config.getfloat("wegen_klasse2_breedte"), - wegen_klasse24_breedte=ini_config.getfloat("wegen_klasse24_breedte"), - wegen_klasse47_breedte=ini_config.getfloat("wegen_klasse47_breedte"), - wegen_klasse7_breedte=ini_config.getfloat("wegen_klasse7_breedte"), - wegen_onbekend_breedte=ini_config.getfloat("wegen_onbekend_breedte"), + infrastructure_costs_0dh=InfraCostsEnum[ + ini_config["infrakosten_0dh"].upper() + ], + buffer_waterside=ini_config.getfloat("buffer_buitendijks"), + roads_class2_width=ini_config.getfloat("wegen_klasse2_breedte"), + roads_class24_width=ini_config.getfloat("wegen_klasse24_breedte"), + roads_class47_width=ini_config.getfloat("wegen_klasse47_breedte"), + roads_class7_width=ini_config.getfloat("wegen_klasse7_breedte"), + roads_unknown_width=ini_config.getfloat("wegen_onbekend_breedte"), ) class KoswatGeneralIniFom(KoswatIniFomProtocol): - analyse_section_fom: AnalysisSectionFom - dike_profile_section_fom: DikeProfileSectionFom - grondmaatregel_section: SoilReinforcementSectionFom + analysis_section: AnalysisSectionFom + dike_profile_section: DikeProfileSectionFom + soil_measure_section: SoilReinforcementSectionFom vps_section: VPSReinforcementSectionFom - kwelscherm_section: PipingwallReinforcementSectionFom - stabiliteitswand_section: StabilitywallReinforcementSectionFom - kistdam_section: CofferdamReinforcementSectionFom + piping_wall_section: PipingwallReinforcementSectionFom + stability_wall_section: StabilitywallReinforcementSectionFom + cofferdam_section: CofferdamReinforcementSectionFom surroundings_section: SurroundingsSectionFom infrastructuur_section: InfrastructureSectionFom @@ -265,27 +267,27 @@ class KoswatGeneralIniFom(KoswatIniFomProtocol): def from_config(cls, ini_config: ConfigParser) -> KoswatIniFomProtocol: _general_ini = cls() - _general_ini.analyse_section_fom = AnalysisSectionFom.from_config( + _general_ini.analysis_section = AnalysisSectionFom.from_config( ini_config["Analyse"] ) - _general_ini.dike_profile_section_fom = DikeProfileSectionFom.from_config( + _general_ini.dike_profile_section = DikeProfileSectionFom.from_config( ini_config["Dijkprofiel"] ) - _general_ini.grondmaatregel_section = SoilReinforcementSectionFom.from_config( + _general_ini.soil_measure_section = SoilReinforcementSectionFom.from_config( ini_config["Grondmaatregel"] ) _general_ini.vps_section = VPSReinforcementSectionFom.from_config( ini_config["VerticalePipingOplossing"] ) - _general_ini.kwelscherm_section = PipingwallReinforcementSectionFom.from_config( - ini_config["Kwelscherm"] + _general_ini.piping_wall_section = ( + PipingwallReinforcementSectionFom.from_config(ini_config["Kwelscherm"]) ) - _general_ini.stabiliteitswand_section = ( + _general_ini.stability_wall_section = ( StabilitywallReinforcementSectionFom.from_config( ini_config["Stabiliteitswand"] ) ) - _general_ini.kistdam_section = CofferdamReinforcementSectionFom.from_config( + _general_ini.cofferdam_section = CofferdamReinforcementSectionFom.from_config( ini_config["Kistdam"] ) _general_ini.surroundings_section = SurroundingsSectionFom.from_config( diff --git a/koswat/configuration/io/ini/koswat_section_scenarios_ini_fom.py b/koswat/configuration/io/ini/koswat_section_scenarios_ini_fom.py index 9000549b..5cc2a53b 100644 --- a/koswat/configuration/io/ini/koswat_section_scenarios_ini_fom.py +++ b/koswat/configuration/io/ini/koswat_section_scenarios_ini_fom.py @@ -12,8 +12,8 @@ class SectionScenarioFom(KoswatIniFomProtocol): d_s: float d_p: float # If the following ones are not provided we should use the ones from the original profile - buiten_talud: Optional[float] - kruin_breedte: Optional[float] + waterside_slope: Optional[float] + crest_width: Optional[float] @classmethod def from_config(cls, ini_config: ConfigParser) -> SectionScenarioFom: @@ -23,8 +23,8 @@ def from_config(cls, ini_config: ConfigParser) -> SectionScenarioFom: _section.d_h = ini_config.getfloat("dH") _section.d_s = ini_config.getfloat("dS") _section.d_p = ini_config.getfloat("dP") - _section.buiten_talud = ini_config.getfloat("Buitentalud") - _section.kruin_breedte = ini_config.getfloat("kruinbreedte") + _section.waterside_slope = ini_config.getfloat("Buitentalud") + _section.crest_width = ini_config.getfloat("kruinbreedte") return _section diff --git a/koswat/configuration/io/koswat_costs_importer.py b/koswat/configuration/io/koswat_costs_importer.py index cea1e188..987abcd3 100644 --- a/koswat/configuration/io/koswat_costs_importer.py +++ b/koswat/configuration/io/koswat_costs_importer.py @@ -42,7 +42,7 @@ def import_from(self, from_path: Path) -> KoswatCostsSettings: _costs_fom = self._get_costs_fom(from_path) _costs_settings = KoswatCostsSettings() - _costs_settings.price_year = int(_costs_fom.unit_prices_section.prijspeil) + _costs_settings.price_year = int(_costs_fom.unit_prices_section.price_level) _costs_settings.dike_profile_costs = self._get_dike_profile_costs_settings( _costs_fom ) @@ -60,34 +60,34 @@ def _get_dike_profile_costs_settings( ) -> DikeProfileCostsSettings: _settings = DikeProfileCostsSettings() _settings.added_layer_grass_m3 = ( - fom_costs.dike_profile_costs_section.aanleg_graslaag_m3 + fom_costs.dike_profile_costs_section.construction_grass_layer_m3 ) _settings.added_layer_clay_m3 = ( - fom_costs.dike_profile_costs_section.aanleg_kleilaag_m3 + fom_costs.dike_profile_costs_section.construction_clay_layer_m3 ) _settings.added_layer_sand_m3 = ( - fom_costs.dike_profile_costs_section.aanleg_kern_m3 + fom_costs.dike_profile_costs_section.construction_core_m3 ) _settings.reused_layer_grass_m3 = ( - fom_costs.dike_profile_costs_section.hergebruik_graslaag_m3 + fom_costs.dike_profile_costs_section.reuse_grass_layer_m3 ) _settings.reused_layer_core_m3 = ( - fom_costs.dike_profile_costs_section.hergebruik_kern_m3 + fom_costs.dike_profile_costs_section.reuse_core_m3 ) _settings.disposed_material_m3 = ( - fom_costs.dike_profile_costs_section.afvoeren_materiaal_m3 + fom_costs.dike_profile_costs_section.dispose_material_m3 ) _settings.profiling_layer_grass_m2 = ( - fom_costs.dike_profile_costs_section.profileren_graslaag_m2 + fom_costs.dike_profile_costs_section.profile_grass_layer_m2 ) _settings.profiling_layer_clay_m2 = ( - fom_costs.dike_profile_costs_section.profileren_kleilaag_m2 + fom_costs.dike_profile_costs_section.profile_clay_layer_m2 ) _settings.profiling_layer_sand_m2 = ( - fom_costs.dike_profile_costs_section.profileren_kern_m2 + fom_costs.dike_profile_costs_section.profile_core_m2 ) - _settings.bewerken_maaiveld_m2 = ( - fom_costs.dike_profile_costs_section.bewerken_maaiveld_m2 + _settings.processing_ground_level_surface_m2 = ( + fom_costs.dike_profile_costs_section.process_ground_level_surface_m2 ) return _settings @@ -96,34 +96,34 @@ def _get_infrastructure_costs_settings( ) -> InfrastructureCostsSettings: _settings = InfrastructureCostsSettings() _settings.removing_roads_klasse2 = ( - fom_costs.infrastructure_costs_section.wegen_klasse2_verwijderen + fom_costs.infrastructure_costs_section.roads_class2_removal ) _settings.removing_roads_klasse24 = ( - fom_costs.infrastructure_costs_section.wegen_klasse24_verwijderen + fom_costs.infrastructure_costs_section.roads_class24_removal ) _settings.removing_roads_klasse47 = ( - fom_costs.infrastructure_costs_section.wegen_klasse47_verwijderen + fom_costs.infrastructure_costs_section.roads_class47_removal ) _settings.removing_roads_klasse7 = ( - fom_costs.infrastructure_costs_section.wegen_klasse7_verwijderen + fom_costs.infrastructure_costs_section.roads_class7_removal ) _settings.removing_roads_unknown = ( - fom_costs.infrastructure_costs_section.wegen_onbekend_verwijderen + fom_costs.infrastructure_costs_section.roads_unknown_removal ) _settings.adding_roads_klasse2 = ( - fom_costs.infrastructure_costs_section.wegen_klasse2_aanleg + fom_costs.infrastructure_costs_section.roads_class2_construction ) _settings.adding_roads_klasse24 = ( - fom_costs.infrastructure_costs_section.wegen_klasse24_aanleg + fom_costs.infrastructure_costs_section.roads_class24_construction ) _settings.adding_roads_klasse47 = ( - fom_costs.infrastructure_costs_section.wegen_klasse47_aanleg + fom_costs.infrastructure_costs_section.roads_class47_construction ) _settings.adding_roads_klasse7 = ( - fom_costs.infrastructure_costs_section.wegen_klasse7_aanleg + fom_costs.infrastructure_costs_section.roads_class7_construction ) _settings.adding_roads_unknown = ( - fom_costs.infrastructure_costs_section.wegen_onbekend_aanleg + fom_costs.infrastructure_costs_section.roads_unknown_construction ) return _settings @@ -134,18 +134,18 @@ def _get_surtax_costs(self, fom_costs: KoswatCostsIniFom) -> SurtaxCostsSettings if self.include_taxes else fom_costs.surtax_costs_excl_tax_section ) - _settings.soil_easy = _fom_settings.grond_makkelijk - _settings.soil_normal = _fom_settings.grond_normaal - _settings.soil_hard = _fom_settings.grond_moeilijk - _settings.construction_easy = _fom_settings.constructief_makkelijk - _settings.construction_normal = _fom_settings.constructief_normaal - _settings.construction_hard = _fom_settings.constructief_moeilijk - _settings.roads_easy = _fom_settings.wegen_makkelijk - _settings.roads_normal = _fom_settings.wegen_normaal - _settings.roads_hard = _fom_settings.wegen_moeilijk - _settings.land_purchase_easy = _fom_settings.grond_makkelijk - _settings.land_purchase_normal = _fom_settings.grondaankoop_normaal - _settings.land_purchase_hard = _fom_settings.grondaankoop_moeilijk + _settings.soil_easy = _fom_settings.soil_easy + _settings.soil_normal = _fom_settings.soil_normal + _settings.soil_hard = _fom_settings.soil_hard + _settings.construction_easy = _fom_settings.constructive_easy + _settings.construction_normal = _fom_settings.constructive_normal + _settings.construction_hard = _fom_settings.constructive_hard + _settings.roads_easy = _fom_settings.road_easy + _settings.roads_normal = _fom_settings.roads_normal + _settings.roads_hard = _fom_settings.roads_hard + _settings.land_purchase_easy = _fom_settings.soil_easy + _settings.land_purchase_normal = _fom_settings.land_purchase_normal + _settings.land_purchase_hard = _fom_settings.land_purchase_hard return _settings def _get_construction_costs( @@ -163,22 +163,22 @@ def _construction_fom_to_construction_factor( return _construction_factors _settings = ConstructionCostsSettings() - _settings.cb_damwand = _construction_fom_to_construction_factor( + _settings.cb_sheetpile = _construction_fom_to_construction_factor( fom_costs.construction_cost_cb_wall ) _settings.vzg = _construction_fom_to_construction_factor( fom_costs.construction_cost_vzg ) - _settings.damwand_onverankerd = _construction_fom_to_construction_factor( - fom_costs.construction_cost_damwall_unanchored + _settings.sheetpile_unanchored = _construction_fom_to_construction_factor( + fom_costs.construction_cost_sheetpile_unanchored ) - _settings.damwand_verankerd = _construction_fom_to_construction_factor( - fom_costs.construction_cost_damwall_anchored + _settings.sheetpile_anchored = _construction_fom_to_construction_factor( + fom_costs.construction_cost_sheetpile_anchored ) - _settings.diepwand = _construction_fom_to_construction_factor( - fom_costs.construction_cost_deep_wall + _settings.diaphragm_wall = _construction_fom_to_construction_factor( + fom_costs.construction_cost_diaphragm_wall ) - _settings.kistdam = _construction_fom_to_construction_factor( + _settings.cofferdam = _construction_fom_to_construction_factor( fom_costs.construction_cost_cofferdam ) diff --git a/koswat/configuration/io/koswat_input_profile_list_importer.py b/koswat/configuration/io/koswat_input_profile_list_importer.py index 0e2f7236..09259d85 100644 --- a/koswat/configuration/io/koswat_input_profile_list_importer.py +++ b/koswat/configuration/io/koswat_input_profile_list_importer.py @@ -12,20 +12,20 @@ class KoswatInputProfileListImporter(KoswatImporterProtocol): def _get_koswat_input_profile_base(self, fom_dict: dict) -> KoswatInputProfileBase: _input_profile = KoswatInputProfileBase() _input_profile.dike_section = fom_dict["dijksectie"] - _input_profile.buiten_maaiveld = float(fom_dict["buiten_maaiveld"]) - _input_profile.buiten_talud = float(fom_dict["buiten_talud"]) - _input_profile.buiten_berm_hoogte = float(fom_dict["buiten_berm_hoogte"]) - _input_profile.buiten_berm_breedte = float(fom_dict["buiten_berm_lengte"]) - _input_profile.kruin_hoogte = float(fom_dict["kruin_hoogte"]) - _input_profile.kruin_breedte = float(fom_dict["kruin_breedte"]) - _input_profile.binnen_talud = float(fom_dict["binnen_talud"]) - _input_profile.binnen_berm_hoogte = float(fom_dict["binnen_berm_hoogte"]) - _input_profile.binnen_berm_breedte = float(fom_dict["binnen_berm_lengte"]) - _input_profile.binnen_maaiveld = float(fom_dict["binnen_maaiveld"]) - _input_profile.grondprijs_bebouwd = float(fom_dict["grondprijs_bebouwd"]) - _input_profile.grondprijs_onbebouwd = float(fom_dict["grondprijs_onbebouwd"]) - _input_profile.factor_zetting = float(fom_dict["factorzetting"]) - _input_profile.pleistoceen = float(fom_dict["pleistoceen"]) + _input_profile.waterside_ground_level = float(fom_dict["buiten_maaiveld"]) + _input_profile.waterside_slope = float(fom_dict["buiten_talud"]) + _input_profile.waterside_berm_height = float(fom_dict["buiten_berm_hoogte"]) + _input_profile.waterside_berm_width = float(fom_dict["buiten_berm_lengte"]) + _input_profile.crest_height = float(fom_dict["kruin_hoogte"]) + _input_profile.crest_width = float(fom_dict["kruin_breedte"]) + _input_profile.polderside_slope = float(fom_dict["binnen_talud"]) + _input_profile.polderside_berm_height = float(fom_dict["binnen_berm_hoogte"]) + _input_profile.polderside_berm_width = float(fom_dict["binnen_berm_lengte"]) + _input_profile.polderside_ground_level = float(fom_dict["binnen_maaiveld"]) + _input_profile.ground_price_builtup = float(fom_dict["grondprijs_bebouwd"]) + _input_profile.ground_price_unbuilt = float(fom_dict["grondprijs_onbebouwd"]) + _input_profile.factor_settlement = float(fom_dict["factorzetting"]) + _input_profile.pleistocene = float(fom_dict["pleistoceen"]) _input_profile.aquifer = float(fom_dict["aquifer"]) return _input_profile diff --git a/koswat/configuration/io/koswat_run_settings_importer.py b/koswat/configuration/io/koswat_run_settings_importer.py index 352e6fe6..1dc80e86 100644 --- a/koswat/configuration/io/koswat_run_settings_importer.py +++ b/koswat/configuration/io/koswat_run_settings_importer.py @@ -66,29 +66,27 @@ def import_from(self, from_path: Path) -> KoswatRunSettings: # First get the FOM logging.info("Importing INI configuration from {}".format(from_path)) _general_settings = self._import_general_settings(from_path) - _output_dir = _general_settings.analyse_section_fom.analysis_output_dir + _output_dir = _general_settings.analysis_section.analysis_output_dir _dike_selected_sections = self._import_selected_dike_section_names( - _general_settings.analyse_section_fom.dike_selection_txt_file + _general_settings.analysis_section.dike_selection_txt_file ) _input_profile_cases = self._import_dike_input_profiles_list( - csv_file=_general_settings.analyse_section_fom.input_profiles_csv_file, + csv_file=_general_settings.analysis_section.input_profiles_csv_file, dike_selection=_dike_selected_sections, - layers_info=self._get_layers_info( - _general_settings.dike_profile_section_fom - ), + layers_info=self._get_layers_info(_general_settings.dike_profile_section), ) _dike_costs = self._import_dike_costs( - ini_file=_general_settings.analyse_section_fom.costs_ini_file, - include_taxes=_general_settings.analyse_section_fom.include_taxes, + ini_file=_general_settings.analysis_section.costs_ini_file, + include_taxes=_general_settings.analysis_section.include_taxes, ) _scenario_fom_list = self._import_scenario_fom_list( - _general_settings.analyse_section_fom.scenarios_ini_file, + _general_settings.analysis_section.scenarios_ini_file, _dike_selected_sections, ) _surroundings_fom = self._import_surroundings_wrapper( _general_settings.surroundings_section, _general_settings.infrastructuur_section, - _general_settings.analyse_section_fom.dike_section_location_shp_file, + _general_settings.analysis_section.dike_section_location_shp_file, [_s.scenario_dike_section for _s in _scenario_fom_list], ) _reinforcement_settings = self._get_reinforcement_settings(_general_settings) @@ -184,17 +182,17 @@ def _get_reinforcement_settings( ) -> KoswatReinforcementSettings: _reinforcement_settings = KoswatReinforcementSettings( soil_settings=KoswatSoilSettings( - **(general_settings.grondmaatregel_section.__dict__) + **(general_settings.soil_measure_section.__dict__) ), vps_settings=KoswatVPSSettings(**(general_settings.vps_section.__dict__)), piping_wall_settings=KoswatPipingWallSettings( - **(general_settings.kwelscherm_section.__dict__) + **(general_settings.piping_wall_section.__dict__) ), stability_wall_settings=KoswatStabilityWallSettings( - **(general_settings.stabiliteitswand_section.__dict__) + **(general_settings.stability_wall_section.__dict__) ), cofferdam_settings=KoswatCofferdamSettings( - **(general_settings.kistdam_section.__dict__) + **(general_settings.cofferdam_section.__dict__) ), ) return _reinforcement_settings @@ -303,6 +301,6 @@ def get_valid_value(prop_name: str) -> float: return getattr(base_profile.input_data, prop_name) return _value - _scenario.kruin_breedte = get_valid_value("kruin_breedte") - _scenario.buiten_talud = get_valid_value("buiten_talud") + _scenario.crest_width = get_valid_value("crest_width") + _scenario.waterside_slope = get_valid_value("waterside_slope") return _scenario diff --git a/koswat/configuration/io/surroundings_wrapper_collection_importer.py b/koswat/configuration/io/surroundings_wrapper_collection_importer.py index 3f6286b8..0d1e240a 100644 --- a/koswat/configuration/io/surroundings_wrapper_collection_importer.py +++ b/koswat/configuration/io/surroundings_wrapper_collection_importer.py @@ -86,21 +86,21 @@ def _map_surrounding_type(self, surrounding_type: str) -> str: _normalized = surrounding_type.lower().strip() _translations = dict( bebouwing_binnendijks="buildings_polderside", - bebouwing_buitendijks="buildings_dikeside", + bebouwing_buitendijks="buildings_waterside", spoor_binnendijks="railways_polderside", - spoor_buitendijks="railways_dikeside", + spoor_buitendijks="railways_waterside", water_binnendijks="waters_polderside", - water_buitendijks="waters_dikeside", + water_buitendijks="waters_waterside", wegen_binnendijks_klasse2="roads_class_2_polderside", wegen_binnendijks_klasse7="roads_class_7_polderside", wegen_binnendijks_klasse24="roads_class_24_polderside", wegen_binnendijks_klasse47="roads_class_47_polderside", wegen_binnendijks_klasseonbekend="roads_class_unknown_polderside", - wegen_buitendijks_klasse2="roads_class_2_dikeside", - wegen_buitendijks_klasse7="roads_class_7_dikeside", - wegen_buitendijks_klasse24="roads_class_24_dikeside", - wegen_buitendijks_klasse47="roads_class_47_dikeside", - wegen_buitendijks_klasseonbekend="roads_class_unknown_dikeside", + wegen_buitendijks_klasse2="roads_class_2_waterside", + wegen_buitendijks_klasse7="roads_class_7_waterside", + wegen_buitendijks_klasse24="roads_class_24_waterside", + wegen_buitendijks_klasse47="roads_class_47_waterside", + wegen_buitendijks_klasseonbekend="roads_class_unknown_waterside", ) _translation = _translations.get(_normalized, None) if not _translation: diff --git a/koswat/configuration/settings/costs/construction_costs_settings.py b/koswat/configuration/settings/costs/construction_costs_settings.py index d4340526..0f31a45d 100644 --- a/koswat/configuration/settings/costs/construction_costs_settings.py +++ b/koswat/configuration/settings/costs/construction_costs_settings.py @@ -27,11 +27,11 @@ def is_valid(self) -> bool: @dataclass class ConstructionCostsSettings(KoswatConfigProtocol): vzg: ConstructionFactors | None = None - cb_damwand: ConstructionFactors | None = None - damwand_onverankerd: ConstructionFactors | None = None - damwand_verankerd: ConstructionFactors | None = None - diepwand: ConstructionFactors | None = None - kistdam: ConstructionFactors | None = None + cb_sheetpile: ConstructionFactors | None = None + sheetpile_unanchored: ConstructionFactors | None = None + sheetpile_anchored: ConstructionFactors | None = None + diaphragm_wall: ConstructionFactors | None = None + cofferdam: ConstructionFactors | None = None def get_construction_factors( self, construction_type: ConstructionTypeEnum | None @@ -41,23 +41,23 @@ def get_construction_factors( if construction_type == ConstructionTypeEnum.VZG: return self.vzg if construction_type == ConstructionTypeEnum.CB_DAMWAND: - return self.cb_damwand + return self.cb_sheetpile if construction_type == ConstructionTypeEnum.DAMWAND_ONVERANKERD: - return self.damwand_onverankerd + return self.sheetpile_unanchored if construction_type == ConstructionTypeEnum.DAMWAND_VERANKERD: - return self.damwand_verankerd + return self.sheetpile_anchored if construction_type == ConstructionTypeEnum.DIEPWAND: - return self.diepwand + return self.diaphragm_wall if construction_type == ConstructionTypeEnum.KISTDAM: - return self.kistdam + return self.cofferdam logging.warning("Unsupported construction type {}".format(construction_type)) def is_valid(self): return ( self.vzg.is_valid() - and self.cb_damwand.is_valid() - and self.damwand_onverankerd.is_valid() - and self.damwand_verankerd.is_valid() - and self.diepwand.is_valid() - and self.kistdam.is_valid() + and self.cb_sheetpile.is_valid() + and self.sheetpile_unanchored.is_valid() + and self.sheetpile_anchored.is_valid() + and self.diaphragm_wall.is_valid() + and self.cofferdam.is_valid() ) diff --git a/koswat/configuration/settings/costs/dike_profile_costs_settings.py b/koswat/configuration/settings/costs/dike_profile_costs_settings.py index 7d3a8894..262aed7f 100644 --- a/koswat/configuration/settings/costs/dike_profile_costs_settings.py +++ b/koswat/configuration/settings/costs/dike_profile_costs_settings.py @@ -19,7 +19,7 @@ class DikeProfileCostsSettings(KoswatConfigProtocol): profiling_layer_grass_m2: float = math.nan profiling_layer_clay_m2: float = math.nan profiling_layer_sand_m2: float = math.nan - bewerken_maaiveld_m2: float = math.nan + processing_ground_level_surface_m2: float = math.nan def is_valid(self) -> bool: return all(_valid_float_prop(_prop) for _prop in self.__dict__.values()) diff --git a/koswat/configuration/settings/koswat_scenario.py b/koswat/configuration/settings/koswat_scenario.py index 2903c3fc..a9e9b7e9 100644 --- a/koswat/configuration/settings/koswat_scenario.py +++ b/koswat/configuration/settings/koswat_scenario.py @@ -13,8 +13,8 @@ class KoswatScenario(KoswatConfigProtocol): d_h: float = math.nan d_s: float = math.nan d_p: float = math.nan - kruin_breedte: float = math.nan - buiten_talud: float = math.nan + crest_width: float = math.nan + waterside_slope: float = math.nan def is_valid(self) -> bool: return ( diff --git a/koswat/configuration/settings/reinforcements/koswat_cofferdam_settings.py b/koswat/configuration/settings/reinforcements/koswat_cofferdam_settings.py index 88a35e76..bb03e989 100644 --- a/koswat/configuration/settings/reinforcements/koswat_cofferdam_settings.py +++ b/koswat/configuration/settings/reinforcements/koswat_cofferdam_settings.py @@ -12,8 +12,8 @@ class KoswatCofferdamSettings(KoswatConfigProtocol): soil_surtax_factor: SurtaxFactorEnum = SurtaxFactorEnum.NORMAAL constructive_surtax_factor: SurtaxFactorEnum = SurtaxFactorEnum.NORMAAL - min_lengte_kistdam: float = 0 - max_lengte_kistdam: float = 99 + min_length_cofferdam: float = 0 + max_length_cofferdam: float = 99 def is_valid(self) -> bool: return True diff --git a/koswat/configuration/settings/reinforcements/koswat_piping_wall_settings.py b/koswat/configuration/settings/reinforcements/koswat_piping_wall_settings.py index ca48aa28..5871b1be 100644 --- a/koswat/configuration/settings/reinforcements/koswat_piping_wall_settings.py +++ b/koswat/configuration/settings/reinforcements/koswat_piping_wall_settings.py @@ -13,9 +13,9 @@ class KoswatPipingWallSettings(KoswatConfigProtocol): soil_surtax_factor: SurtaxFactorEnum = SurtaxFactorEnum.NORMAAL constructive_surtax_factor: SurtaxFactorEnum = SurtaxFactorEnum.NORMAAL land_purchase_surtax_factor: SurtaxFactorEnum = SurtaxFactorEnum.NORMAAL - min_lengte_kwelscherm: float = 0 - overgang_cbwand_damwand: float = 99 - max_lengte_kwelscherm: float = 99 + min_length_piping_wall: float = 0 + transition_cbwall_sheetpile: float = 99 + max_length_piping_wall: float = 99 def is_valid(self) -> bool: return True diff --git a/koswat/configuration/settings/reinforcements/koswat_soil_settings.py b/koswat/configuration/settings/reinforcements/koswat_soil_settings.py index 22fbb0c9..7be00a2b 100644 --- a/koswat/configuration/settings/reinforcements/koswat_soil_settings.py +++ b/koswat/configuration/settings/reinforcements/koswat_soil_settings.py @@ -12,9 +12,9 @@ class KoswatSoilSettings(KoswatConfigProtocol): soil_surtax_factor: SurtaxFactorEnum = SurtaxFactorEnum.NORMAAL land_purchase_surtax_factor: SurtaxFactorEnum = SurtaxFactorEnum.NORMAAL - min_bermhoogte: float = 0 - max_bermhoogte_factor: float = 0 - factor_toename_bermhoogte: float = 0 + min_berm_height: float = 0 + max_berm_height_factor: float = 0 + factor_increase_berm_height: float = 0 def is_valid(self) -> bool: return True diff --git a/koswat/configuration/settings/reinforcements/koswat_stability_wall_settings.py b/koswat/configuration/settings/reinforcements/koswat_stability_wall_settings.py index c91c3c5d..1c1e0fd8 100644 --- a/koswat/configuration/settings/reinforcements/koswat_stability_wall_settings.py +++ b/koswat/configuration/settings/reinforcements/koswat_stability_wall_settings.py @@ -13,10 +13,10 @@ class KoswatStabilityWallSettings(KoswatConfigProtocol): soil_surtax_factor: SurtaxFactorEnum = SurtaxFactorEnum.NORMAAL constructive_surtax_factor: SurtaxFactorEnum = SurtaxFactorEnum.NORMAAL land_purchase_surtax_factor: SurtaxFactorEnum = SurtaxFactorEnum.NORMAAL - versteiling_binnentalud: float = 0 - min_lengte_stabiliteitswand: float = 0 - overgang_damwand_diepwand: float = 99 - max_lengte_stabiliteitswand: float = 99 + steepening_polderside_slope: float = 0 + min_length_stability_wall: float = 0 + transition_sheetpile_diaphragm_wall: float = 99 + max_length_stability_wall: float = 99 def is_valid(self) -> bool: return True diff --git a/koswat/configuration/settings/reinforcements/koswat_vps_settings.py b/koswat/configuration/settings/reinforcements/koswat_vps_settings.py index c0cc1834..ac5de50e 100644 --- a/koswat/configuration/settings/reinforcements/koswat_vps_settings.py +++ b/koswat/configuration/settings/reinforcements/koswat_vps_settings.py @@ -13,7 +13,7 @@ class KoswatVPSSettings(KoswatConfigProtocol): soil_surtax_factor: SurtaxFactorEnum = SurtaxFactorEnum.NORMAAL constructive_surtax_factor: SurtaxFactorEnum = SurtaxFactorEnum.NORMAAL land_purchase_surtax_factor: SurtaxFactorEnum = SurtaxFactorEnum.NORMAAL - binnen_berm_breedte_vps: float = 0 + polderside_berm_width_vps: float = 0 def is_valid(self) -> bool: return True diff --git a/koswat/cost_report/profile/quantity_cost_parameters.py b/koswat/cost_report/profile/quantity_cost_parameters.py index d3dc5bd1..050a7cdd 100644 --- a/koswat/cost_report/profile/quantity_cost_parameters.py +++ b/koswat/cost_report/profile/quantity_cost_parameters.py @@ -75,7 +75,7 @@ class QuantityCostParameters: new_grass_layer_surface: CostParameterProtocol new_clay_layer_surface: CostParameterProtocol new_core_layer_surface: CostParameterProtocol - new_maaiveld_surface: CostParameterProtocol + new_ground_level_surface: CostParameterProtocol land_purchase_surface: CostParameterProtocol construction_length: CostParameterProtocol @@ -89,7 +89,7 @@ def __init__(self) -> None: self.new_grass_layer_surface = None self.new_clay_layer_surface = None self.new_core_layer_surface = None - self.new_maaiveld_surface = None + self.new_ground_level_surface = None self.land_purchase_surface = None self.construction_length = None diff --git a/koswat/cost_report/profile/quantity_cost_parameters_builder.py b/koswat/cost_report/profile/quantity_cost_parameters_builder.py index 5f7e44cb..90940aba 100644 --- a/koswat/cost_report/profile/quantity_cost_parameters_builder.py +++ b/koswat/cost_report/profile/quantity_cost_parameters_builder.py @@ -71,7 +71,7 @@ def _get_quantity_cost_calculator( _calculator.new_clay_layer_surface = _clay_layer.new_layer_surface.length _calculator.new_grass_layer_volume = _grass_layer.new_layer_geometry.area _calculator.new_grass_layer_surface = _grass_layer.new_layer_surface.length - _calculator.new_maaiveld_surface = ( + _calculator.new_ground_level_surface = ( self.reinforced_profile.new_ground_level_surface ) _calculator.construction_length = ( @@ -99,7 +99,7 @@ def _get_land_purchase_cost_parameter( ) -> SoilCostParameter: _lpcp = SoilCostParameter() _lpcp.quantity = quantity - _lpcp.cost = input_data.grondprijs + _lpcp.cost = input_data.ground_price _lpcp.surtax = self.koswat_costs_settings.surtax_costs.get_land_purchase_surtax( self.reinforced_profile.input_data.land_purchase_surtax_factor ) @@ -137,16 +137,17 @@ def _set_quantity_cost_parameters( _qcp.get_reused_grass_volume(), dike_profile_costs.reused_layer_grass_m3 ) qc_parameters.new_grass_volume = self._get_soil_cost_parameter( - _qcp.get_aanleg_grass_volume(), dike_profile_costs.added_layer_grass_m3 + _qcp.get_construction_grass_volume(), + dike_profile_costs.added_layer_grass_m3, ) qc_parameters.new_clay_volume = self._get_soil_cost_parameter( - _qcp.get_aanleg_clay_volume(), dike_profile_costs.added_layer_clay_m3 + _qcp.get_construction_clay_volume(), dike_profile_costs.added_layer_clay_m3 ) qc_parameters.reused_core_volume = self._get_soil_cost_parameter( _qcp.get_reused_core_volume(), dike_profile_costs.reused_layer_core_m3 ) qc_parameters.new_core_volume = self._get_soil_cost_parameter( - _qcp.get_aanleg_core_volume(), dike_profile_costs.added_layer_sand_m3 + _qcp.get_construction_core_volume(), dike_profile_costs.added_layer_sand_m3 ) qc_parameters.removed_material_volume = self._get_soil_cost_parameter( _qcp.get_removed_material_volume(), dike_profile_costs.disposed_material_m3 @@ -160,11 +161,12 @@ def _set_quantity_cost_parameters( qc_parameters.new_core_layer_surface = self._get_soil_cost_parameter( _qcp.new_core_layer_surface, dike_profile_costs.profiling_layer_sand_m2 ) - qc_parameters.new_maaiveld_surface = self._get_soil_cost_parameter( - _qcp.new_maaiveld_surface, dike_profile_costs.bewerken_maaiveld_m2 + qc_parameters.new_ground_level_surface = self._get_soil_cost_parameter( + _qcp.new_ground_level_surface, + dike_profile_costs.processing_ground_level_surface_m2, ) qc_parameters.land_purchase_surface = self._get_land_purchase_cost_parameter( - _qcp.new_maaiveld_surface, self.reinforced_profile.input_data + _qcp.new_ground_level_surface, self.reinforced_profile.input_data ) qc_parameters.construction_length = self._get_construction_cost_parameter( _qcp.construction_length, _qcp.construction_type diff --git a/koswat/cost_report/profile/quantity_cost_parameters_calculator.py b/koswat/cost_report/profile/quantity_cost_parameters_calculator.py index fc5c3aab..9c9dd9c3 100644 --- a/koswat/cost_report/profile/quantity_cost_parameters_calculator.py +++ b/koswat/cost_report/profile/quantity_cost_parameters_calculator.py @@ -10,23 +10,23 @@ class QuantityCostParametersCalculator: new_clay_layer_surface: float new_grass_layer_volume: float new_grass_layer_surface: float - new_maaiveld_surface: float + new_ground_level_surface: float construction_length: float construction_type: ConstructionTypeEnum | None def get_reused_grass_volume(self) -> float: return min(self.grass_layer_removal_volume, self.new_grass_layer_volume) - def get_aanleg_grass_volume(self) -> float: + def get_construction_grass_volume(self) -> float: return max(self.new_grass_layer_volume - self.grass_layer_removal_volume, 0) - def get_aanleg_clay_volume(self) -> float: + def get_construction_clay_volume(self) -> float: return self.new_clay_layer_volume def get_reused_core_volume(self) -> float: return min(self.clay_layer_removal_volume, self.new_core_layer_volume) - def get_aanleg_core_volume(self) -> float: + def get_construction_core_volume(self) -> float: return max(self.new_core_layer_volume - self.clay_layer_removal_volume, 0) def get_removed_material_volume(self) -> float: diff --git a/koswat/cost_report/summary/koswat_summary_builder.py b/koswat/cost_report/summary/koswat_summary_builder.py index 21c1188d..9334c95f 100644 --- a/koswat/cost_report/summary/koswat_summary_builder.py +++ b/koswat/cost_report/summary/koswat_summary_builder.py @@ -28,9 +28,6 @@ ) from koswat.strategies.order_strategy.order_strategy import OrderStrategy from koswat.strategies.strategy_input import StrategyInput -from koswat.strategies.strategy_reinforcement_type_costs import ( - StrategyReinforcementTypeCosts, -) @dataclass @@ -53,10 +50,10 @@ def _get_corrected_koswat_scenario( KoswatScenario: Valid scenario to be used in reinforcements. """ _new_koswat_scenario = KoswatScenario(**original_scenario.__dict__) - if math.isnan(_new_koswat_scenario.kruin_breedte): - _new_koswat_scenario.kruin_breedte = input_profile_base.kruin_breedte - if math.isnan(_new_koswat_scenario.buiten_talud): - _new_koswat_scenario.buiten_talud = input_profile_base.buiten_talud + if math.isnan(_new_koswat_scenario.crest_width): + _new_koswat_scenario.crest_width = input_profile_base.crest_width + if math.isnan(_new_koswat_scenario.waterside_slope): + _new_koswat_scenario.waterside_slope = input_profile_base.waterside_slope return _new_koswat_scenario diff --git a/koswat/dike/characteristic_points/characteristic_points_builder.py b/koswat/dike/characteristic_points/characteristic_points_builder.py index 5d368d3b..1115edd2 100644 --- a/koswat/dike/characteristic_points/characteristic_points_builder.py +++ b/koswat/dike/characteristic_points/characteristic_points_builder.py @@ -17,36 +17,45 @@ def __init__(self) -> None: self.p4_x_coordinate = math.nan def _build_waterside(self, p4_x: float) -> List[Point]: - _p4 = Point(p4_x, self.input_profile.kruin_hoogte) + _p4 = Point(p4_x, self.input_profile.crest_height) _p3_x = _p4.x - ( - (self.input_profile.kruin_hoogte - self.input_profile.buiten_berm_hoogte) - * self.input_profile.buiten_talud + (self.input_profile.crest_height - self.input_profile.waterside_berm_height) + * self.input_profile.waterside_slope ) - _p3 = Point(_p3_x, self.input_profile.buiten_berm_hoogte) - _p2_x = _p3.x - self.input_profile.buiten_berm_breedte - _p2 = Point(_p2_x, self.input_profile.buiten_berm_hoogte) + _p3 = Point(_p3_x, self.input_profile.waterside_berm_height) + _p2_x = _p3.x - self.input_profile.waterside_berm_width + _p2 = Point(_p2_x, self.input_profile.waterside_berm_height) _p1_x = _p2.x - ( - (self.input_profile.buiten_berm_hoogte - self.input_profile.buiten_maaiveld) - * self.input_profile.buiten_talud + ( + self.input_profile.waterside_berm_height + - self.input_profile.waterside_ground_level + ) + * self.input_profile.waterside_slope ) - _p1 = Point(_p1_x, self.input_profile.buiten_maaiveld) + _p1 = Point(_p1_x, self.input_profile.waterside_ground_level) return [_p1, _p2, _p3, _p4] def _build_polderside(self, p4_x: float) -> List[Point]: - _x_p5 = p4_x + self.input_profile.kruin_breedte - _p5 = Point(_x_p5, self.input_profile.kruin_hoogte) + _x_p5 = p4_x + self.input_profile.crest_width + _p5 = Point(_x_p5, self.input_profile.crest_height) _x_p6 = _p5.x + ( - (self.input_profile.kruin_hoogte - self.input_profile.binnen_berm_hoogte) - * self.input_profile.binnen_talud + ( + self.input_profile.crest_height + - self.input_profile.polderside_berm_height + ) + * self.input_profile.polderside_slope ) - _p6 = Point(_x_p6, self.input_profile.binnen_berm_hoogte) - _x_p7 = _p6.x + self.input_profile.binnen_berm_breedte - _p7 = Point(_x_p7, self.input_profile.binnen_berm_hoogte) + _p6 = Point(_x_p6, self.input_profile.polderside_berm_height) + _x_p7 = _p6.x + self.input_profile.polderside_berm_width + _p7 = Point(_x_p7, self.input_profile.polderside_berm_height) _x_p8 = _p7.x + ( - (self.input_profile.binnen_berm_hoogte - self.input_profile.binnen_maaiveld) - * self.input_profile.binnen_talud + ( + self.input_profile.polderside_berm_height + - self.input_profile.polderside_ground_level + ) + * self.input_profile.polderside_slope ) - _p8 = Point(_x_p8, self.input_profile.binnen_maaiveld) + _p8 = Point(_x_p8, self.input_profile.polderside_ground_level) return [_p5, _p6, _p7, _p8] def build(self) -> CharacteristicPoints: diff --git a/koswat/dike/koswat_input_profile_protocol.py b/koswat/dike/koswat_input_profile_protocol.py index 0106fa7f..8f858e7a 100644 --- a/koswat/dike/koswat_input_profile_protocol.py +++ b/koswat/dike/koswat_input_profile_protocol.py @@ -8,22 +8,22 @@ @runtime_checkable class KoswatInputProfileProtocol(DataObjectModelProtocol, Protocol): dike_section: str - buiten_maaiveld: float - buiten_talud: float - buiten_berm_hoogte: float - buiten_berm_breedte: float - kruin_hoogte: float - kruin_breedte: float - binnen_talud: float - binnen_berm_hoogte: float - binnen_berm_breedte: float - binnen_maaiveld: float - grondprijs_bebouwd: float - grondprijs_onbebouwd: float - factor_zetting: float - pleistoceen: float + waterside_ground_level: float + waterside_slope: float + waterside_berm_height: float + waterside_berm_width: float + crest_height: float + crest_width: float + polderside_slope: float + polderside_berm_height: float + polderside_berm_width: float + polderside_ground_level: float + ground_price_builtup: float + ground_price_unbuilt: float + factor_settlement: float + pleistocene: float aquifer: float @property - def grondprijs(self) -> float: + def ground_price(self) -> float: pass diff --git a/koswat/dike/profile/koswat_input_profile_base.py b/koswat/dike/profile/koswat_input_profile_base.py index e09e9e89..fb5b67c8 100644 --- a/koswat/dike/profile/koswat_input_profile_base.py +++ b/koswat/dike/profile/koswat_input_profile_base.py @@ -9,22 +9,22 @@ @dataclass class KoswatInputProfileBase(KoswatInputProfileProtocol): dike_section: str = "" - buiten_maaiveld: float = math.nan - buiten_talud: float = math.nan - buiten_berm_hoogte: float = math.nan - buiten_berm_breedte: float = math.nan - kruin_hoogte: float = math.nan - kruin_breedte: float = math.nan - binnen_talud: float = math.nan - binnen_berm_hoogte: float = math.nan - binnen_berm_breedte: float = math.nan - binnen_maaiveld: float = math.nan - grondprijs_bebouwd: float = math.nan - grondprijs_onbebouwd: float = math.nan - factor_zetting: float = math.nan - pleistoceen: float = math.nan + waterside_ground_level: float = math.nan + waterside_slope: float = math.nan + waterside_berm_height: float = math.nan + waterside_berm_width: float = math.nan + crest_height: float = math.nan + crest_width: float = math.nan + polderside_slope: float = math.nan + polderside_berm_height: float = math.nan + polderside_berm_width: float = math.nan + polderside_ground_level: float = math.nan + ground_price_builtup: float = math.nan + ground_price_unbuilt: float = math.nan + factor_settlement: float = math.nan + pleistocene: float = math.nan aquifer: float = math.nan @property - def grondprijs(self) -> float: - return self.grondprijs_bebouwd + def ground_price(self) -> float: + return self.ground_price_builtup diff --git a/koswat/dike/surroundings/wrapper/infrastructure_surroundings_wrapper.py b/koswat/dike/surroundings/wrapper/infrastructure_surroundings_wrapper.py index 7711e89c..64ce0a7b 100644 --- a/koswat/dike/surroundings/wrapper/infrastructure_surroundings_wrapper.py +++ b/koswat/dike/surroundings/wrapper/infrastructure_surroundings_wrapper.py @@ -51,8 +51,8 @@ class InfrastructureSurroundingsWrapper(BaseSurroundingsWrapper): ) # Dikeside infrastructures (not supported yet) - roads_class_2_dikeside: SurroundingsInfrastructure = None - roads_class_7_dikeside: SurroundingsInfrastructure = None - roads_class_24_dikeside: SurroundingsInfrastructure = None - roads_class_47_dikeside: SurroundingsInfrastructure = None - roads_class_unknown_dikeside: SurroundingsInfrastructure = None + roads_class_2_waterside: SurroundingsInfrastructure = None + roads_class_7_waterside: SurroundingsInfrastructure = None + roads_class_24_waterside: SurroundingsInfrastructure = None + roads_class_47_waterside: SurroundingsInfrastructure = None + roads_class_unknown_waterside: SurroundingsInfrastructure = None diff --git a/koswat/dike/surroundings/wrapper/obstacle_surroundings_wrapper.py b/koswat/dike/surroundings/wrapper/obstacle_surroundings_wrapper.py index 78e08e2e..b62d5cbe 100644 --- a/koswat/dike/surroundings/wrapper/obstacle_surroundings_wrapper.py +++ b/koswat/dike/surroundings/wrapper/obstacle_surroundings_wrapper.py @@ -32,9 +32,9 @@ class ObstacleSurroundingsWrapper(BaseSurroundingsWrapper): ) # Dikeside (not yet supported) - buildings_dikeside: SurroundingsObstacle = None - railways_dikeside: SurroundingsObstacle = None - waters_dikeside: SurroundingsObstacle = None + buildings_waterside: SurroundingsObstacle = None + railways_waterside: SurroundingsObstacle = None + waters_waterside: SurroundingsObstacle = None @property def obstacle_locations(self) -> list[PointSurroundings]: diff --git a/koswat/dike/surroundings/wrapper/surroundings_wrapper_builder.py b/koswat/dike/surroundings/wrapper/surroundings_wrapper_builder.py index f0d708b3..626597ed 100644 --- a/koswat/dike/surroundings/wrapper/surroundings_wrapper_builder.py +++ b/koswat/dike/surroundings/wrapper/surroundings_wrapper_builder.py @@ -55,22 +55,22 @@ def _get_polderside_surroundings_from_fom( def _get_obstacle_surroundings_wrapper(self) -> ObstacleSurroundingsWrapper: _obs_wrapper = ObstacleSurroundingsWrapper( - reinforcement_min_separation=self.surroundings_section_fom.constructieafstand, - reinforcement_min_buffer=self.surroundings_section_fom.constructieovergang, - apply_waterside=self.surroundings_section_fom.buitendijks, - apply_buildings=self.surroundings_section_fom.bebouwing, - apply_railways=self.surroundings_section_fom.spoorwegen, - apply_waters=self.surroundings_section_fom.water, + reinforcement_min_separation=self.surroundings_section_fom.construction_distance, + reinforcement_min_buffer=self.surroundings_section_fom.construction_buffer, + apply_waterside=self.surroundings_section_fom.waterside, + apply_buildings=self.surroundings_section_fom.buildings, + apply_railways=self.surroundings_section_fom.railways, + apply_waters=self.surroundings_section_fom.waters, ) # Buildings polderside should always be present to determine the location coordinates. _obs_wrapper.buildings_polderside.points = ( self._get_polderside_surroundings_from_fom("buildings_polderside") ) - if self.surroundings_section_fom.spoorwegen: + if self.surroundings_section_fom.railways: _obs_wrapper.railways_polderside.points = ( self._get_polderside_surroundings_from_fom("railways_polderside") ) - if self.surroundings_section_fom.water: + if self.surroundings_section_fom.waters: _obs_wrapper.waters_polderside.points = ( self._get_polderside_surroundings_from_fom("waters_polderside") ) @@ -81,27 +81,25 @@ def _get_polderside_surroundings_infrastructure( self, name: str ) -> SurroundingsInfrastructure: _mapped_name = ( - name.replace("_polderside", "") - .replace("roads_class_unknown", "wegen_onbekend") - .replace("roads_class_", "wegen_klasse") + name.replace("_polderside", "_width") + .replace("class_unknown", "unknown") + .replace("class_", "class") ) return SurroundingsInfrastructure( infrastructure_name=name, points=self._get_polderside_surroundings_from_fom(name), - infrastructure_width=getattr( - self.infrastructure_section_fom, _mapped_name + "_breedte" - ), + infrastructure_width=getattr(self.infrastructure_section_fom, _mapped_name), ) def _get_infrastructure_surroundings_wrapper( self, ) -> InfrastructureSurroundingsWrapper: _infra_wrapper = InfrastructureSurroundingsWrapper( - infrastructures_considered=self.infrastructure_section_fom.infrastructuur, - surtax_cost_factor=self.infrastructure_section_fom.opslagfactor_wegen, - non_rising_dike_costs_factor=self.infrastructure_section_fom.infrakosten_0dh, + infrastructures_considered=self.infrastructure_section_fom.infrastructure, + surtax_cost_factor=self.infrastructure_section_fom.surtax_factor_roads, + non_rising_dike_costs_factor=self.infrastructure_section_fom.infrastructure_costs_0dh, ) - if self.infrastructure_section_fom.infrastructuur: + if self.infrastructure_section_fom.infrastructure: _infra_wrapper.roads_class_2_polderside = ( self._get_polderside_surroundings_infrastructure( "roads_class_2_polderside" diff --git a/koswat/dike_reinforcements/input_profile/cofferdam/cofferdam_input_profile_calculation.py b/koswat/dike_reinforcements/input_profile/cofferdam/cofferdam_input_profile_calculation.py index 752a16ae..abc21392 100644 --- a/koswat/dike_reinforcements/input_profile/cofferdam/cofferdam_input_profile_calculation.py +++ b/koswat/dike_reinforcements/input_profile/cofferdam/cofferdam_input_profile_calculation.py @@ -32,12 +32,12 @@ def __init__(self) -> None: self.base_profile = None self.scenario = None - def _calculate_new_kruin_hoogte( + def _calculate_new_crest_height( self, base_data: KoswatInputProfileBase, scenario: KoswatScenario ) -> float: - return base_data.kruin_hoogte + scenario.d_h + return base_data.crest_height + scenario.d_h - def _calculate_new_binnen_talud( + def _calculate_new_polderside_slope( self, base_data: KoswatInputProfileBase, scenario: KoswatScenario ) -> float: """ @@ -46,14 +46,16 @@ def _calculate_new_binnen_talud( *Binnen_Talud_Oud-Kruin_Breedte_Nieuw) /(Kruin_Hoogte_Oud+dH) """ - _mid_operand = base_data.binnen_talud * ( - base_data.kruin_hoogte - base_data.binnen_maaiveld + _mid_operand = base_data.polderside_slope * ( + base_data.crest_height - base_data.polderside_ground_level + ) + _operand = base_data.crest_width + _mid_operand - scenario.crest_width + _dividend = ( + base_data.crest_height - base_data.polderside_ground_level + scenario.d_h ) - _operand = base_data.kruin_breedte + _mid_operand - scenario.kruin_breedte - _dividend = base_data.kruin_hoogte - base_data.binnen_maaiveld + scenario.d_h return _operand / _dividend - def _calculate_new_buiten_talud( + def _calculate_new_waterside_slope( self, base_data: KoswatInputProfileBase, scenario: KoswatScenario ) -> float: """ @@ -61,39 +63,41 @@ def _calculate_new_buiten_talud( /(Kruin_Hoogte_Oud+dH) """ _operand = ( - base_data.kruin_hoogte - base_data.buiten_maaiveld - ) * base_data.buiten_talud - _dividend = base_data.kruin_hoogte - base_data.buiten_maaiveld + scenario.d_h + base_data.crest_height - base_data.waterside_ground_level + ) * base_data.waterside_slope + _dividend = ( + base_data.crest_height - base_data.waterside_ground_level + scenario.d_h + ) return _operand / _dividend - def _calculate_length_coffer_dam( + def _calculate_length_cofferdam( self, old_data: KoswatInputProfileProtocol, cofferdam_settings: KoswatCofferdamSettings, - soil_binnen_berm_breedte: float, - new_kruin_hoogte: float, + soil_polderside_berm_width: float, + new_crest_height: float, ) -> float: """ Identical to calculation of Stability wall """ - if soil_binnen_berm_breedte == 0: + if soil_polderside_berm_width == 0: # Length of wall is not determined by piping. _length_piping = 0.0 else: _length_piping = ( - (soil_binnen_berm_breedte / 6) - + (new_kruin_hoogte - 0.5) + (soil_polderside_berm_width / 6) + + (new_crest_height - 0.5) - old_data.aquifer ) - _length_stability = (new_kruin_hoogte - 0.5) - (old_data.pleistoceen - 1) + _length_stability = (new_crest_height - 0.5) - (old_data.pleistocene - 1) return round( min( max( _length_piping, _length_stability, - cofferdam_settings.min_lengte_kistdam, + cofferdam_settings.min_length_cofferdam, ), - cofferdam_settings.max_lengte_kistdam, + cofferdam_settings.max_length_cofferdam, ), 1, ) @@ -115,29 +119,33 @@ def _calculate_new_input_profile( ) -> CofferDamInputProfile: _new_data = CofferDamInputProfile() _new_data.dike_section = base_data.dike_section - _new_data.buiten_maaiveld = base_data.buiten_maaiveld - _new_data.buiten_talud = self._calculate_new_buiten_talud(base_data, scenario) - _new_data.buiten_berm_hoogte = base_data.buiten_berm_hoogte - _new_data.buiten_berm_breedte = base_data.buiten_berm_breedte - _new_data.kruin_hoogte = self._calculate_new_kruin_hoogte(base_data, scenario) - _new_data.kruin_breedte = scenario.kruin_breedte - _new_data.binnen_talud = self._calculate_new_binnen_talud(base_data, scenario) - _new_data.binnen_berm_breedte = 0 - _new_data.binnen_berm_hoogte = base_data.binnen_maaiveld - _new_data.binnen_maaiveld = base_data.binnen_maaiveld - _soil_binnen_berm_breedte = self._calculate_soil_binnen_berm_breedte( + _new_data.waterside_ground_level = base_data.waterside_ground_level + _new_data.waterside_slope = self._calculate_new_waterside_slope( + base_data, scenario + ) + _new_data.waterside_berm_height = base_data.waterside_berm_height + _new_data.waterside_berm_width = base_data.waterside_berm_width + _new_data.crest_height = self._calculate_new_crest_height(base_data, scenario) + _new_data.crest_width = scenario.crest_width + _new_data.polderside_slope = self._calculate_new_polderside_slope( + base_data, scenario + ) + _new_data.polderside_berm_width = 0 + _new_data.polderside_berm_height = base_data.polderside_ground_level + _new_data.polderside_ground_level = base_data.polderside_ground_level + _soil_polderside_berm_width = self._calculate_soil_polderside_berm_width( base_data, _new_data, scenario ) - _new_data.grondprijs_bebouwd = base_data.grondprijs_bebouwd - _new_data.grondprijs_onbebouwd = base_data.grondprijs_onbebouwd - _new_data.factor_zetting = base_data.factor_zetting - _new_data.pleistoceen = base_data.pleistoceen + _new_data.ground_price_builtup = base_data.ground_price_builtup + _new_data.ground_price_unbuilt = base_data.ground_price_unbuilt + _new_data.factor_settlement = base_data.factor_settlement + _new_data.pleistocene = base_data.pleistocene _new_data.aquifer = base_data.aquifer - _new_data.construction_length = self._calculate_length_coffer_dam( + _new_data.construction_length = self._calculate_length_cofferdam( base_data, cofferdam_settings, - _soil_binnen_berm_breedte, - _new_data.kruin_hoogte, + _soil_polderside_berm_width, + _new_data.crest_height, ) _new_data.construction_type = self._determine_construction_type( _new_data.construction_length diff --git a/koswat/dike_reinforcements/input_profile/piping_wall/piping_wall_input_profile_calculation.py b/koswat/dike_reinforcements/input_profile/piping_wall/piping_wall_input_profile_calculation.py index b8b5aed5..bc8cb099 100644 --- a/koswat/dike_reinforcements/input_profile/piping_wall/piping_wall_input_profile_calculation.py +++ b/koswat/dike_reinforcements/input_profile/piping_wall/piping_wall_input_profile_calculation.py @@ -35,33 +35,33 @@ def _calculate_length_piping_wall( self, old_data: KoswatInputProfileBase, piping_wall_settings: KoswatPipingWallSettings, - soil_binnen_berm_breedte: float, + soil_polderside_berm_width: float, ) -> float: - if soil_binnen_berm_breedte == 0: + if soil_polderside_berm_width == 0: # No wall is needed. return 0 _length_piping = ( - (soil_binnen_berm_breedte / 6) - + (old_data.binnen_maaiveld - old_data.aquifer) + (soil_polderside_berm_width / 6) + + (old_data.polderside_ground_level - old_data.aquifer) + 1 ) return round( min( max( _length_piping, - piping_wall_settings.min_lengte_kwelscherm, + piping_wall_settings.min_length_piping_wall, ), - piping_wall_settings.max_lengte_kwelscherm, + piping_wall_settings.max_length_piping_wall, ), 1, ) - def _calculate_new_kruin_hoogte( + def _calculate_new_crest_height( self, base_data: KoswatInputProfileBase, scenario: KoswatScenario ) -> float: - return base_data.kruin_hoogte + scenario.d_h + return base_data.crest_height + scenario.d_h - def _calculate_new_binnen_talud( + def _calculate_new_polderside_slope( self, base_data: KoswatInputProfileBase, scenario: KoswatScenario ) -> float: """ @@ -74,16 +74,18 @@ def _calculate_new_binnen_talud( +(Kruin_Hoogte_Oud-Binnen_Maaiveld_Oud)*Binnen_Talud_Oud) /(Kruin_Hoogte_Oud-Binnen_Maaiveld_Oud+dH)) """ - _first_part = scenario.d_h * scenario.buiten_talud - _second_part = scenario.kruin_breedte - base_data.kruin_breedte + _first_part = scenario.d_h * scenario.waterside_slope + _second_part = scenario.crest_width - base_data.crest_width _third_parth = ( - base_data.kruin_hoogte - base_data.binnen_maaiveld - ) * base_data.binnen_talud - _dividend = base_data.kruin_hoogte - base_data.binnen_maaiveld + scenario.d_h + base_data.crest_height - base_data.polderside_ground_level + ) * base_data.polderside_slope + _dividend = ( + base_data.crest_height - base_data.polderside_ground_level + scenario.d_h + ) _right_side = ( scenario.d_s - _first_part - _second_part + _third_parth ) / _dividend - return max(base_data.binnen_talud, _right_side) + return max(base_data.polderside_slope, _right_side) def _determine_construction_type( self, overgang: float, construction_length: float @@ -103,29 +105,32 @@ def _calculate_new_input_profile( ) -> PipingWallInputProfile: _new_data = PipingWallInputProfile() _new_data.dike_section = base_data.dike_section - _new_data.buiten_maaiveld = base_data.buiten_maaiveld - _new_data.buiten_talud = scenario.buiten_talud - _new_data.buiten_berm_hoogte = base_data.buiten_berm_hoogte - _new_data.buiten_berm_breedte = base_data.buiten_berm_breedte - _new_data.kruin_hoogte = self._calculate_new_kruin_hoogte(base_data, scenario) - _new_data.kruin_breedte = scenario.kruin_breedte - _new_data.binnen_talud = self._calculate_new_binnen_talud(base_data, scenario) - _new_data.binnen_berm_hoogte = base_data.binnen_maaiveld - _new_data.binnen_berm_breedte = 0 - _new_data.binnen_maaiveld = base_data.binnen_maaiveld - _soil_binnen_berm_breedte = self._calculate_soil_binnen_berm_breedte( + _new_data.waterside_ground_level = base_data.waterside_ground_level + _new_data.waterside_slope = scenario.waterside_slope + _new_data.waterside_berm_height = base_data.waterside_berm_height + _new_data.waterside_berm_width = base_data.waterside_berm_width + _new_data.crest_height = self._calculate_new_crest_height(base_data, scenario) + _new_data.crest_width = scenario.crest_width + _new_data.polderside_slope = self._calculate_new_polderside_slope( + base_data, scenario + ) + _new_data.polderside_berm_height = base_data.polderside_ground_level + _new_data.polderside_berm_width = 0 + _new_data.polderside_ground_level = base_data.polderside_ground_level + _soil_polderside_berm_width = self._calculate_soil_polderside_berm_width( base_data, _new_data, scenario ) - _new_data.grondprijs_bebouwd = base_data.grondprijs_bebouwd - _new_data.grondprijs_onbebouwd = base_data.grondprijs_onbebouwd - _new_data.factor_zetting = base_data.factor_zetting - _new_data.pleistoceen = base_data.pleistoceen + _new_data.ground_price_builtup = base_data.ground_price_builtup + _new_data.ground_price_unbuilt = base_data.ground_price_unbuilt + _new_data.factor_settlement = base_data.factor_settlement + _new_data.pleistocene = base_data.pleistocene _new_data.aquifer = base_data.aquifer _new_data.construction_length = self._calculate_length_piping_wall( - base_data, piping_wall_settings, _soil_binnen_berm_breedte + base_data, piping_wall_settings, _soil_polderside_berm_width ) _new_data.construction_type = self._determine_construction_type( - piping_wall_settings.overgang_cbwand_damwand, _new_data.construction_length + piping_wall_settings.transition_cbwall_sheetpile, + _new_data.construction_length, ) _new_data.soil_surtax_factor = piping_wall_settings.soil_surtax_factor _new_data.constructive_surtax_factor = ( diff --git a/koswat/dike_reinforcements/input_profile/reinforcement_input_profile_calculation_base.py b/koswat/dike_reinforcements/input_profile/reinforcement_input_profile_calculation_base.py index b3dd5143..57652c19 100644 --- a/koswat/dike_reinforcements/input_profile/reinforcement_input_profile_calculation_base.py +++ b/koswat/dike_reinforcements/input_profile/reinforcement_input_profile_calculation_base.py @@ -9,24 +9,28 @@ class ReinforcementInputProfileCalculationBase(ABC): Abstract class to provide common functions to child classes """ - def _calculate_soil_binnen_berm_breedte( + def _calculate_soil_polderside_berm_width( self, old_data: KoswatInputProfileBase, new_data: KoswatInputProfileBase, scenario: KoswatScenario, ) -> float: _dikebase_old = ( - (old_data.kruin_hoogte - old_data.buiten_maaiveld) * old_data.buiten_talud - + old_data.buiten_berm_breedte - + old_data.kruin_breedte - + old_data.binnen_berm_breedte - + (old_data.kruin_hoogte - old_data.binnen_maaiveld) * old_data.binnen_talud + (old_data.crest_height - old_data.waterside_ground_level) + * old_data.waterside_slope + + old_data.waterside_berm_width + + old_data.crest_width + + old_data.polderside_berm_width + + (old_data.crest_height - old_data.polderside_ground_level) + * old_data.polderside_slope ) _dikebase_new = ( - (new_data.kruin_hoogte - new_data.buiten_maaiveld) * new_data.buiten_talud - + new_data.buiten_berm_breedte - + new_data.kruin_breedte - + (new_data.kruin_hoogte - new_data.binnen_maaiveld) * new_data.binnen_talud + (new_data.crest_height - new_data.waterside_ground_level) + * new_data.waterside_slope + + new_data.waterside_berm_width + + new_data.crest_width + + (new_data.crest_height - new_data.polderside_ground_level) + * new_data.polderside_slope ) _berm = scenario.d_p - (_dikebase_new - _dikebase_old) return max(_berm, 0) diff --git a/koswat/dike_reinforcements/input_profile/soil/soil_input_profile.py b/koswat/dike_reinforcements/input_profile/soil/soil_input_profile.py index be63a413..0c94f679 100644 --- a/koswat/dike_reinforcements/input_profile/soil/soil_input_profile.py +++ b/koswat/dike_reinforcements/input_profile/soil/soil_input_profile.py @@ -23,5 +23,5 @@ def reinforcement_domain_name(self) -> str: return "Grondmaatregel profiel" @property - def grondprijs(self) -> float: - return self.grondprijs_onbebouwd + def ground_price(self) -> float: + return self.ground_price_unbuilt diff --git a/koswat/dike_reinforcements/input_profile/soil/soil_input_profile_calculation.py b/koswat/dike_reinforcements/input_profile/soil/soil_input_profile_calculation.py index 401da259..55537c8a 100644 --- a/koswat/dike_reinforcements/input_profile/soil/soil_input_profile_calculation.py +++ b/koswat/dike_reinforcements/input_profile/soil/soil_input_profile_calculation.py @@ -30,7 +30,7 @@ def __init__(self) -> None: self.base_profile = None self.scenario = None - def _calculate_new_binnen_talud( + def _calculate_new_polderside_slope( self, base_data: KoswatInputProfileBase, scenario: KoswatScenario ) -> float: """ @@ -43,46 +43,48 @@ def _calculate_new_binnen_talud( +(Kruin_Hoogte_Oud-Binnen_Maaiveld_Oud)*Binnen_Talud_Oud) /(Kruin_Hoogte_Oud-Binnen_Maaiveld_Oud+dH)) """ - _first_part = scenario.d_h * scenario.buiten_talud - _second_part = scenario.kruin_breedte - base_data.kruin_breedte + _first_part = scenario.d_h * scenario.waterside_slope + _second_part = scenario.crest_width - base_data.crest_width _third_parth = ( - base_data.kruin_hoogte - base_data.binnen_maaiveld - ) * base_data.binnen_talud - _dividend = base_data.kruin_hoogte - base_data.binnen_maaiveld + scenario.d_h + base_data.crest_height - base_data.polderside_ground_level + ) * base_data.polderside_slope + _dividend = ( + base_data.crest_height - base_data.polderside_ground_level + scenario.d_h + ) _right_side = ( scenario.d_s - _first_part - _second_part + _third_parth ) / _dividend - return max(base_data.binnen_talud, _right_side) + return max(base_data.polderside_slope, _right_side) - def _calculate_new_binnen_berm_hoogte( + def _calculate_new_polderside_berm_height( self, old_data: KoswatInputProfileBase, new_data: KoswatInputProfileBase, scenario: KoswatScenario, ) -> float: - if new_data.binnen_berm_breedte > 0: + if new_data.polderside_berm_width > 0: _max = max( 0.5, - (old_data.binnen_berm_hoogte - old_data.binnen_maaiveld), - new_data.binnen_berm_breedte * 0.05, + (old_data.polderside_berm_height - old_data.polderside_ground_level), + new_data.polderside_berm_width * 0.05, ) return ( min( _max, 0.4 * ( - (old_data.kruin_hoogte - old_data.binnen_maaiveld) + (old_data.crest_height - old_data.polderside_ground_level) + scenario.d_h ), ) - + old_data.binnen_maaiveld + + old_data.polderside_ground_level ) - return old_data.binnen_maaiveld + return old_data.polderside_ground_level - def _calculate_new_kruin_hoogte( + def _calculate_new_crest_height( self, base_data: KoswatInputProfileBase, scenario: KoswatScenario ) -> float: - return base_data.kruin_hoogte + scenario.d_h + return base_data.crest_height + scenario.d_h def _calculate_new_input_profile( self, @@ -92,24 +94,26 @@ def _calculate_new_input_profile( ) -> KoswatInputProfileBase: _new_data = SoilInputProfile() _new_data.dike_section = base_data.dike_section - _new_data.buiten_maaiveld = base_data.buiten_maaiveld - _new_data.buiten_talud = scenario.buiten_talud - _new_data.buiten_berm_hoogte = base_data.buiten_berm_hoogte - _new_data.buiten_berm_breedte = base_data.buiten_berm_breedte - _new_data.kruin_breedte = scenario.kruin_breedte - _new_data.kruin_hoogte = self._calculate_new_kruin_hoogte(base_data, scenario) - _new_data.binnen_maaiveld = base_data.binnen_maaiveld - _new_data.binnen_talud = self._calculate_new_binnen_talud(base_data, scenario) - _new_data.binnen_berm_breedte = self._calculate_soil_binnen_berm_breedte( + _new_data.waterside_ground_level = base_data.waterside_ground_level + _new_data.waterside_slope = scenario.waterside_slope + _new_data.waterside_berm_height = base_data.waterside_berm_height + _new_data.waterside_berm_width = base_data.waterside_berm_width + _new_data.crest_width = scenario.crest_width + _new_data.crest_height = self._calculate_new_crest_height(base_data, scenario) + _new_data.polderside_ground_level = base_data.polderside_ground_level + _new_data.polderside_slope = self._calculate_new_polderside_slope( + base_data, scenario + ) + _new_data.polderside_berm_width = self._calculate_soil_polderside_berm_width( base_data, _new_data, scenario ) - _new_data.binnen_berm_hoogte = self._calculate_new_binnen_berm_hoogte( + _new_data.polderside_berm_height = self._calculate_new_polderside_berm_height( base_data, _new_data, scenario ) - _new_data.grondprijs_bebouwd = base_data.grondprijs_bebouwd - _new_data.grondprijs_onbebouwd = base_data.grondprijs_onbebouwd - _new_data.factor_zetting = base_data.factor_zetting - _new_data.pleistoceen = base_data.pleistoceen + _new_data.ground_price_builtup = base_data.ground_price_builtup + _new_data.ground_price_unbuilt = base_data.ground_price_unbuilt + _new_data.factor_settlement = base_data.factor_settlement + _new_data.pleistocene = base_data.pleistocene _new_data.aquifer = base_data.aquifer _new_data.soil_surtax_factor = soil_settings.soil_surtax_factor _new_data.constructive_surtax_factor = None diff --git a/koswat/dike_reinforcements/input_profile/stability_wall/stability_wall_input_profile_calculation.py b/koswat/dike_reinforcements/input_profile/stability_wall/stability_wall_input_profile_calculation.py index cd4d34f3..1d9eb59b 100644 --- a/koswat/dike_reinforcements/input_profile/stability_wall/stability_wall_input_profile_calculation.py +++ b/koswat/dike_reinforcements/input_profile/stability_wall/stability_wall_input_profile_calculation.py @@ -36,40 +36,40 @@ def _calculate_length_stability_wall( self, old_data: KoswatInputProfileProtocol, stability_wall_settings: KoswatStabilityWallSettings, - soil_binnen_berm_breedte: float, - new_kruin_hoogte: float, + soil_polderside_berm_width: float, + new_crest_height: float, ) -> float: """ Identical to calculation of Cofferdam """ - if soil_binnen_berm_breedte == 0: + if soil_polderside_berm_width == 0: # Length of wall is not determined by piping. _length_piping = 0.0 else: _length_piping = ( - (soil_binnen_berm_breedte / 6) - + (new_kruin_hoogte - 0.5) + (soil_polderside_berm_width / 6) + + (new_crest_height - 0.5) - old_data.aquifer ) - _length_stability = (new_kruin_hoogte - 0.5) - (old_data.pleistoceen - 1) + _length_stability = (new_crest_height - 0.5) - (old_data.pleistocene - 1) return round( min( max( _length_piping, _length_stability, - stability_wall_settings.min_lengte_stabiliteitswand, + stability_wall_settings.min_length_stability_wall, ), - stability_wall_settings.max_lengte_stabiliteitswand, + stability_wall_settings.max_length_stability_wall, ), 1, ) - def _calculate_new_kruin_hoogte( + def _calculate_new_crest_height( self, base_data: KoswatInputProfileBase, scenario: KoswatScenario ) -> float: - return base_data.kruin_hoogte + scenario.d_h + return base_data.crest_height + scenario.d_h - def _calculate_new_binnen_talud( + def _calculate_new_polderside_slope( self, base_data: KoswatInputProfileBase, scenario: KoswatScenario ) -> float: """ @@ -85,16 +85,15 @@ def _calculate_new_binnen_talud( """ _first_part = ( - base_data.kruin_hoogte - base_data.binnen_maaiveld - ) * base_data.binnen_talud - _second_part = scenario.d_h * scenario.buiten_talud + base_data.crest_height - base_data.polderside_ground_level + ) * base_data.polderside_slope + _second_part = scenario.d_h * scenario.waterside_slope _operand = ( - base_data.kruin_breedte - + _first_part - - _second_part - - scenario.kruin_breedte + base_data.crest_width + _first_part - _second_part - scenario.crest_width + ) + _dividend = ( + base_data.crest_height - base_data.polderside_ground_level + scenario.d_h ) - _dividend = base_data.kruin_hoogte - base_data.binnen_maaiveld + scenario.d_h _right_side = _operand / _dividend return max(2, _right_side) @@ -118,32 +117,34 @@ def _calculate_new_input_profile( ) -> StabilityWallInputProfile: _new_data = StabilityWallInputProfile() _new_data.dike_section = base_data.dike_section - _new_data.buiten_maaiveld = base_data.buiten_maaiveld - _new_data.buiten_talud = scenario.buiten_talud - _new_data.buiten_berm_hoogte = base_data.buiten_berm_hoogte - _new_data.buiten_berm_breedte = base_data.buiten_berm_breedte - _new_data.kruin_hoogte = self._calculate_new_kruin_hoogte(base_data, scenario) - _new_data.kruin_breedte = scenario.kruin_breedte - _new_data.binnen_talud = self._calculate_new_binnen_talud(base_data, scenario) - _new_data.binnen_berm_hoogte = base_data.binnen_maaiveld - _new_data.binnen_berm_breedte = 0 - _new_data.binnen_maaiveld = base_data.binnen_maaiveld - _new_data.grondprijs_bebouwd = base_data.grondprijs_bebouwd - _new_data.grondprijs_onbebouwd = base_data.grondprijs_onbebouwd - _new_data.factor_zetting = base_data.factor_zetting - _new_data.pleistoceen = base_data.pleistoceen + _new_data.waterside_ground_level = base_data.waterside_ground_level + _new_data.waterside_slope = scenario.waterside_slope + _new_data.waterside_berm_height = base_data.waterside_berm_height + _new_data.waterside_berm_width = base_data.waterside_berm_width + _new_data.crest_height = self._calculate_new_crest_height(base_data, scenario) + _new_data.crest_width = scenario.crest_width + _new_data.polderside_slope = self._calculate_new_polderside_slope( + base_data, scenario + ) + _new_data.polderside_berm_height = base_data.polderside_ground_level + _new_data.polderside_berm_width = 0 + _new_data.polderside_ground_level = base_data.polderside_ground_level + _new_data.ground_price_builtup = base_data.ground_price_builtup + _new_data.ground_price_unbuilt = base_data.ground_price_unbuilt + _new_data.factor_settlement = base_data.factor_settlement + _new_data.pleistocene = base_data.pleistocene _new_data.aquifer = base_data.aquifer - _soil_binnen_berm_breedte = self._calculate_soil_binnen_berm_breedte( + _soil_polderside_berm_width = self._calculate_soil_polderside_berm_width( base_data, _new_data, scenario ) _new_data.construction_length = self._calculate_length_stability_wall( base_data, stability_wall_settings, - _soil_binnen_berm_breedte, - _new_data.kruin_hoogte, + _soil_polderside_berm_width, + _new_data.crest_height, ) _new_data.construction_type = self._determine_construction_type( - stability_wall_settings.overgang_damwand_diepwand, + stability_wall_settings.transition_sheetpile_diaphragm_wall, _new_data.construction_length, ) _new_data.soil_surtax_factor = stability_wall_settings.soil_surtax_factor diff --git a/koswat/dike_reinforcements/input_profile/vertical_piping_solution/vps_input_profile.py b/koswat/dike_reinforcements/input_profile/vertical_piping_solution/vps_input_profile.py index ada7d4c4..0254f22d 100644 --- a/koswat/dike_reinforcements/input_profile/vertical_piping_solution/vps_input_profile.py +++ b/koswat/dike_reinforcements/input_profile/vertical_piping_solution/vps_input_profile.py @@ -15,5 +15,5 @@ def reinforcement_domain_name(self) -> str: return "Verticale piping oplossing" @property - def grondprijs(self) -> float: - return self.grondprijs_bebouwd + def ground_price(self) -> float: + return self.ground_price_builtup diff --git a/koswat/dike_reinforcements/input_profile/vertical_piping_solution/vps_input_profile_calculation.py b/koswat/dike_reinforcements/input_profile/vertical_piping_solution/vps_input_profile_calculation.py index f5268c80..ac73d981 100644 --- a/koswat/dike_reinforcements/input_profile/vertical_piping_solution/vps_input_profile_calculation.py +++ b/koswat/dike_reinforcements/input_profile/vertical_piping_solution/vps_input_profile_calculation.py @@ -35,22 +35,24 @@ def _calculate_new_input_profile( ) -> KoswatInputProfileBase: _new_data = VPSInputProfile() _new_data.dike_section = base_data.dike_section - _new_data.buiten_maaiveld = base_data.buiten_maaiveld - _new_data.buiten_talud = scenario.buiten_talud - _new_data.buiten_berm_hoogte = base_data.buiten_berm_hoogte - _new_data.buiten_berm_breedte = base_data.buiten_berm_breedte - _new_data.kruin_breedte = scenario.kruin_breedte - _new_data.kruin_hoogte = self._calculate_new_kruin_hoogte(base_data, scenario) - _new_data.binnen_maaiveld = base_data.binnen_maaiveld - _new_data.binnen_talud = self._calculate_new_binnen_talud(base_data, scenario) - _new_data.binnen_berm_breedte = vps_settings.binnen_berm_breedte_vps - _new_data.binnen_berm_hoogte = self._calculate_new_binnen_berm_hoogte( + _new_data.waterside_ground_level = base_data.waterside_ground_level + _new_data.waterside_slope = scenario.waterside_slope + _new_data.waterside_berm_height = base_data.waterside_berm_height + _new_data.waterside_berm_width = base_data.waterside_berm_width + _new_data.crest_width = scenario.crest_width + _new_data.crest_height = self._calculate_new_crest_height(base_data, scenario) + _new_data.polderside_ground_level = base_data.polderside_ground_level + _new_data.polderside_slope = self._calculate_new_polderside_slope( + base_data, scenario + ) + _new_data.polderside_berm_width = vps_settings.polderside_berm_width_vps + _new_data.polderside_berm_height = self._calculate_new_polderside_berm_height( base_data, _new_data, scenario ) - _new_data.grondprijs_bebouwd = base_data.grondprijs_bebouwd - _new_data.grondprijs_onbebouwd = base_data.grondprijs_onbebouwd - _new_data.factor_zetting = base_data.factor_zetting - _new_data.pleistoceen = base_data.pleistoceen + _new_data.ground_price_builtup = base_data.ground_price_builtup + _new_data.ground_price_unbuilt = base_data.ground_price_unbuilt + _new_data.factor_settlement = base_data.factor_settlement + _new_data.pleistocene = base_data.pleistocene _new_data.aquifer = base_data.aquifer _new_data.construction_type = ConstructionTypeEnum.VZG _new_data.soil_surtax_factor = vps_settings.soil_surtax_factor diff --git a/koswat/dike_reinforcements/reinforcement_profile/standard/standard_reinforcement_profile_builder.py b/koswat/dike_reinforcements/reinforcement_profile/standard/standard_reinforcement_profile_builder.py index 15bdddc0..14f46e1f 100644 --- a/koswat/dike_reinforcements/reinforcement_profile/standard/standard_reinforcement_profile_builder.py +++ b/koswat/dike_reinforcements/reinforcement_profile/standard/standard_reinforcement_profile_builder.py @@ -76,7 +76,8 @@ def _get_reinforcement_layers_wrapper( self, profile_points: CharacteristicPoints ) -> ReinforcementLayersWrapper: _unchanged_outside_slope = ( - self.scenario.buiten_talud == self.base_profile.input_data.buiten_talud + self.scenario.waterside_slope + == self.base_profile.input_data.waterside_slope ) _layers_builder = ( StandardReinforcementLayersWrapperBuilder() @@ -94,6 +95,6 @@ def _get_characteristic_points( _char_points_builder = CharacteristicPointsBuilder() _char_points_builder.input_profile = input_profile _char_points_builder.p4_x_coordinate = ( - self.scenario.d_h * self.scenario.buiten_talud + self.scenario.d_h * self.scenario.waterside_slope ) return _char_points_builder.build() diff --git a/koswat/strategies/README.md b/koswat/strategies/README.md index b8433b70..8309f17f 100644 --- a/koswat/strategies/README.md +++ b/koswat/strategies/README.md @@ -23,7 +23,7 @@ This modules contains the logic to choose which measure will be applied for a gi - `StrategyReinforcementInput`, contains the reinforcement types that are relevant to the strategy, as they were selected for one or more locations included in the strategy. - reinforcement_type (`Type[ReinforcementProfileProtocol]`), the mapped reinforcement type. - base_costs (`float`), the costs only related to the reinforcement's required space (thus excluding infrastructure costs). - - ground_level_surface (`float`), profile's width from outside (waterside) crest point. + - ground_level_surface (`float`), profile's width from waterside crest point. - `StrategyLocationReinforcement`, represents a mapped location to a selected measure. - location (`PointSurroundings`), a point (meter) in the dike traject. diff --git a/tests/acceptance_scenarios/koswat_input_profile_base_cases.py b/tests/acceptance_scenarios/koswat_input_profile_base_cases.py index 3f066068..6afbcbea 100644 --- a/tests/acceptance_scenarios/koswat_input_profile_base_cases.py +++ b/tests/acceptance_scenarios/koswat_input_profile_base_cases.py @@ -7,58 +7,58 @@ class InputProfileCases(CasesProtocol): default = KoswatInputProfileBase( dike_section="test_data", - buiten_maaiveld=0, - buiten_talud=3, - buiten_berm_hoogte=0, - buiten_berm_breedte=0, - kruin_hoogte=6, - kruin_breedte=5, - binnen_talud=3, - binnen_berm_hoogte=0, - binnen_berm_breedte=0, - binnen_maaiveld=0, - grondprijs_bebouwd=150, - grondprijs_onbebouwd=10, - factor_zetting=1.2, - pleistoceen=-5, + waterside_ground_level=0, + waterside_slope=3, + waterside_berm_height=0, + waterside_berm_width=0, + crest_height=6, + crest_width=5, + polderside_slope=3, + polderside_berm_height=0, + polderside_berm_width=0, + polderside_ground_level=0, + ground_price_builtup=150, + ground_price_unbuilt=10, + factor_settlement=1.2, + pleistocene=-5, aquifer=-2, ) profile_case_2 = KoswatInputProfileBase( dike_section="test_data", - buiten_maaiveld=0, - buiten_talud=4, - buiten_berm_hoogte=0, - buiten_berm_breedte=0, - kruin_hoogte=6.5, - kruin_breedte=5, - binnen_talud=5.54, - binnen_berm_hoogte=2.6, - binnen_berm_breedte=54, - binnen_maaiveld=0, - grondprijs_bebouwd=150, - grondprijs_onbebouwd=10, - factor_zetting=1.2, - pleistoceen=-5, + waterside_ground_level=0, + waterside_slope=4, + waterside_berm_height=0, + waterside_berm_width=0, + crest_height=6.5, + crest_width=5, + polderside_slope=5.54, + polderside_berm_height=2.6, + polderside_berm_width=54, + polderside_ground_level=0, + ground_price_builtup=150, + ground_price_unbuilt=10, + factor_settlement=1.2, + pleistocene=-5, aquifer=-2, ) infra = KoswatInputProfileBase( dike_section="test_data", - buiten_maaiveld=0, - buiten_talud=3, - buiten_berm_hoogte=0, - buiten_berm_breedte=0, - kruin_hoogte=6, - kruin_breedte=8, - binnen_talud=3, - binnen_berm_hoogte=0, - binnen_berm_breedte=0, - binnen_maaiveld=0, - grondprijs_bebouwd=150, - grondprijs_onbebouwd=10, - factor_zetting=1.2, - pleistoceen=-5, + waterside_ground_level=0, + waterside_slope=3, + waterside_berm_height=0, + waterside_berm_width=0, + crest_height=6, + crest_width=8, + polderside_slope=3, + polderside_berm_height=0, + polderside_berm_width=0, + polderside_ground_level=0, + ground_price_builtup=150, + ground_price_unbuilt=10, + factor_settlement=1.2, + pleistocene=-5, aquifer=-2, ) @@ -68,57 +68,57 @@ class InputProfileCases(CasesProtocol): class AcceptanceTestInputProfileCases(CasesProtocol): profile_dijk1 = KoswatInputProfileBase( dike_section="dijk1", - buiten_maaiveld=0, - buiten_talud=3, - buiten_berm_hoogte=0, - buiten_berm_breedte=0, - kruin_hoogte=6, - kruin_breedte=5, - binnen_talud=3, - binnen_berm_hoogte=0, - binnen_berm_breedte=0, - binnen_maaiveld=0, - grondprijs_bebouwd=150, - grondprijs_onbebouwd=10, - factor_zetting=1.2, - pleistoceen=-5, + waterside_ground_level=0, + waterside_slope=3, + waterside_berm_height=0, + waterside_berm_width=0, + crest_height=6, + crest_width=5, + polderside_slope=3, + polderside_berm_height=0, + polderside_berm_width=0, + polderside_ground_level=0, + ground_price_builtup=150, + ground_price_unbuilt=10, + factor_settlement=1.2, + pleistocene=-5, aquifer=-2, ) profile_dijk2 = KoswatInputProfileBase( dike_section="dijk2", - buiten_maaiveld=-2, - buiten_talud=3, - buiten_berm_hoogte=-2, - buiten_berm_breedte=0, - kruin_hoogte=6, - kruin_breedte=5, - binnen_talud=3, - binnen_berm_hoogte=0, - binnen_berm_breedte=0, - binnen_maaiveld=0, - grondprijs_bebouwd=150, - grondprijs_onbebouwd=10, - factor_zetting=1.2, - pleistoceen=-5, + waterside_ground_level=-2, + waterside_slope=3, + waterside_berm_height=-2, + waterside_berm_width=0, + crest_height=6, + crest_width=5, + polderside_slope=3, + polderside_berm_height=0, + polderside_berm_width=0, + polderside_ground_level=0, + ground_price_builtup=150, + ground_price_unbuilt=10, + factor_settlement=1.2, + pleistocene=-5, aquifer=-2, ) profile_dijk3 = KoswatInputProfileBase( dike_section="dijk3", - buiten_maaiveld=0, - buiten_talud=3, - buiten_berm_hoogte=0, - buiten_berm_breedte=0, - kruin_hoogte=6, - kruin_breedte=5, - binnen_talud=3, - binnen_berm_hoogte=-2, - binnen_berm_breedte=0, - binnen_maaiveld=-2, - grondprijs_bebouwd=150, - grondprijs_onbebouwd=10, - factor_zetting=1.2, - pleistoceen=-5, + waterside_ground_level=0, + waterside_slope=3, + waterside_berm_height=0, + waterside_berm_width=0, + crest_height=6, + crest_width=5, + polderside_slope=3, + polderside_berm_height=-2, + polderside_berm_width=0, + polderside_ground_level=-2, + ground_price_builtup=150, + ground_price_unbuilt=10, + factor_settlement=1.2, + pleistocene=-5, aquifer=-2, ) diff --git a/tests/acceptance_scenarios/koswat_scenario_test_cases.py b/tests/acceptance_scenarios/koswat_scenario_test_cases.py index f3a7bfe4..2d6fc380 100644 --- a/tests/acceptance_scenarios/koswat_scenario_test_cases.py +++ b/tests/acceptance_scenarios/koswat_scenario_test_cases.py @@ -9,27 +9,27 @@ class ScenarioCases(CasesProtocol): d_h=1, d_s=10, d_p=30, - kruin_breedte=5, + crest_width=5, ) scenario_2 = KoswatScenario( d_h=0.5, d_s=20, d_p=80, - kruin_breedte=5, - buiten_talud=4, + crest_width=5, + waterside_slope=4, ) scenario_3 = KoswatScenario( d_h=2, d_s=10, d_p=30, - kruin_breedte=5, - buiten_talud=3, + crest_width=5, + waterside_slope=3, ) scenario_infra = KoswatScenario( d_h=0, d_s=20, d_p=50, - kruin_breedte=8, + crest_width=8, ) cases = [ @@ -46,8 +46,8 @@ class ScenarioCasesAB(CasesProtocol): d_h=0.5, d_s=0, d_p=0, - kruin_breedte=5, - buiten_talud=3, + crest_width=5, + waterside_slope=3, ), KoswatScenario( scenario_name="1b_ds", diff --git a/tests/configuration/io/ini/test_koswat_section_scenarios_ini_fom.py b/tests/configuration/io/ini/test_koswat_section_scenarios_ini_fom.py index fbe79a8d..e8ec2286 100644 --- a/tests/configuration/io/ini/test_koswat_section_scenarios_ini_fom.py +++ b/tests/configuration/io/ini/test_koswat_section_scenarios_ini_fom.py @@ -24,8 +24,8 @@ def _validate_test_section_scenario( assert ini_fom.d_h == 0.1 assert ini_fom.d_s == 1.2 assert ini_fom.d_p == 2.3 - assert ini_fom.buiten_talud == 3.4 - assert ini_fom.kruin_breedte == 4.5 + assert ini_fom.waterside_slope == 3.4 + assert ini_fom.crest_width == 4.5 class TestKoswatSectionScenarioFom: diff --git a/tests/configuration/io/ini/test_read_ini_configurations.py b/tests/configuration/io/ini/test_read_ini_configurations.py index d6dc989c..a35da40c 100644 --- a/tests/configuration/io/ini/test_read_ini_configurations.py +++ b/tests/configuration/io/ini/test_read_ini_configurations.py @@ -78,46 +78,45 @@ def test_koswat_ini_read_general_ini(self): assert isinstance(_ini_fom, KoswatGeneralIniFom) # Analysis section - assert isinstance(_ini_fom.analyse_section_fom, AnalysisSectionFom) + assert isinstance(_ini_fom.analysis_section, AnalysisSectionFom) # These paths are not included in the test dir so None will be mapped in the FOM. - assert _ini_fom.analyse_section_fom.dike_selection_txt_file == Path( + assert _ini_fom.analysis_section.dike_selection_txt_file == Path( "c:\\fake_drive\\Invoer\\ini files\\DijksectieSelectie.txt" ) - assert _ini_fom.analyse_section_fom.dike_section_location_shp_file == Path( + assert _ini_fom.analysis_section.dike_section_location_shp_file == Path( "c:\\fake_drive\\Invoer\\Dijkringlijnen_KOSWAT_2017_WV21_DR10.shp" ) - assert _ini_fom.analyse_section_fom.input_profiles_csv_file == Path( + assert _ini_fom.analysis_section.input_profiles_csv_file == Path( "c:\\fake_drive\\Invoer\\InputPerDijkvak_WV21_KOSWAT_v2022_DR10.csv" ) - assert _ini_fom.analyse_section_fom.scenarios_ini_file == Path( + assert _ini_fom.analysis_section.scenarios_ini_file == Path( "c:\\fake_drive\\Invoer\\Scenarios" ) - assert _ini_fom.analyse_section_fom.costs_ini_file == Path( + assert _ini_fom.analysis_section.costs_ini_file == Path( "c:\\fake_drive\\Invoer\\ini files\\Eenheidsprijzen2017.ini" ) - assert _ini_fom.analyse_section_fom.analysis_output_dir == Path( + assert _ini_fom.analysis_section.analysis_output_dir == Path( "c:\\fake_drive\\Uitvoer" ) - assert _ini_fom.analyse_section_fom.include_taxes == True + assert _ini_fom.analysis_section.include_taxes == True # Dijkprofiel section - assert isinstance(_ini_fom.dike_profile_section_fom, DikeProfileSectionFom) - assert _ini_fom.dike_profile_section_fom.thickness_grass_layer == 0.3 - assert _ini_fom.dike_profile_section_fom.thickness_clay_layer == 0.5 + assert isinstance(_ini_fom.dike_profile_section, DikeProfileSectionFom) + assert _ini_fom.dike_profile_section.thickness_grass_layer == 0.3 + assert _ini_fom.dike_profile_section.thickness_clay_layer == 0.5 # Grondmaatregel section - assert isinstance(_ini_fom.grondmaatregel_section, SoilReinforcementSectionFom) + assert isinstance(_ini_fom.soil_measure_section, SoilReinforcementSectionFom) assert ( - _ini_fom.grondmaatregel_section.soil_surtax_factor - == SurtaxFactorEnum.NORMAAL + _ini_fom.soil_measure_section.soil_surtax_factor == SurtaxFactorEnum.NORMAAL ) assert ( - _ini_fom.grondmaatregel_section.land_purchase_surtax_factor + _ini_fom.soil_measure_section.land_purchase_surtax_factor == SurtaxFactorEnum.NORMAAL ) - assert _ini_fom.grondmaatregel_section.min_bermhoogte == 0.5 - assert _ini_fom.grondmaatregel_section.max_bermhoogte_factor == 0.4 - assert _ini_fom.grondmaatregel_section.factor_toename_bermhoogte == 0.05 + assert _ini_fom.soil_measure_section.min_berm_height == 0.5 + assert _ini_fom.soil_measure_section.max_berm_height_factor == 0.4 + assert _ini_fom.soil_measure_section.factor_increase_berm_height == 0.05 # Verticale piping oplossing section assert isinstance(_ini_fom.vps_section, VPSReinforcementSectionFom) @@ -126,60 +125,62 @@ def test_koswat_ini_read_general_ini(self): _ini_fom.vps_section.constructive_surtax_factor == SurtaxFactorEnum.NORMAAL ) assert ( - _ini_fom.grondmaatregel_section.land_purchase_surtax_factor + _ini_fom.soil_measure_section.land_purchase_surtax_factor == SurtaxFactorEnum.NORMAAL ) - assert _ini_fom.vps_section.binnen_berm_breedte_vps == 10 + assert _ini_fom.vps_section.polderside_berm_width_vps == 10 # Kwelscherm section assert isinstance( - _ini_fom.kwelscherm_section, PipingwallReinforcementSectionFom + _ini_fom.piping_wall_section, PipingwallReinforcementSectionFom ) assert ( - _ini_fom.kwelscherm_section.soil_surtax_factor == SurtaxFactorEnum.NORMAAL + _ini_fom.piping_wall_section.soil_surtax_factor == SurtaxFactorEnum.NORMAAL ) assert ( - _ini_fom.stabiliteitswand_section.constructive_surtax_factor + _ini_fom.stability_wall_section.constructive_surtax_factor == SurtaxFactorEnum.NORMAAL ) assert ( - _ini_fom.kwelscherm_section.land_purchase_surtax_factor + _ini_fom.piping_wall_section.land_purchase_surtax_factor == SurtaxFactorEnum.NORMAAL ) - assert _ini_fom.kwelscherm_section.min_lengte_kwelscherm == 4 - assert _ini_fom.kwelscherm_section.overgang_cbwand_damwand == 99 - assert _ini_fom.kwelscherm_section.max_lengte_kwelscherm == 25 + assert _ini_fom.piping_wall_section.min_length_piping_wall == 4 + assert _ini_fom.piping_wall_section.transition_cbwall_sheetpile == 99 + assert _ini_fom.piping_wall_section.max_length_piping_wall == 25 # Stabiliteitswand section assert isinstance( - _ini_fom.stabiliteitswand_section, StabilitywallReinforcementSectionFom + _ini_fom.stability_wall_section, StabilitywallReinforcementSectionFom ) assert ( - _ini_fom.stabiliteitswand_section.soil_surtax_factor + _ini_fom.stability_wall_section.soil_surtax_factor == SurtaxFactorEnum.MOEILIJK ) assert ( - _ini_fom.stabiliteitswand_section.constructive_surtax_factor + _ini_fom.stability_wall_section.constructive_surtax_factor == SurtaxFactorEnum.NORMAAL ) assert ( - _ini_fom.stabiliteitswand_section.land_purchase_surtax_factor + _ini_fom.stability_wall_section.land_purchase_surtax_factor == SurtaxFactorEnum.MOEILIJK ) - assert _ini_fom.stabiliteitswand_section.versteiling_binnentalud == 2 - assert _ini_fom.stabiliteitswand_section.min_lengte_stabiliteitswand == 5 - assert _ini_fom.stabiliteitswand_section.overgang_damwand_diepwand == 20 - assert _ini_fom.stabiliteitswand_section.max_lengte_stabiliteitswand == 25 + assert _ini_fom.stability_wall_section.steepening_polderside_slope == 2 + assert _ini_fom.stability_wall_section.min_length_stability_wall == 5 + assert _ini_fom.stability_wall_section.transition_sheetpile_diaphragm_wall == 20 + assert _ini_fom.stability_wall_section.max_length_stability_wall == 25 # Kistdam section - assert isinstance(_ini_fom.kistdam_section, CofferdamReinforcementSectionFom) - assert _ini_fom.kistdam_section.soil_surtax_factor == SurtaxFactorEnum.MOEILIJK + assert isinstance(_ini_fom.cofferdam_section, CofferdamReinforcementSectionFom) + assert ( + _ini_fom.cofferdam_section.soil_surtax_factor == SurtaxFactorEnum.MOEILIJK + ) assert ( - _ini_fom.kistdam_section.constructive_surtax_factor + _ini_fom.cofferdam_section.constructive_surtax_factor == SurtaxFactorEnum.MOEILIJK ) - assert _ini_fom.kistdam_section.min_lengte_kistdam == 5 - assert _ini_fom.kistdam_section.max_lengte_kistdam == 25 + assert _ini_fom.cofferdam_section.min_length_cofferdam == 5 + assert _ini_fom.cofferdam_section.max_length_cofferdam == 25 # Omgeving section assert isinstance(_ini_fom.surroundings_section, SurroundingsSectionFom) @@ -187,27 +188,30 @@ def test_koswat_ini_read_general_ini(self): assert _ini_fom.surroundings_section.surroundings_database_dir == Path( "c:\\fake_drive\\Invoer\\Omgevingsanalyses" ) - assert _ini_fom.surroundings_section.constructieafstand == 50 - assert _ini_fom.surroundings_section.constructieovergang == 10 - assert _ini_fom.surroundings_section.buitendijks == False - assert _ini_fom.surroundings_section.bebouwing == True - assert _ini_fom.surroundings_section.spoorwegen == False - assert _ini_fom.surroundings_section.water == False + assert _ini_fom.surroundings_section.construction_distance == 50 + assert _ini_fom.surroundings_section.construction_buffer == 10 + assert _ini_fom.surroundings_section.waterside is False + assert _ini_fom.surroundings_section.buildings is True + assert _ini_fom.surroundings_section.railways is False + assert _ini_fom.surroundings_section.waters is False # Infrastructuur section assert isinstance(_ini_fom.infrastructuur_section, InfrastructureSectionFom) - assert _ini_fom.infrastructuur_section.infrastructuur == False + assert _ini_fom.infrastructuur_section.infrastructure == False assert ( - _ini_fom.infrastructuur_section.opslagfactor_wegen + _ini_fom.infrastructuur_section.surtax_factor_roads == SurtaxFactorEnum.NORMAAL ) - assert _ini_fom.infrastructuur_section.infrakosten_0dh == InfraCostsEnum.GEEN - assert _ini_fom.infrastructuur_section.buffer_buitendijks == 0 - assert _ini_fom.infrastructuur_section.wegen_klasse2_breedte == 2 - assert _ini_fom.infrastructuur_section.wegen_klasse24_breedte == 5 - assert _ini_fom.infrastructuur_section.wegen_klasse47_breedte == 8 - assert _ini_fom.infrastructuur_section.wegen_klasse7_breedte == 12 - assert _ini_fom.infrastructuur_section.wegen_onbekend_breedte == 8 + assert ( + _ini_fom.infrastructuur_section.infrastructure_costs_0dh + == InfraCostsEnum.GEEN + ) + assert _ini_fom.infrastructuur_section.buffer_waterside == 0 + assert _ini_fom.infrastructuur_section.roads_class2_width == 2 + assert _ini_fom.infrastructuur_section.roads_class24_width == 5 + assert _ini_fom.infrastructuur_section.roads_class47_width == 8 + assert _ini_fom.infrastructuur_section.roads_class7_width == 12 + assert _ini_fom.infrastructuur_section.roads_unknown_width == 8 # 1. Define test data. _test_file_path = test_ini_reader_data / "koswat_costs.ini" @@ -222,73 +226,75 @@ def test_koswat_ini_read_general_ini(self): # Eenheidsprijzen assert isinstance(_ini_fom.unit_prices_section, UnitPricesSectionFom) - assert _ini_fom.unit_prices_section.prijspeil == 2017 + assert _ini_fom.unit_prices_section.price_level == 2017 # KostenDijkProfiel assert isinstance( _ini_fom.dike_profile_costs_section, DikeProfileCostsSectionFom ) - assert _ini_fom.dike_profile_costs_section.aanleg_graslaag_m3 == 12.44 - assert _ini_fom.dike_profile_costs_section.aanleg_kleilaag_m3 == 18.05 - assert _ini_fom.dike_profile_costs_section.aanleg_kern_m3 == 10.98 - assert _ini_fom.dike_profile_costs_section.hergebruik_graslaag_m3 == 6.04 - assert _ini_fom.dike_profile_costs_section.hergebruik_kern_m3 == 4.67 - assert _ini_fom.dike_profile_costs_section.afvoeren_materiaal_m3 == 7.07 - assert _ini_fom.dike_profile_costs_section.profileren_graslaag_m2 == 0.88 - assert _ini_fom.dike_profile_costs_section.profileren_kleilaag_m2 == 0.65 - assert _ini_fom.dike_profile_costs_section.profileren_kern_m2 == 0.60 - assert _ini_fom.dike_profile_costs_section.bewerken_maaiveld_m2 == 0.25 + assert _ini_fom.dike_profile_costs_section.construction_grass_layer_m3 == 12.44 + assert _ini_fom.dike_profile_costs_section.construction_clay_layer_m3 == 18.05 + assert _ini_fom.dike_profile_costs_section.construction_core_m3 == 10.98 + assert _ini_fom.dike_profile_costs_section.reuse_grass_layer_m3 == 6.04 + assert _ini_fom.dike_profile_costs_section.reuse_core_m3 == 4.67 + assert _ini_fom.dike_profile_costs_section.dispose_material_m3 == 7.07 + assert _ini_fom.dike_profile_costs_section.profile_grass_layer_m2 == 0.88 + assert _ini_fom.dike_profile_costs_section.profile_clay_layer_m2 == 0.65 + assert _ini_fom.dike_profile_costs_section.profile_core_m2 == 0.60 + assert ( + _ini_fom.dike_profile_costs_section.process_ground_level_surface_m2 == 0.25 + ) # KostenInfrastructuur assert isinstance( _ini_fom.infrastructure_costs_section, InfrastructureCostsSectionFom ) - assert _ini_fom.infrastructure_costs_section.wegen_klasse2_verwijderen == 7.40 - assert _ini_fom.infrastructure_costs_section.wegen_klasse24_verwijderen == 9.64 - assert _ini_fom.infrastructure_costs_section.wegen_klasse47_verwijderen == 23.99 - assert _ini_fom.infrastructure_costs_section.wegen_klasse7_verwijderen == 38.77 - assert _ini_fom.infrastructure_costs_section.wegen_onbekend_verwijderen == 9.64 - assert _ini_fom.infrastructure_costs_section.wegen_klasse2_aanleg == 24.31 - assert _ini_fom.infrastructure_costs_section.wegen_klasse24_aanleg == 32.30 - assert _ini_fom.infrastructure_costs_section.wegen_klasse47_aanleg == 31.85 - assert _ini_fom.infrastructure_costs_section.wegen_klasse7_aanleg == 36.64 - assert _ini_fom.infrastructure_costs_section.wegen_onbekend_aanleg == 32.30 + assert _ini_fom.infrastructure_costs_section.roads_class2_removal == 7.40 + assert _ini_fom.infrastructure_costs_section.roads_class24_removal == 9.64 + assert _ini_fom.infrastructure_costs_section.roads_class47_removal == 23.99 + assert _ini_fom.infrastructure_costs_section.roads_class7_removal == 38.77 + assert _ini_fom.infrastructure_costs_section.roads_unknown_removal == 9.64 + assert _ini_fom.infrastructure_costs_section.roads_class2_construction == 24.31 + assert _ini_fom.infrastructure_costs_section.roads_class24_construction == 32.30 + assert _ini_fom.infrastructure_costs_section.roads_class47_construction == 31.85 + assert _ini_fom.infrastructure_costs_section.roads_class7_construction == 36.64 + assert _ini_fom.infrastructure_costs_section.roads_unknown_construction == 32.30 # KostenOpslagFactorenInclBTW assert isinstance( _ini_fom.surtax_costs_incl_tax_section, SurtaxCostsSectionFom, ) - assert _ini_fom.surtax_costs_incl_tax_section.grond_makkelijk == 1.714 - assert _ini_fom.surtax_costs_incl_tax_section.grond_normaal == 1.953 - assert _ini_fom.surtax_costs_incl_tax_section.grond_moeilijk == 2.177 - assert _ini_fom.surtax_costs_incl_tax_section.constructief_makkelijk == 2.097 - assert _ini_fom.surtax_costs_incl_tax_section.constructief_normaal == 2.413 - assert _ini_fom.surtax_costs_incl_tax_section.constructief_moeilijk == 2.690 - assert _ini_fom.surtax_costs_incl_tax_section.wegen_makkelijk == 2.097 - assert _ini_fom.surtax_costs_incl_tax_section.wegen_normaal == 2.413 - assert _ini_fom.surtax_costs_incl_tax_section.wegen_moeilijk == 2.690 - assert _ini_fom.surtax_costs_incl_tax_section.grondaankoop_makkelijk == 1.292 - assert _ini_fom.surtax_costs_incl_tax_section.grondaankoop_normaal == 1.412 - assert _ini_fom.surtax_costs_incl_tax_section.grondaankoop_moeilijk == 1.645 + assert _ini_fom.surtax_costs_incl_tax_section.soil_easy == 1.714 + assert _ini_fom.surtax_costs_incl_tax_section.soil_normal == 1.953 + assert _ini_fom.surtax_costs_incl_tax_section.soil_hard == 2.177 + assert _ini_fom.surtax_costs_incl_tax_section.constructive_easy == 2.097 + assert _ini_fom.surtax_costs_incl_tax_section.constructive_normal == 2.413 + assert _ini_fom.surtax_costs_incl_tax_section.constructive_hard == 2.690 + assert _ini_fom.surtax_costs_incl_tax_section.road_easy == 2.097 + assert _ini_fom.surtax_costs_incl_tax_section.roads_normal == 2.413 + assert _ini_fom.surtax_costs_incl_tax_section.roads_hard == 2.690 + assert _ini_fom.surtax_costs_incl_tax_section.land_purchase_easy == 1.292 + assert _ini_fom.surtax_costs_incl_tax_section.land_purchase_normal == 1.412 + assert _ini_fom.surtax_costs_incl_tax_section.land_purchase_hard == 1.645 # KostenOpslagFactorenExclBTW assert isinstance( _ini_fom.surtax_costs_excl_tax_section, SurtaxCostsSectionFom, ) - assert _ini_fom.surtax_costs_excl_tax_section.grond_makkelijk == 1.421 - assert _ini_fom.surtax_costs_excl_tax_section.grond_normaal == 1.621 - assert _ini_fom.surtax_costs_excl_tax_section.grond_moeilijk == 1.810 - assert _ini_fom.surtax_costs_excl_tax_section.constructief_makkelijk == 1.741 - assert _ini_fom.surtax_costs_excl_tax_section.constructief_normaal == 2.003 - assert _ini_fom.surtax_costs_excl_tax_section.constructief_moeilijk == 2.233 - assert _ini_fom.surtax_costs_excl_tax_section.wegen_makkelijk == 1.741 - assert _ini_fom.surtax_costs_excl_tax_section.wegen_normaal == 2.003 - assert _ini_fom.surtax_costs_excl_tax_section.wegen_moeilijk == 2.233 - assert _ini_fom.surtax_costs_excl_tax_section.grondaankoop_makkelijk == 1.292 - assert _ini_fom.surtax_costs_excl_tax_section.grondaankoop_normaal == 1.412 - assert _ini_fom.surtax_costs_excl_tax_section.grondaankoop_moeilijk == 1.645 + assert _ini_fom.surtax_costs_excl_tax_section.soil_easy == 1.421 + assert _ini_fom.surtax_costs_excl_tax_section.soil_normal == 1.621 + assert _ini_fom.surtax_costs_excl_tax_section.soil_hard == 1.810 + assert _ini_fom.surtax_costs_excl_tax_section.constructive_easy == 1.741 + assert _ini_fom.surtax_costs_excl_tax_section.constructive_normal == 2.003 + assert _ini_fom.surtax_costs_excl_tax_section.constructive_hard == 2.233 + assert _ini_fom.surtax_costs_excl_tax_section.road_easy == 1.741 + assert _ini_fom.surtax_costs_excl_tax_section.roads_normal == 2.003 + assert _ini_fom.surtax_costs_excl_tax_section.roads_hard == 2.233 + assert _ini_fom.surtax_costs_excl_tax_section.land_purchase_easy == 1.292 + assert _ini_fom.surtax_costs_excl_tax_section.land_purchase_normal == 1.412 + assert _ini_fom.surtax_costs_excl_tax_section.land_purchase_hard == 1.645 # KostenCBwand assert isinstance( @@ -303,36 +309,36 @@ def test_koswat_ini_read_general_ini(self): # KostenDamwandOnverankerd assert isinstance( - _ini_fom.construction_cost_damwall_unanchored, + _ini_fom.construction_cost_sheetpile_unanchored, ConstructionCostsSectionFom, ) - assert _ini_fom.construction_cost_damwall_unanchored.c_factor == 9.298 - assert _ini_fom.construction_cost_damwall_unanchored.d_factor == 132.239 - assert _ini_fom.construction_cost_damwall_unanchored.z_factor == 103.628 - assert _ini_fom.construction_cost_damwall_unanchored.f_factor == 0 - assert _ini_fom.construction_cost_damwall_unanchored.g_factor == 0 + assert _ini_fom.construction_cost_sheetpile_unanchored.c_factor == 9.298 + assert _ini_fom.construction_cost_sheetpile_unanchored.d_factor == 132.239 + assert _ini_fom.construction_cost_sheetpile_unanchored.z_factor == 103.628 + assert _ini_fom.construction_cost_sheetpile_unanchored.f_factor == 0 + assert _ini_fom.construction_cost_sheetpile_unanchored.g_factor == 0 # KostenDamwandVerankerd assert isinstance( - _ini_fom.construction_cost_damwall_anchored, + _ini_fom.construction_cost_sheetpile_anchored, ConstructionCostsSectionFom, ) - assert _ini_fom.construction_cost_damwall_anchored.c_factor == 9.298 - assert _ini_fom.construction_cost_damwall_anchored.d_factor == 150.449 - assert _ini_fom.construction_cost_damwall_anchored.z_factor == 1304.455 - assert _ini_fom.construction_cost_damwall_anchored.f_factor == 0 - assert _ini_fom.construction_cost_damwall_anchored.g_factor == 0 + assert _ini_fom.construction_cost_sheetpile_anchored.c_factor == 9.298 + assert _ini_fom.construction_cost_sheetpile_anchored.d_factor == 150.449 + assert _ini_fom.construction_cost_sheetpile_anchored.z_factor == 1304.455 + assert _ini_fom.construction_cost_sheetpile_anchored.f_factor == 0 + assert _ini_fom.construction_cost_sheetpile_anchored.g_factor == 0 # KostenDiepwand assert isinstance( - _ini_fom.construction_cost_deep_wall, + _ini_fom.construction_cost_diaphragm_wall, ConstructionCostsSectionFom, ) - assert _ini_fom.construction_cost_deep_wall.c_factor == 0 - assert _ini_fom.construction_cost_deep_wall.d_factor == 0 - assert _ini_fom.construction_cost_deep_wall.z_factor == 0 - assert _ini_fom.construction_cost_deep_wall.f_factor == 281.176 - assert _ini_fom.construction_cost_deep_wall.g_factor == 1.205 + assert _ini_fom.construction_cost_diaphragm_wall.c_factor == 0 + assert _ini_fom.construction_cost_diaphragm_wall.d_factor == 0 + assert _ini_fom.construction_cost_diaphragm_wall.z_factor == 0 + assert _ini_fom.construction_cost_diaphragm_wall.f_factor == 281.176 + assert _ini_fom.construction_cost_diaphragm_wall.g_factor == 1.205 # KostenKistdam assert isinstance( @@ -364,12 +370,12 @@ def test_koswat_ini_read_scenario_ini(self): assert _ini_fom.section_scenarios[0].d_h == 0.5 assert _ini_fom.section_scenarios[0].d_s == 10 assert _ini_fom.section_scenarios[0].d_p == 50 - assert _ini_fom.section_scenarios[0].buiten_talud == None - assert _ini_fom.section_scenarios[0].kruin_breedte == None + assert _ini_fom.section_scenarios[0].waterside_slope == None + assert _ini_fom.section_scenarios[0].crest_width == None # Scenario 1 assert _ini_fom.section_scenarios[1].d_h == 1 assert _ini_fom.section_scenarios[1].d_s == 15 assert _ini_fom.section_scenarios[1].d_p == 75 - assert _ini_fom.section_scenarios[1].buiten_talud == 4 - assert _ini_fom.section_scenarios[1].kruin_breedte == 10 + assert _ini_fom.section_scenarios[1].waterside_slope == 4 + assert _ini_fom.section_scenarios[1].crest_width == 10 diff --git a/tests/configuration/io/test_koswat_input_profile_list_importer.py b/tests/configuration/io/test_koswat_input_profile_list_importer.py index 2a62db6e..3ee0226d 100644 --- a/tests/configuration/io/test_koswat_input_profile_list_importer.py +++ b/tests/configuration/io/test_koswat_input_profile_list_importer.py @@ -39,18 +39,18 @@ def test_get_koswat_input_profile_base(self): # 3. Verify final expectations. assert isinstance(_input_profile_base, KoswatInputProfileBase) assert _input_profile_base.dike_section == "test_section" - assert _input_profile_base.buiten_maaiveld == 1.1 - assert _input_profile_base.buiten_talud == 2.2 - assert _input_profile_base.buiten_berm_hoogte == 3.3 - assert _input_profile_base.buiten_berm_breedte == 4.4 - assert _input_profile_base.kruin_hoogte == 5.5 - assert _input_profile_base.kruin_breedte == 6.6 - assert _input_profile_base.binnen_talud == 7.7 - assert _input_profile_base.binnen_berm_hoogte == 8.8 - assert _input_profile_base.binnen_berm_breedte == 9.9 - assert _input_profile_base.binnen_maaiveld == 0.0 - assert _input_profile_base.grondprijs_bebouwd == 111 - assert _input_profile_base.grondprijs_onbebouwd == 11 - assert _input_profile_base.factor_zetting == 1.1 - assert _input_profile_base.pleistoceen == -1.1 + assert _input_profile_base.waterside_ground_level == 1.1 + assert _input_profile_base.waterside_slope == 2.2 + assert _input_profile_base.waterside_berm_height == 3.3 + assert _input_profile_base.waterside_berm_width == 4.4 + assert _input_profile_base.crest_height == 5.5 + assert _input_profile_base.crest_width == 6.6 + assert _input_profile_base.polderside_slope == 7.7 + assert _input_profile_base.polderside_berm_height == 8.8 + assert _input_profile_base.polderside_berm_width == 9.9 + assert _input_profile_base.polderside_ground_level == 0.0 + assert _input_profile_base.ground_price_builtup == 111 + assert _input_profile_base.ground_price_unbuilt == 11 + assert _input_profile_base.factor_settlement == 1.1 + assert _input_profile_base.pleistocene == -1.1 assert _input_profile_base.aquifer == -2.2 diff --git a/tests/configuration/io/test_surroundings_wrapper_collection_importer.py b/tests/configuration/io/test_surroundings_wrapper_collection_importer.py index 4e714fb6..b033ccf4 100644 --- a/tests/configuration/io/test_surroundings_wrapper_collection_importer.py +++ b/tests/configuration/io/test_surroundings_wrapper_collection_importer.py @@ -69,15 +69,15 @@ def _get_surroundings_section_fom_fixture( # Yield the surroundings section. # Remember! The database dir is the parent as in theory more - # traject's surroundings are avaiable in said dir. + # traject's surroundings are available in said dir. yield SurroundingsSectionFom( surroundings_database_dir=_temp_dir.parent, - constructieafstand=50, - constructieovergang=10, - buitendijks=True, - bebouwing=True, - spoorwegen=True, - water=True, + construction_distance=50, + construction_buffer=10, + waterside=True, + buildings=True, + railways=True, + waters=True, ) # Remove the temporary directory. @@ -86,15 +86,15 @@ def _get_surroundings_section_fom_fixture( @pytest.fixture(name="infrastructure_section_fom_fixture") def _get_infrastructure_section_fom(self) -> Iterator[InfrastructureSectionFom]: yield InfrastructureSectionFom( - infrastructuur=True, - opslagfactor_wegen=SurtaxFactorEnum.NORMAAL, - infrakosten_0dh=InfraCostsEnum.GEEN, - buffer_buitendijks=0.42, - wegen_klasse2_breedte=2.4, - wegen_klasse24_breedte=4.2, - wegen_klasse47_breedte=24, - wegen_klasse7_breedte=42, - wegen_onbekend_breedte=0.67, + infrastructure=True, + surtax_factor_roads=SurtaxFactorEnum.NORMAAL, + infrastructure_costs_0dh=InfraCostsEnum.GEEN, + buffer_waterside=0.42, + roads_class2_width=2.4, + roads_class24_width=4.2, + roads_class47_width=24, + roads_class7_width=42, + roads_unknown_width=0.67, ) def test_given_valid_surroundings_path_when_import_from_returns_surrounding_wrapper( diff --git a/tests/configuration/settings/costs/test_construction_costs_settings.py b/tests/configuration/settings/costs/test_construction_costs_settings.py index 6919d8a4..afa65391 100644 --- a/tests/configuration/settings/costs/test_construction_costs_settings.py +++ b/tests/configuration/settings/costs/test_construction_costs_settings.py @@ -29,19 +29,19 @@ def _populate_construction_factors( _construction_costs_settings.vzg = _populate_construction_factors( list(range(5)) ) - _construction_costs_settings.cb_damwand = _populate_construction_factors( + _construction_costs_settings.cb_sheetpile = _populate_construction_factors( list(range(5)) ) - _construction_costs_settings.damwand_onverankerd = ( + _construction_costs_settings.sheetpile_unanchored = ( _populate_construction_factors(list(range(5))) ) - _construction_costs_settings.damwand_verankerd = _populate_construction_factors( - list(range(5)) + _construction_costs_settings.sheetpile_anchored = ( + _populate_construction_factors(list(range(5))) ) - _construction_costs_settings.diepwand = _populate_construction_factors( + _construction_costs_settings.diaphragm_wall = _populate_construction_factors( list(range(5)) ) - _construction_costs_settings.kistdam = _populate_construction_factors( + _construction_costs_settings.cofferdam = _populate_construction_factors( list(range(5)) ) @@ -55,7 +55,7 @@ def test_get_construction_factors(self): # 1. Define test data _construction_type = ConstructionTypeEnum.CB_DAMWAND _construction_costs_settings = ConstructionCostsSettings() - _construction_costs_settings.cb_damwand = ConstructionFactors( + _construction_costs_settings.cb_sheetpile = ConstructionFactors( c_factor=0.1, d_factor=1.2, z_factor=2.3, f_factor=3.4, g_factor=4.5 ) diff --git a/tests/cost_report/io/summary/summary_costs/test_summary_costs_csv_exporter.py b/tests/cost_report/io/summary/summary_costs/test_summary_costs_csv_exporter.py index a21105f4..b3af537b 100644 --- a/tests/cost_report/io/summary/summary_costs/test_summary_costs_csv_exporter.py +++ b/tests/cost_report/io/summary/summary_costs/test_summary_costs_csv_exporter.py @@ -61,9 +61,9 @@ def test_summary_cost_csv_exporter_export( New core layer surface (quantity):;0.0;0.0;0.0;0.0 New core layer surface (cost):;0.0;0.0;0.0;0.0 New core layer surface (cost incl surtax):;0.0;0.0;0.0;0.0 -New maaiveld surface (quantity):;0.0;0.0;0.0;0.0 -New maaiveld surface (cost):;0.0;0.0;0.0;0.0 -New maaiveld surface (cost incl surtax):;0.0;0.0;0.0;0.0 +New ground level surface (quantity):;0.0;0.0;0.0;0.0 +New ground level surface (cost):;0.0;0.0;0.0;0.0 +New ground level surface (cost incl surtax):;0.0;0.0;0.0;0.0 Land purchase surface (quantity):;0.0;0.0;0.0;0.0 Land purchase surface (cost):;0.0;0.0;0.0;0.0 Land purchase surface (cost incl surtax):;0.0;0.0;0.0;0.0 diff --git a/tests/cost_report/profile/test_quantity_cost_parameters_builder.py b/tests/cost_report/profile/test_quantity_cost_parameters_builder.py index 72153a90..8a22ce1f 100644 --- a/tests/cost_report/profile/test_quantity_cost_parameters_builder.py +++ b/tests/cost_report/profile/test_quantity_cost_parameters_builder.py @@ -109,7 +109,7 @@ def test__get_land_purchase_cost_parameter(self): _builder.koswat_costs_settings.surtax_costs.land_purchase_normal = 2.0 _builder.reinforced_profile = SoilReinforcementProfile() _builder.reinforced_profile.input_data = SoilInputProfile() - _builder.reinforced_profile.input_data.grondprijs_onbebouwd = 10 + _builder.reinforced_profile.input_data.ground_price_unbuilt = 10 _builder.reinforced_profile.input_data.land_purchase_surtax_factor = ( SurtaxFactorEnum.NORMAAL ) @@ -133,7 +133,7 @@ def test__get_construction_cost_parameter(self): _builder.koswat_costs_settings.surtax_costs = SurtaxCostsSettings() _builder.koswat_costs_settings.surtax_costs.construction_normal = 2.0 _builder.koswat_costs_settings.construction_costs = ConstructionCostsSettings() - _builder.koswat_costs_settings.construction_costs.cb_damwand = ( + _builder.koswat_costs_settings.construction_costs.cb_sheetpile = ( ConstructionFactors( c_factor=0, d_factor=10, z_factor=0, f_factor=0, g_factor=0 ) @@ -180,8 +180,8 @@ def __init__(self) -> None: def _get_mocked_reinforcement(self) -> ReinforcementProfileProtocol: class MockedReinforcementInput(ReinforcementInputProfileProtocol): - grondprijs_bebouwd: float = 0 - grondprijs_onbebouwd: float = 0 + ground_price_builtup: float = 0 + ground_price_unbuilt: float = 0 construction_length: float = 0 construction_type: ConstructionTypeEnum | None = None soil_surtax_factor: SurtaxFactorEnum = SurtaxFactorEnum.NORMAAL @@ -227,7 +227,7 @@ def test__get_quantity_cost_calculator_with_valid_data(self): assert _qcp.new_clay_layer_surface == 4.2 assert _qcp.new_grass_layer_volume == 4.8 assert _qcp.new_grass_layer_surface == 8.4 - assert _qcp.new_maaiveld_surface == 42 + assert _qcp.new_ground_level_surface == 42 assert _qcp.construction_length == 10 def test_build_with_valid_data(self): @@ -261,14 +261,14 @@ def test_build_with_valid_data(self): _costs_settings.dike_profile_costs.profiling_layer_grass_m2 = 0.88 _costs_settings.dike_profile_costs.profiling_layer_clay_m2 = 0.65 _costs_settings.dike_profile_costs.profiling_layer_sand_m2 = 0.60 - _costs_settings.dike_profile_costs.bewerken_maaiveld_m2 = 0.25 + _costs_settings.dike_profile_costs.processing_ground_level_surface_m2 = 0.25 _costs_settings.construction_costs = ConstructionCostsSettings() - _costs_settings.construction_costs.cb_damwand = ConstructionFactors() - _costs_settings.construction_costs.cb_damwand.c_factor = 0 - _costs_settings.construction_costs.cb_damwand.d_factor = 0 - _costs_settings.construction_costs.cb_damwand.z_factor = 999 - _costs_settings.construction_costs.cb_damwand.f_factor = 0 - _costs_settings.construction_costs.cb_damwand.g_factor = 0 + _costs_settings.construction_costs.cb_sheetpile = ConstructionFactors() + _costs_settings.construction_costs.cb_sheetpile.c_factor = 0 + _costs_settings.construction_costs.cb_sheetpile.d_factor = 0 + _costs_settings.construction_costs.cb_sheetpile.z_factor = 999 + _costs_settings.construction_costs.cb_sheetpile.f_factor = 0 + _costs_settings.construction_costs.cb_sheetpile.g_factor = 0 _costs_settings.surtax_costs = SurtaxCostsSettings() # 2. Run test @@ -298,6 +298,6 @@ def evaluate_cost_and_length( evaluate_cost_and_quantity(_qcp.new_grass_layer_surface, 0.88, 8.4) evaluate_cost_and_quantity(_qcp.new_clay_layer_surface, 0.65, 4.2) evaluate_cost_and_quantity(_qcp.new_core_layer_surface, 0.6, 2.1) - evaluate_cost_and_quantity(_qcp.new_maaiveld_surface, 0.25, 42) + evaluate_cost_and_quantity(_qcp.new_ground_level_surface, 0.25, 42) evaluate_cost_and_quantity(_qcp.removed_material_volume, 7.07, 1.2) evaluate_cost_and_length(_qcp.construction_length, 999, 10) diff --git a/tests/dike/input_profile_cases.py b/tests/dike/input_profile_cases.py index 45bfdbc6..9fd405d7 100644 --- a/tests/dike/input_profile_cases.py +++ b/tests/dike/input_profile_cases.py @@ -4,20 +4,20 @@ default_case = KoswatInputProfileBase.from_dict( dict( - buiten_maaiveld=0, - buiten_talud=3, - buiten_berm_hoogte=0, - buiten_berm_breedte=0, - kruin_hoogte=6, - kruin_breedte=5, - binnen_talud=3, - binnen_berm_hoogte=0, - binnen_berm_breedte=0, - binnen_maaiveld=0, - grondprijs_bebouwd=150, - grondprijs_onbebouwd=10, - factor_zetting=1.2, - pleistoceen=-5, + waterside_ground_level=0, + waterside_slope=3, + waterside_berm_height=0, + waterside_berm_width=0, + crest_height=6, + crest_width=5, + polderside_slope=3, + polderside_berm_height=0, + polderside_berm_width=0, + polderside_ground_level=0, + ground_price_builtup=150, + ground_price_unbuilt=10, + factor_settlement=1.2, + pleistocene=-5, aquifer=-2, ) ) diff --git a/tests/dike/surroundings/wrapper/test_infrastructure_surroundings_wrapper.py b/tests/dike/surroundings/wrapper/test_infrastructure_surroundings_wrapper.py index 3c621b92..58e47716 100644 --- a/tests/dike/surroundings/wrapper/test_infrastructure_surroundings_wrapper.py +++ b/tests/dike/surroundings/wrapper/test_infrastructure_surroundings_wrapper.py @@ -34,8 +34,8 @@ def test_initialize(self): ) # Verify unsupported infras are not initialized. - assert not _wrapper.roads_class_2_dikeside - assert not _wrapper.roads_class_7_dikeside - assert not _wrapper.roads_class_24_dikeside - assert not _wrapper.roads_class_47_dikeside - assert not _wrapper.roads_class_unknown_dikeside + assert not _wrapper.roads_class_2_waterside + assert not _wrapper.roads_class_7_waterside + assert not _wrapper.roads_class_24_waterside + assert not _wrapper.roads_class_47_waterside + assert not _wrapper.roads_class_unknown_waterside diff --git a/tests/dike/surroundings/wrapper/test_obstacle_surroundings_wrapper.py b/tests/dike/surroundings/wrapper/test_obstacle_surroundings_wrapper.py index e9853c07..7cce57af 100644 --- a/tests/dike/surroundings/wrapper/test_obstacle_surroundings_wrapper.py +++ b/tests/dike/surroundings/wrapper/test_obstacle_surroundings_wrapper.py @@ -29,9 +29,9 @@ def test_initialize(self): assert isinstance(_wrapper.waters_polderside, SurroundingsObstacle) # Unsupported surroundings are not initialized. - assert not _wrapper.buildings_dikeside - assert not _wrapper.railways_dikeside - assert not _wrapper.waters_dikeside + assert not _wrapper.buildings_waterside + assert not _wrapper.railways_waterside + assert not _wrapper.waters_waterside @pytest.mark.parametrize( "obstacles_distance_list", diff --git a/tests/dike/surroundings/wrapper/test_surroundings_wrapper.py b/tests/dike/surroundings/wrapper/test_surroundings_wrapper.py index bd180513..24f369aa 100644 --- a/tests/dike/surroundings/wrapper/test_surroundings_wrapper.py +++ b/tests/dike/surroundings/wrapper/test_surroundings_wrapper.py @@ -60,25 +60,25 @@ def _get_surroundings_wrapper_with_infrastructure_fixture( # Generate surroundings section File Object Model. _surroundings_settings = SurroundingsSectionFom( surroundings_database_dir=_temp_dir.parent, - constructieafstand=float("nan"), - constructieovergang=float("nan"), - buitendijks=False, - bebouwing=True, - spoorwegen=False, - water=False, + construction_distance=float("nan"), + construction_buffer=float("nan"), + waterside=False, + buildings=True, + railways=False, + waters=False, ) # Generate Infrastructures section file model _infrastructure_settings = InfrastructureSectionFom( - infrastructuur=True, - opslagfactor_wegen=SurtaxFactorEnum.NORMAAL, - infrakosten_0dh=InfraCostsEnum.GEEN, - buffer_buitendijks=0.24, - wegen_klasse2_breedte=1, - wegen_klasse7_breedte=2, - wegen_klasse24_breedte=3, - wegen_klasse47_breedte=4, - wegen_onbekend_breedte=5, + infrastructure=True, + surtax_factor_roads=SurtaxFactorEnum.NORMAAL, + infrastructure_costs_0dh=InfraCostsEnum.GEEN, + buffer_waterside=0.24, + roads_class2_width=1, + roads_class7_width=2, + roads_class24_width=3, + roads_class47_width=4, + roads_unknown_width=5, ) # Generate wrapper diff --git a/tests/dike_reinforcements/__init__.py b/tests/dike_reinforcements/__init__.py index 0898ddde..dba794da 100644 --- a/tests/dike_reinforcements/__init__.py +++ b/tests/dike_reinforcements/__init__.py @@ -41,10 +41,10 @@ def _compare_koswat_input_profile( if key not in [ "dike_section", - "grondprijs_bebouwd", - "grondprijs_onbebouwd", - "factor_zetting", - "pleistoceen", + "ground_price_builtup", + "ground_price_unbuilt", + "factor_settlement", + "pleistocene", "aquifer", "construction_type", "soil_surtax_factor", diff --git a/tests/dike_reinforcements/input_profile/cofferdam/test_cofferdam_input_profile.py b/tests/dike_reinforcements/input_profile/cofferdam/test_cofferdam_input_profile.py index e32e6e09..3ecc00ea 100644 --- a/tests/dike_reinforcements/input_profile/cofferdam/test_cofferdam_input_profile.py +++ b/tests/dike_reinforcements/input_profile/cofferdam/test_cofferdam_input_profile.py @@ -16,16 +16,16 @@ def test_initialize(self): assert isinstance(_input, KoswatInputProfileProtocol) assert isinstance(_input, ReinforcementInputProfileProtocol) - def test_grondprijs(self): + def test_ground_price(self): # 1. Define test data - _bebouwd = 100 - _onbebouwd = 10 + _builtup = 100 + _unbuilt = 10 _profile = CofferDamInputProfile() - _profile.grondprijs_bebouwd = _bebouwd - _profile.grondprijs_onbebouwd = _onbebouwd + _profile.ground_price_builtup = _builtup + _profile.ground_price_unbuilt = _unbuilt # 2. Run test - _grondprijs = _profile.grondprijs + _ground_price = _profile.ground_price # 3. Verify expectations - assert _grondprijs == _bebouwd + assert _ground_price == _builtup diff --git a/tests/dike_reinforcements/input_profile/cofferdam/test_cofferdam_input_profile_calculation.py b/tests/dike_reinforcements/input_profile/cofferdam/test_cofferdam_input_profile_calculation.py index 63d27971..f350ea62 100644 --- a/tests/dike_reinforcements/input_profile/cofferdam/test_cofferdam_input_profile_calculation.py +++ b/tests/dike_reinforcements/input_profile/cofferdam/test_cofferdam_input_profile_calculation.py @@ -27,108 +27,108 @@ def test_initialize(self): assert isinstance(_calculation, ReinforcementInputProfileCalculationProtocol) @pytest.mark.parametrize( - "soil_binnen_berm_breedte, expected", + "soil_polderside_berm_width, expected", [ - pytest.param(0.0, 13.5, id="soil_binnen_berm_breedte=0"), - pytest.param(30.0, 14.5, id="soil_binnen_berm_breedte=30"), + pytest.param(0.0, 13.5, id="soil_polderside_berm_width=0"), + pytest.param(30.0, 14.5, id="soil_polderside_berm_width=30"), ], ) - def test_calculate_length_coffer_dam( - self, soil_binnen_berm_breedte: float, expected: float + def test_calculate_length_cofferdam( + self, soil_polderside_berm_width: float, expected: float ): class MockInputData(KoswatInputProfileProtocol): - pleistoceen: float + pleistocene: float aquifer: float class MockSettings(KoswatCofferdamSettings): - min_lengte_kistdam: float - max_lengte_kistdam: float + min_length_cofferdam: float + max_length_cofferdam: float # 1. Define test data. _calculator = CofferdamInputProfileCalculation() _input_data = MockInputData() - _input_data.pleistoceen = -5 + _input_data.pleistocene = -5 _input_data.aquifer = -2 _cofferdam_settings = MockSettings() - _cofferdam_settings.min_lengte_kistdam = 0 - _cofferdam_settings.max_lengte_kistdam = 99 - _soil_binnen_berm_breedte = soil_binnen_berm_breedte - _new_kruin_hoogte = 8 + _cofferdam_settings.min_length_cofferdam = 0 + _cofferdam_settings.max_length_cofferdam = 99 + _soil_polderside_berm_width = soil_polderside_berm_width + _new_crest_height = 8 _expected_result = expected # 2. Run test. - _result = _calculator._calculate_length_coffer_dam( + _result = _calculator._calculate_length_cofferdam( _input_data, _cofferdam_settings, - _soil_binnen_berm_breedte, - _new_kruin_hoogte, + _soil_polderside_berm_width, + _new_crest_height, ) # 3. Verify expectations assert _result == _expected_result - def test_calculate_new_kruin_hoogte(self): + def test_calculate_new_crest_height(self): class MockInputData(KoswatInputProfileProtocol): - kruin_hoogte: float + crest_height: float # 1. Define test data. _calculator = CofferdamInputProfileCalculation() _input_data = MockInputData() - _input_data.kruin_hoogte = 6 + _input_data.crest_height = 6 _scenario = KoswatScenario() _scenario.d_h = 2 _expected_result = 8 # 2. Run test. - _result = _calculator._calculate_new_kruin_hoogte(_input_data, _scenario) + _result = _calculator._calculate_new_crest_height(_input_data, _scenario) # 3. Verify expectations assert _result == _expected_result - def test_calculate_new_buiten_talud(self): + def test_calculate_new_waterside_slope(self): class MockInputData(KoswatInputProfileProtocol): - kruin_hoogte: float - buiten_talud: float - buiten_maaiveld: float + crest_height: float + waterside_slope: float + waterside_ground_level: float # 1. Define test data. _calculator = CofferdamInputProfileCalculation() _input_data = MockInputData() - _input_data.kruin_hoogte = 8 - _input_data.buiten_maaiveld = 2 - _input_data.buiten_talud = 3 + _input_data.crest_height = 8 + _input_data.waterside_ground_level = 2 + _input_data.waterside_slope = 3 _scenario = KoswatScenario() _scenario.d_h = 2 _expected_result = 2.25 # 2. Run test. - _result = _calculator._calculate_new_buiten_talud(_input_data, _scenario) + _result = _calculator._calculate_new_waterside_slope(_input_data, _scenario) # 3. Verify expectations assert _result == _expected_result - def test_calculate_new_binnen_talud(self): + def test_calculate_new_polderside_slope(self): class MockInputData(KoswatInputProfileProtocol): - kruin_breedte: float - kruin_hoogte: float - binnen_maaiveld: float - binnen_talud: float + crest_width: float + crest_height: float + polderside_ground_level: float + polderside_slope: float # 1. Define test data. _expected_result = 2.25 _calculator = CofferdamInputProfileCalculation() _input_data = MockInputData() - _input_data.kruin_hoogte = 6 - _input_data.binnen_maaiveld = 0 - _input_data.binnen_talud = 3 - _input_data.kruin_breedte = 5 + _input_data.crest_height = 6 + _input_data.polderside_ground_level = 0 + _input_data.polderside_slope = 3 + _input_data.crest_width = 5 _scenario = KoswatScenario() _scenario.d_h = 2 - _scenario.kruin_breedte = 5 - _scenario.buiten_talud = 3 + _scenario.crest_width = 5 + _scenario.waterside_slope = 3 # 2. Run test. - _result = _calculator._calculate_new_binnen_talud(_input_data, _scenario) + _result = _calculator._calculate_new_polderside_slope(_input_data, _scenario) # 3. Verify expectations assert _result == pytest.approx(_expected_result, 0.001) @@ -136,48 +136,52 @@ class MockInputData(KoswatInputProfileProtocol): def test_calculate_new_input_profile(self): class MockInputData(KoswatInputProfileProtocol): dike_section: str - kruin_hoogte: float - binnen_berm_breedte: float - binnen_maaiveld: float - binnen_talud: float - kruin_breedte: float - buiten_berm_breedte: float - buiten_talud: float - grondprijs_bebouwd: float - grondprijs_onbebouwd: float - factor_zetting: float - pleistoceen: float + waterside_ground_level: float + waterside_slope: float + waterside_berm_height: float + waterside_berm_width: float + crest_height: float + crest_width: float + polderside_slope: float + polderside_berm_height: float + polderside_berm_width: float + polderside_ground_level: float + ground_price_builtup: float + ground_price_unbuilt: float + factor_settlement: float + pleistocene: float aquifer: float class MockSettings(KoswatCofferdamSettings): - min_lengte_kistdam: float - max_lengte_kistdam: float + min_length_cofferdam: float + max_length_cofferdam: float # 1. Define test data. _calculator = CofferdamInputProfileCalculation() _input_data = MockInputData() _input_data.dike_section = "mocked_section" - _input_data.kruin_hoogte = 30 - _input_data.binnen_berm_breedte = 9.0 - _input_data.binnen_maaiveld = 2.3 - _input_data.binnen_talud = 4.5 - _input_data.kruin_breedte = 5.6 - _input_data.buiten_maaiveld = 6.7 - _input_data.buiten_berm_hoogte = 7.8 - _input_data.buiten_berm_breedte = 8.9 - _input_data.buiten_talud = 9.9 - _input_data.grondprijs_bebouwd = 150 - _input_data.grondprijs_onbebouwd = 10 - _input_data.factor_zetting = 1.2 - _input_data.pleistoceen = -6.7 + _input_data.waterside_ground_level = 6.7 + _input_data.waterside_slope = 9.9 + _input_data.waterside_berm_height = 7.8 + _input_data.waterside_berm_width = 8.9 + _input_data.crest_height = 30 + _input_data.crest_width = 5.6 + _input_data.polderside_slope = 4.5 + _input_data.polderside_berm_height = 7.8 + _input_data.polderside_berm_width = 9.0 + _input_data.polderside_ground_level = 2.3 + _input_data.ground_price_builtup = 150 + _input_data.ground_price_unbuilt = 10 + _input_data.factor_settlement = 1.2 + _input_data.pleistocene = -6.7 _input_data.aquifer = -2.3 _cofferdam_settings = MockSettings() - _cofferdam_settings.min_lengte_kistdam = 0 - _cofferdam_settings.max_lengte_kistdam = 99 + _cofferdam_settings.min_length_cofferdam = 0 + _cofferdam_settings.max_length_cofferdam = 99 _scenario = KoswatScenario() _scenario.d_h = 12 - _scenario.kruin_breedte = 6.7 - _scenario.buiten_talud = 7.8 + _scenario.crest_width = 6.7 + _scenario.waterside_slope = 7.8 # 2. Run test. _result = _calculator._calculate_new_input_profile( diff --git a/tests/dike_reinforcements/input_profile/piping_wall/test_piping_wall_input_profile.py b/tests/dike_reinforcements/input_profile/piping_wall/test_piping_wall_input_profile.py index a107a3f5..0af07938 100644 --- a/tests/dike_reinforcements/input_profile/piping_wall/test_piping_wall_input_profile.py +++ b/tests/dike_reinforcements/input_profile/piping_wall/test_piping_wall_input_profile.py @@ -16,16 +16,16 @@ def test_initialize(self): assert isinstance(_input, KoswatInputProfileProtocol) assert isinstance(_input, ReinforcementInputProfileProtocol) - def test_grondprijs(self): + def test_ground_price(self): # 1. Define test data - _bebouwd = 100 - _onbebouwd = 10 + _builtup = 100 + _unbuilt = 10 _profile = PipingWallInputProfile() - _profile.grondprijs_bebouwd = _bebouwd - _profile.grondprijs_onbebouwd = _onbebouwd + _profile.ground_price_builtup = _builtup + _profile.ground_price_unbuilt = _unbuilt # 2. Run test - _grondprijs = _profile.grondprijs + _ground_price = _profile.ground_price # 3. Verify expectations - assert _grondprijs == _bebouwd + assert _ground_price == _builtup diff --git a/tests/dike_reinforcements/input_profile/piping_wall/test_piping_wall_input_profile_calculation.py b/tests/dike_reinforcements/input_profile/piping_wall/test_piping_wall_input_profile_calculation.py index b64a788a..e368b85f 100644 --- a/tests/dike_reinforcements/input_profile/piping_wall/test_piping_wall_input_profile_calculation.py +++ b/tests/dike_reinforcements/input_profile/piping_wall/test_piping_wall_input_profile_calculation.py @@ -27,64 +27,64 @@ def test_initialize(self): def test_calculate_length_type_piping_wall(self): class MockProfile(KoswatInputProfileProtocol): - binnen_berm_breedte: float - binnen_maaiveld: float + polderside_berm_width: float + polderside_ground_level: float class MockSettings(KoswatPipingWallSettings): - min_lengte_kwelscherm: float - max_lengte_kwelscherm: float + min_length_piping_wall: float + max_length_piping_wall: float # 1. Define test data. _calculator = PipingWallInputProfileCalculation() _profile_data = MockProfile() - _profile_data.binnen_berm_breedte = 6 - _profile_data.binnen_maaiveld = 1 - _profile_data.pleistoceen = -5 + _profile_data.polderside_berm_width = 6 + _profile_data.polderside_ground_level = 1 + _profile_data.pleistocene = -5 _profile_data.aquifer = -2 _piping_wall_settings = MockSettings() - _piping_wall_settings.min_lengte_kwelscherm = 0 - _piping_wall_settings.max_lengte_kwelscherm = 99 - _piping_wall_settings.overgang_cbwand_damwand = 15 - _soil_binnen_berm_breedte = 12.5 + _piping_wall_settings.min_length_piping_wall = 0 + _piping_wall_settings.max_length_piping_wall = 99 + _piping_wall_settings.transition_cbwall_sheetpile = 15 + _soil_polderside_berm_width = 12.5 _expected_result = (6.1, ConstructionTypeEnum.CB_DAMWAND) # 2. Run test. _length = _calculator._calculate_length_piping_wall( - _profile_data, _piping_wall_settings, _soil_binnen_berm_breedte + _profile_data, _piping_wall_settings, _soil_polderside_berm_width ) _type = _calculator._determine_construction_type( - _piping_wall_settings.overgang_cbwand_damwand, _length + _piping_wall_settings.transition_cbwall_sheetpile, _length ) _result = (_length, _type) # 3. Verify Expectations. assert _result == _expected_result - def test_calculate_new_kruin_hoogte(self): + def test_calculate_new_crest_height(self): class MockProfile(KoswatInputProfileProtocol): - kruin_hoogte: float + crest_height: float # 1. Define test data. _expected_result = 6.6 _profile_data = MockProfile() - _profile_data.kruin_hoogte = 4.2 + _profile_data.crest_height = 4.2 _scenario = KoswatScenario() _scenario.d_h = 2.4 # 2. Run test. - _result = PipingWallInputProfileCalculation()._calculate_new_kruin_hoogte( + _result = PipingWallInputProfileCalculation()._calculate_new_crest_height( _profile_data, _scenario ) # 3. Verify Expectations. assert _result == _expected_result - def test_calculate_new_binnen_talud(self): + def test_calculate_new_polderside_slope(self): class MockProfile(KoswatInputProfileProtocol): - kruin_hoogte: float - kruin_breedte: float - binnen_talud: float - binnen_maaiveld: float + crest_height: float + crest_width: float + polderside_slope: float + polderside_ground_level: float # 1. Define test data. _expected_value = 3.57 @@ -92,20 +92,20 @@ class MockProfile(KoswatInputProfileProtocol): _scenario.d_h = 1 _scenario.d_s = 10 _scenario.d_p = 30 - _scenario.kruin_breedte = 5 - _scenario.buiten_talud = 3 + _scenario.crest_width = 5 + _scenario.waterside_slope = 3 _input_profile = MockProfile() - _input_profile.kruin_breedte = 5 - _input_profile.kruin_hoogte = 8 - _input_profile.binnen_talud = 3 - _input_profile.binnen_maaiveld = 2 + _input_profile.crest_width = 5 + _input_profile.crest_height = 8 + _input_profile.polderside_slope = 3 + _input_profile.polderside_ground_level = 2 # 2. Run test - _new_binnen_talud = ( - PipingWallInputProfileCalculation()._calculate_new_binnen_talud( + _new_polderside_slope = ( + PipingWallInputProfileCalculation()._calculate_new_polderside_slope( _input_profile, _scenario ) ) # 3. Verify expectations - assert _new_binnen_talud == pytest.approx(_expected_value, 0.001) + assert _new_polderside_slope == pytest.approx(_expected_value, 0.001) diff --git a/tests/dike_reinforcements/input_profile/soil/test_soil_input_profile.py b/tests/dike_reinforcements/input_profile/soil/test_soil_input_profile.py index 3b0f2eb6..0fa19de5 100644 --- a/tests/dike_reinforcements/input_profile/soil/test_soil_input_profile.py +++ b/tests/dike_reinforcements/input_profile/soil/test_soil_input_profile.py @@ -16,16 +16,16 @@ def test_initialize(self): assert isinstance(_input, KoswatInputProfileProtocol) assert isinstance(_input, ReinforcementInputProfileProtocol) - def test_grondprijs(self): + def test_ground_price(self): # 1. Define test data - _bebouwd = 100 - _onbebouwd = 10 + _builtup = 100 + _unbuilt = 10 _profile = SoilInputProfile() - _profile.grondprijs_bebouwd = _bebouwd - _profile.grondprijs_onbebouwd = _onbebouwd + _profile.ground_price_builtup = _builtup + _profile.ground_price_unbuilt = _unbuilt # 2. Run test - _grondprijs = _profile.grondprijs + _ground_price = _profile.ground_price # 3. Verify expectations - assert _grondprijs == _onbebouwd + assert _ground_price == _unbuilt diff --git a/tests/dike_reinforcements/input_profile/soil/test_soil_input_profile_calculation.py b/tests/dike_reinforcements/input_profile/soil/test_soil_input_profile_calculation.py index 8c3176c3..dc106f96 100644 --- a/tests/dike_reinforcements/input_profile/soil/test_soil_input_profile_calculation.py +++ b/tests/dike_reinforcements/input_profile/soil/test_soil_input_profile_calculation.py @@ -24,119 +24,121 @@ def test_initialize(self): assert isinstance(_calculation, ReinforcementInputProfileCalculationProtocol) assert isinstance(_calculation, BuilderProtocol) - def test_calculate_new_binnen_talud(self): + def test_calculate_new_polderside_slope(self): # 1. Define test data. _expected_value = 3.57 _scenario = KoswatScenario() _scenario.d_h = 1 _scenario.d_s = 10 _scenario.d_p = 30 - _scenario.kruin_breedte = 5 - _scenario.buiten_talud = 3 + _scenario.crest_width = 5 + _scenario.waterside_slope = 3 _input_profile = KoswatInputProfileBase() - _input_profile.kruin_breedte = 5 - _input_profile.kruin_hoogte = 8 - _input_profile.binnen_talud = 3 - _input_profile.binnen_maaiveld = 2 + _input_profile.crest_width = 5 + _input_profile.crest_height = 8 + _input_profile.polderside_slope = 3 + _input_profile.polderside_ground_level = 2 # 2. Run test - _new_binnen_talud = SoilInputProfileCalculation()._calculate_new_binnen_talud( - _input_profile, _scenario + _new_polderside_slope = ( + SoilInputProfileCalculation()._calculate_new_polderside_slope( + _input_profile, _scenario + ) ) # 3. Verify expectations - assert _new_binnen_talud == pytest.approx(_expected_value, 0.001) + assert _new_polderside_slope == pytest.approx(_expected_value, 0.001) - def test_calculate_new_binnen_berm_hoogte_positive_binnen_berm_breedte(self): + def test_calculate_new_polderside_berm_height_positive_polderside_berm_width(self): # 1. Define test data. _expected_value = 3.0 _scenario = KoswatScenario() _scenario.d_h = 1 _old_data = KoswatInputProfileBase() - _old_data.binnen_berm_hoogte = 2 - _old_data.binnen_maaiveld = 2 - _old_data.kruin_hoogte = 8 + _old_data.polderside_berm_height = 2 + _old_data.polderside_ground_level = 2 + _old_data.crest_height = 8 _new_data = KoswatInputProfileBase() - _new_data.binnen_berm_breedte = 20 + _new_data.polderside_berm_width = 20 # 2. Run test - _new_binnen_berm_hoogte = ( - SoilInputProfileCalculation()._calculate_new_binnen_berm_hoogte( + _new_polderside_berm_height = ( + SoilInputProfileCalculation()._calculate_new_polderside_berm_height( _old_data, _new_data, _scenario ) ) # 3. Verify expectations - assert _new_binnen_berm_hoogte == pytest.approx(_expected_value, 0.001) + assert _new_polderside_berm_height == pytest.approx(_expected_value, 0.001) - def test_calculate_new_binnen_berm_hoogte_negative_binnen_berm_breedte(self): + def test_calculate_new_polderside_berm_height_negative_polderside_berm_width(self): # 1. Define test data. _scenario = KoswatScenario() _old_data = KoswatInputProfileBase() - _old_data.binnen_maaiveld = 4.2 + _old_data.polderside_ground_level = 4.2 _new_data = KoswatInputProfileBase() - _new_data.binnen_berm_breedte = -1 + _new_data.polderside_berm_width = -1 # 2. Run test - _new_binnen_berm_hoogte = ( - SoilInputProfileCalculation()._calculate_new_binnen_berm_hoogte( + _new_polderside_berm_height = ( + SoilInputProfileCalculation()._calculate_new_polderside_berm_height( _old_data, _new_data, _scenario ) ) # 3. Verify expectations - assert _new_binnen_berm_hoogte == _old_data.binnen_maaiveld + assert _new_polderside_berm_height == _old_data.polderside_ground_level - def test_calculate_new_binnen_berm_breedte(self): + def test_calculate_new_polderside_berm_width(self): # 1. Define test data. _expected_value = 20 _scenario = KoswatScenario() _scenario.d_h = 1 _scenario.d_p = 30 - _scenario.buiten_talud = 3 + _scenario.waterside_slope = 3 _old_profile = KoswatInputProfileBase() - _old_profile.buiten_maaiveld = 0 - _old_profile.buiten_talud = 3 - _old_profile.buiten_berm_hoogte = 0 - _old_profile.buiten_berm_breedte = 0 - _old_profile.kruin_hoogte = 6 - _old_profile.kruin_breedte = 5 - _old_profile.binnen_talud = 3 - _old_profile.binnen_berm_hoogte = 0 - _old_profile.binnen_berm_breedte = 0 - _old_profile.binnen_maaiveld = 0 + _old_profile.waterside_ground_level = 0 + _old_profile.waterside_slope = 3 + _old_profile.waterside_berm_height = 0 + _old_profile.waterside_berm_width = 0 + _old_profile.crest_height = 6 + _old_profile.crest_width = 5 + _old_profile.polderside_slope = 3 + _old_profile.polderside_berm_height = 0 + _old_profile.polderside_berm_width = 0 + _old_profile.polderside_ground_level = 0 _new_profile = KoswatInputProfileBase() - _new_profile.buiten_maaiveld = 0 - _new_profile.buiten_talud = 3 - _new_profile.buiten_berm_breedte = 0 - _new_profile.kruin_breedte = 5 - _new_profile.kruin_hoogte = 7 - _new_profile.binnen_talud = 3.5714 - _new_profile.binnen_maaiveld = 0 + _new_profile.waterside_ground_level = 0 + _new_profile.waterside_slope = 3 + _new_profile.waterside_berm_width = 0 + _new_profile.crest_width = 5 + _new_profile.crest_height = 7 + _new_profile.polderside_slope = 3.5714 + _new_profile.polderside_ground_level = 0 # 2. Run test - _new_binnen_berm_breedte = ( - SoilInputProfileCalculation()._calculate_soil_binnen_berm_breedte( + _new_polderside_berm_width = ( + SoilInputProfileCalculation()._calculate_soil_polderside_berm_width( _old_profile, _new_profile, _scenario ) ) # 3. Verify expectations - assert _new_binnen_berm_breedte == pytest.approx(_expected_value, 0.001) + assert _new_polderside_berm_width == pytest.approx(_expected_value, 0.001) - def test_calculate_new_kruin_hoogte(self): + def test_calculate_new_crest_height(self): # 1. Define test data. _expected_value = 42.24 _scenario = KoswatScenario() _scenario.d_h = 2.2 _old_data = KoswatInputProfileBase() - _old_data.kruin_hoogte = 40.04 + _old_data.crest_height = 40.04 # 2. Run test - _new_kruin_hoogte = SoilInputProfileCalculation()._calculate_new_kruin_hoogte( + _new_crest_height = SoilInputProfileCalculation()._calculate_new_crest_height( _old_data, _scenario ) # 3. Verify expectations - assert _new_kruin_hoogte == pytest.approx(_expected_value, 0.001) + assert _new_crest_height == pytest.approx(_expected_value, 0.001) diff --git a/tests/dike_reinforcements/input_profile/stability_wall/test_stability_wall_input_profile.py b/tests/dike_reinforcements/input_profile/stability_wall/test_stability_wall_input_profile.py index 30b1be2e..fc0b0f4a 100644 --- a/tests/dike_reinforcements/input_profile/stability_wall/test_stability_wall_input_profile.py +++ b/tests/dike_reinforcements/input_profile/stability_wall/test_stability_wall_input_profile.py @@ -16,16 +16,16 @@ def test_initialize(self): assert isinstance(_input, KoswatInputProfileProtocol) assert isinstance(_input, ReinforcementInputProfileProtocol) - def test_grondprijs(self): + def test_ground_price(self): # 1. Define test data - _bebouwd = 100 - _onbebouwd = 10 + _builtup = 100 + _unbuilt = 10 _profile = StabilityWallInputProfile() - _profile.grondprijs_bebouwd = _bebouwd - _profile.grondprijs_onbebouwd = _onbebouwd + _profile.ground_price_builtup = _builtup + _profile.ground_price_unbuilt = _unbuilt # 2. Run test - _grondprijs = _profile.grondprijs + _ground_price = _profile.ground_price # 3. Verify expectations - assert _grondprijs == _bebouwd + assert _ground_price == _builtup diff --git a/tests/dike_reinforcements/input_profile/stability_wall/test_stability_wall_input_profile_calculation.py b/tests/dike_reinforcements/input_profile/stability_wall/test_stability_wall_input_profile_calculation.py index ad41d288..80368639 100644 --- a/tests/dike_reinforcements/input_profile/stability_wall/test_stability_wall_input_profile_calculation.py +++ b/tests/dike_reinforcements/input_profile/stability_wall/test_stability_wall_input_profile_calculation.py @@ -28,100 +28,100 @@ def test_initialize(self): assert isinstance(_calculation, BuilderProtocol) @pytest.mark.parametrize( - "soil_binnen_berm_breedte, expected", + "soil_polderside_berm_width, expected", [ pytest.param( 0, (13.5, ConstructionTypeEnum.DAMWAND_VERANKERD), - id="soil_binnen_berm_breedte=0", + id="soil_polderside_berm_width=0", ), pytest.param( 30.0, (14.5, ConstructionTypeEnum.DIEPWAND), - id="soil_binnen_berm_breedte=30", + id="soil_polderside_berm_width=30", ), ], ) def test_calculate_length_type_stability_wall( self, - soil_binnen_berm_breedte: float, + soil_polderside_berm_width: float, expected: tuple[float, ConstructionTypeEnum], ): class MockInputData(KoswatInputProfileProtocol): - pleistoceen: float + pleistocene: float aquifer: float class MockSettings(KoswatStabilityWallSettings): - min_lengte_stabiliteitswand: float - max_lengte_stabiliteitswand: float + min_length_stability_wall: float + max_length_stability_wall: float # 1. Define test data. _calculator = StabilityWallInputProfileCalculation() _input_data = MockInputData() - _input_data.pleistoceen = -5 + _input_data.pleistocene = -5 _input_data.aquifer = -2 _stability_wall_settings = MockSettings() - _stability_wall_settings.min_lengte_stabiliteitswand = 0 - _stability_wall_settings.max_lengte_stabiliteitswand = 99 - _stability_wall_settings.overgang_damwand_diepwand = 14 - _soil_binnen_berm_breedte = soil_binnen_berm_breedte - _new_kruin_hoogte = 8 + _stability_wall_settings.min_length_stability_wall = 0 + _stability_wall_settings.max_length_stability_wall = 99 + _stability_wall_settings.transition_sheetpile_diaphragm_wall = 14 + _soil_polderside_berm_width = soil_polderside_berm_width + _new_crest_height = 8 # 2. Run test. _length = _calculator._calculate_length_stability_wall( _input_data, _stability_wall_settings, - _soil_binnen_berm_breedte, - _new_kruin_hoogte, + _soil_polderside_berm_width, + _new_crest_height, ) _type = _calculator._determine_construction_type( - _stability_wall_settings.overgang_damwand_diepwand, _length + _stability_wall_settings.transition_sheetpile_diaphragm_wall, _length ) _result = (_length, _type) # 3. Verify expectations assert _result == expected - def test_calculate_new_kruin_hoogte(self): + def test_calculate_new_crest_height(self): class MockInputData(KoswatInputProfileProtocol): - kruin_hoogte: float + crest_height: float # 1. Define test data. _calculator = StabilityWallInputProfileCalculation() _input_data = MockInputData() - _input_data.kruin_hoogte = 30 + _input_data.crest_height = 30 _scenario = KoswatScenario() _scenario.d_h = 12 _expected_result = 42 # 2. Run test. - _result = _calculator._calculate_new_kruin_hoogte(_input_data, _scenario) + _result = _calculator._calculate_new_crest_height(_input_data, _scenario) # 3. Verify expectations assert _result == _expected_result - def test_calculate_new_binnen_talud(self): + def test_calculate_new_polderside_slope(self): class MockInputData(KoswatInputProfileProtocol): - kruin_hoogte: float - binnen_maaiveld: float - binnen_talud: float - kruin_breedte: float + crest_height: float + polderside_ground_level: float + polderside_slope: float + crest_width: float # 1. Define test data. _calculator = StabilityWallInputProfileCalculation() _input_data = MockInputData() - _input_data.kruin_hoogte = 30 - _input_data.binnen_maaiveld = 2.3 - _input_data.binnen_talud = 4.5 - _input_data.kruin_breedte = 5.6 + _input_data.crest_height = 30 + _input_data.polderside_ground_level = 2.3 + _input_data.polderside_slope = 4.5 + _input_data.crest_width = 5.6 _scenario = KoswatScenario() _scenario.d_h = 12 - _scenario.kruin_breedte = 6.7 - _scenario.buiten_talud = 7.8 + _scenario.crest_width = 6.7 + _scenario.waterside_slope = 7.8 _expected_result = 2 # 2. Run test. - _result = _calculator._calculate_new_binnen_talud(_input_data, _scenario) + _result = _calculator._calculate_new_polderside_slope(_input_data, _scenario) # 3. Verify expectations assert _result == _expected_result @@ -129,48 +129,48 @@ class MockInputData(KoswatInputProfileProtocol): def test_calculate_new_input_profile(self): class MockInputData(KoswatInputProfileProtocol): dike_section: str - kruin_hoogte: float - binnen_berm_breedte: float - binnen_maaiveld: float - binnen_talud: float - kruin_breedte: float - buiten_berm_breedte: float - buiten_talud: float - grondprijs_bebouwd: float - grondprijs_onbebouwd: float - factor_zetting: float - pleistoceen: float + crest_height: float + polderside_berm_width: float + polderside_ground_level: float + polderside_slope: float + crest_width: float + waterside_berm_width: float + waterside_slope: float + ground_price_builtup: float + ground_price_unbuilt: float + factor_settlement: float + pleistocene: float aquifer: float class MockSettings(KoswatStabilityWallSettings): - min_lengte_stabiliteitswand: float - max_lengte_stabiliteitswand: float + min_length_stability_wall: float + max_length_stability_wall: float # 1. Define test data. _calculator = StabilityWallInputProfileCalculation() _input_data = MockInputData() _input_data.dike_section = "mocked_section" - _input_data.kruin_hoogte = 30 - _input_data.binnen_berm_breedte = 8.9 - _input_data.binnen_maaiveld = 2.3 - _input_data.binnen_talud = 4.5 - _input_data.kruin_breedte = 5.6 - _input_data.buiten_maaiveld = 6.7 - _input_data.buiten_berm_hoogte = 7.8 - _input_data.buiten_berm_breedte = 8.9 - _input_data.buiten_talud = 3.4 - _input_data.grondprijs_bebouwd = 150 - _input_data.grondprijs_onbebouwd = 10 - _input_data.factor_zetting = 1.2 - _input_data.pleistoceen = -6.7 + _input_data.crest_height = 30 + _input_data.polderside_berm_width = 8.9 + _input_data.polderside_ground_level = 2.3 + _input_data.polderside_slope = 4.5 + _input_data.crest_width = 5.6 + _input_data.waterside_ground_level = 6.7 + _input_data.waterside_berm_height = 7.8 + _input_data.waterside_berm_width = 8.9 + _input_data.waterside_slope = 3.4 + _input_data.ground_price_builtup = 150 + _input_data.ground_price_unbuilt = 10 + _input_data.factor_settlement = 1.2 + _input_data.pleistocene = -6.7 _input_data.aquifer = -2.3 _stability_wall_settings = MockSettings() - _stability_wall_settings.min_lengte_stabiliteitswand = 0 - _stability_wall_settings.max_lengte_stabiliteitswand = 99 + _stability_wall_settings.min_length_stability_wall = 0 + _stability_wall_settings.max_length_stability_wall = 99 _scenario = KoswatScenario() _scenario.d_h = 12 - _scenario.kruin_breedte = 6.7 - _scenario.buiten_talud = 7.8 + _scenario.crest_width = 6.7 + _scenario.waterside_slope = 7.8 # 2. Run test. _result = _calculator._calculate_new_input_profile( diff --git a/tests/dike_reinforcements/input_profile/vertical_piping_solution/test_vps_input_profile.py b/tests/dike_reinforcements/input_profile/vertical_piping_solution/test_vps_input_profile.py index 883a5f32..6c63eeff 100644 --- a/tests/dike_reinforcements/input_profile/vertical_piping_solution/test_vps_input_profile.py +++ b/tests/dike_reinforcements/input_profile/vertical_piping_solution/test_vps_input_profile.py @@ -16,16 +16,16 @@ def test_initialize(self): assert isinstance(_input, KoswatInputProfileProtocol) assert isinstance(_input, ReinforcementInputProfileProtocol) - def test_grondprijs(self): + def test_ground_price(self): # 1. Define test data - _bebouwd = 100 - _onbebouwd = 10 + _builtup = 100 + _unbuilt = 10 _profile = VPSInputProfile() - _profile.grondprijs_bebouwd = _bebouwd - _profile.grondprijs_onbebouwd = _onbebouwd + _profile.ground_price_builtup = _builtup + _profile.ground_price_unbuilt = _unbuilt # 2. Run test - _grondprijs = _profile.grondprijs + _ground_price = _profile.ground_price # 3. Verify expectations - assert _grondprijs == _bebouwd + assert _ground_price == _builtup diff --git a/tests/dike_reinforcements/input_profile/vertical_piping_solution/test_vps_input_profile_calculation.py b/tests/dike_reinforcements/input_profile/vertical_piping_solution/test_vps_input_profile_calculation.py index 46afcb5c..e5a20b29 100644 --- a/tests/dike_reinforcements/input_profile/vertical_piping_solution/test_vps_input_profile_calculation.py +++ b/tests/dike_reinforcements/input_profile/vertical_piping_solution/test_vps_input_profile_calculation.py @@ -33,21 +33,21 @@ def test_calculate_new_input_profile(self): _scenario = KoswatScenario() _scenario.d_h = 1 _scenario.d_p = 30 - _scenario.kruin_breedte = 5 - _scenario.buiten_talud = 3 + _scenario.crest_width = 5 + _scenario.waterside_slope = 3 _old_profile = KoswatInputProfileBase() - _old_profile.buiten_maaiveld = 0 - _old_profile.buiten_talud = 3 - _old_profile.buiten_berm_hoogte = 0 - _old_profile.buiten_berm_breedte = 0 - _old_profile.kruin_hoogte = 6 - _old_profile.kruin_breedte = 5 - _old_profile.binnen_talud = 3 - _old_profile.binnen_berm_hoogte = 0 - _old_profile.binnen_berm_breedte = 0 - _old_profile.binnen_maaiveld = 0 + _old_profile.waterside_ground_level = 0 + _old_profile.waterside_slope = 3 + _old_profile.waterside_berm_height = 0 + _old_profile.waterside_berm_width = 0 + _old_profile.crest_height = 6 + _old_profile.crest_width = 5 + _old_profile.polderside_slope = 3 + _old_profile.polderside_berm_height = 0 + _old_profile.polderside_berm_width = 0 + _old_profile.polderside_ground_level = 0 _vps_settings = KoswatVPSSettings() - _vps_settings.binnen_berm_breedte_vps = 10 + _vps_settings.polderside_berm_width_vps = 10 # 2. Run test _new_profile = VPSInputProfileCalculation()._calculate_new_input_profile( @@ -55,13 +55,17 @@ def test_calculate_new_input_profile(self): ) # 3. Verify expectations - assert _new_profile.buiten_maaiveld == _old_profile.buiten_maaiveld - assert _new_profile.buiten_talud == _old_profile.buiten_talud - assert _new_profile.buiten_berm_hoogte == _old_profile.buiten_berm_hoogte - assert _new_profile.buiten_berm_breedte == _old_profile.buiten_berm_breedte - assert _new_profile.kruin_hoogte == pytest.approx(7, 0.0001) - assert _new_profile.kruin_breedte == _scenario.kruin_breedte - assert _new_profile.binnen_talud == pytest.approx(3, 0.0001) - assert _new_profile.binnen_maaiveld == _old_profile.binnen_maaiveld - assert _new_profile.binnen_berm_breedte == pytest.approx(10, 0.0001) - assert _new_profile.binnen_berm_hoogte == pytest.approx(0.5, 0.0001) + assert ( + _new_profile.waterside_ground_level == _old_profile.waterside_ground_level + ) + assert _new_profile.waterside_slope == _old_profile.waterside_slope + assert _new_profile.waterside_berm_height == _old_profile.waterside_berm_height + assert _new_profile.waterside_berm_width == _old_profile.waterside_berm_width + assert _new_profile.crest_height == pytest.approx(7, 0.0001) + assert _new_profile.crest_width == _scenario.crest_width + assert _new_profile.polderside_slope == pytest.approx(3, 0.0001) + assert ( + _new_profile.polderside_ground_level == _old_profile.polderside_ground_level + ) + assert _new_profile.polderside_berm_width == pytest.approx(10, 0.0001) + assert _new_profile.polderside_berm_height == pytest.approx(0.5, 0.0001) diff --git a/tests/dike_reinforcements/reinforcement_profile/test_reinforcement_profile_builder_factory.py b/tests/dike_reinforcements/reinforcement_profile/test_reinforcement_profile_builder_factory.py index a7e56390..5be6ac70 100644 --- a/tests/dike_reinforcements/reinforcement_profile/test_reinforcement_profile_builder_factory.py +++ b/tests/dike_reinforcements/reinforcement_profile/test_reinforcement_profile_builder_factory.py @@ -110,8 +110,8 @@ def _to_koswat_scenario( d_p=_section_scenario.d_p, scenario_section=scenario_data.scenario_dike_section, scenario_name=_section_scenario.scenario_name, - kruin_breedte=_section_scenario.kruin_breedte, - buiten_talud=_section_scenario.buiten_talud, + crest_width=_section_scenario.crest_width, + waterside_slope=_section_scenario.waterside_slope, ) yield _scenario @@ -225,13 +225,13 @@ def reinforcement_profile_case( ) ).build() - if math.isnan(_combination.koswat_scenario_case.kruin_breedte): - _combination.koswat_scenario_case.kruin_breedte = ( - _combination.input_profile_case.kruin_breedte + if math.isnan(_combination.koswat_scenario_case.crest_width): + _combination.koswat_scenario_case.crest_width = ( + _combination.input_profile_case.crest_width ) - if math.isnan(_combination.koswat_scenario_case.buiten_talud): - _combination.koswat_scenario_case.buiten_talud = ( - _combination.input_profile_case.buiten_talud + if math.isnan(_combination.koswat_scenario_case.waterside_slope): + _combination.koswat_scenario_case.waterside_slope = ( + _combination.input_profile_case.waterside_slope ) def _get_reinforced_profile() -> ReinforcementProfileProtocol: @@ -362,10 +362,10 @@ def test_generate_reinforcement_profiles_from_acceptance_data( assert isinstance(_base_profile, KoswatProfileBase) # Correct scenario. - if not scenario.buiten_talud or math.isnan(scenario.buiten_talud): - scenario.buiten_talud = input_profile.buiten_talud - if not scenario.kruin_breedte or math.isnan(scenario.kruin_breedte): - scenario.kruin_breedte = input_profile.kruin_breedte + if not scenario.waterside_slope or math.isnan(scenario.waterside_slope): + scenario.waterside_slope = input_profile.waterside_slope + if not scenario.crest_width or math.isnan(scenario.crest_width): + scenario.crest_width = input_profile.crest_width _reinforcement_settings = KoswatReinforcementSettings() diff --git a/tests/dike_reinforcements/reinforcement_profile_cases.py b/tests/dike_reinforcements/reinforcement_profile_cases.py index 26b04e21..eb1c3225 100644 --- a/tests/dike_reinforcements/reinforcement_profile_cases.py +++ b/tests/dike_reinforcements/reinforcement_profile_cases.py @@ -62,20 +62,20 @@ class ReinforcementProfileCaseCombination: expectation=ReinforcementProfileCaseExpectation( input_profile_base=PipingWallInputProfile( dike_section="test_data", - buiten_maaiveld=0, - buiten_talud=3, - buiten_berm_breedte=0, - buiten_berm_hoogte=0, - kruin_hoogte=8, - kruin_breedte=5, - binnen_talud=3, - binnen_berm_hoogte=0, - binnen_berm_breedte=0, - binnen_maaiveld=0, - grondprijs_bebouwd=150, - grondprijs_onbebouwd=10, - factor_zetting=1.2, - pleistoceen=-5, + waterside_ground_level=0, + waterside_slope=3, + waterside_berm_width=0, + waterside_berm_height=0, + crest_height=8, + crest_width=5, + polderside_slope=3, + polderside_berm_height=0, + polderside_berm_width=0, + polderside_ground_level=0, + ground_price_builtup=150, + ground_price_unbuilt=10, + factor_settlement=1.2, + pleistocene=-5, aquifer=-2, construction_length=6.0, construction_type=ConstructionTypeEnum.CB_DAMWAND, @@ -91,20 +91,20 @@ class ReinforcementProfileCaseCombination: expectation=ReinforcementProfileCaseExpectation( input_profile_base=StabilityWallInputProfile( dike_section="test_data", - buiten_maaiveld=0, - buiten_talud=3, - buiten_berm_breedte=0, - buiten_berm_hoogte=0, - kruin_hoogte=8, - kruin_breedte=5, - binnen_talud=2.00, - binnen_berm_hoogte=0, - binnen_berm_breedte=0, - binnen_maaiveld=0, - grondprijs_bebouwd=150, - grondprijs_onbebouwd=10, - factor_zetting=1.2, - pleistoceen=-5, + waterside_ground_level=0, + waterside_slope=3, + waterside_berm_width=0, + waterside_berm_height=0, + crest_height=8, + crest_width=5, + polderside_slope=2.00, + polderside_berm_height=0, + polderside_berm_width=0, + polderside_ground_level=0, + ground_price_builtup=150, + ground_price_unbuilt=10, + factor_settlement=1.2, + pleistocene=-5, aquifer=-2, construction_length=13.8, construction_type=ConstructionTypeEnum.DAMWAND_VERANKERD, @@ -120,20 +120,20 @@ class ReinforcementProfileCaseCombination: expectation=ReinforcementProfileCaseExpectation( input_profile_base=SoilInputProfile( dike_section="test_data", - buiten_maaiveld=0, - buiten_talud=3, - buiten_berm_breedte=0, - buiten_berm_hoogte=0, - kruin_hoogte=7, - kruin_breedte=5, - binnen_talud=3.57, - binnen_berm_hoogte=1, - binnen_berm_breedte=20, - binnen_maaiveld=0, - grondprijs_bebouwd=150, - grondprijs_onbebouwd=10, - factor_zetting=1.2, - pleistoceen=-5, + waterside_ground_level=0, + waterside_slope=3, + waterside_berm_width=0, + waterside_berm_height=0, + crest_height=7, + crest_width=5, + polderside_slope=3.57, + polderside_berm_height=1, + polderside_berm_width=20, + polderside_ground_level=0, + ground_price_builtup=150, + ground_price_unbuilt=10, + factor_settlement=1.2, + pleistocene=-5, aquifer=-2, construction_length=0, construction_type=None, @@ -149,20 +149,20 @@ class ReinforcementProfileCaseCombination: expectation=ReinforcementProfileCaseExpectation( input_profile_base=CofferDamInputProfile( dike_section="test_data", - buiten_maaiveld=0, - buiten_talud=2.25, - buiten_berm_breedte=0, - buiten_berm_hoogte=0, - kruin_hoogte=8, - kruin_breedte=5, - binnen_talud=2.25, - binnen_berm_hoogte=0, - binnen_berm_breedte=0, - binnen_maaiveld=0, - grondprijs_bebouwd=150, - grondprijs_onbebouwd=10, - factor_zetting=1.2, - pleistoceen=-5, + waterside_ground_level=0, + waterside_slope=2.25, + waterside_berm_width=0, + waterside_berm_height=0, + crest_height=8, + crest_width=5, + polderside_slope=2.25, + polderside_berm_height=0, + polderside_berm_width=0, + polderside_ground_level=0, + ground_price_builtup=150, + ground_price_unbuilt=10, + factor_settlement=1.2, + pleistocene=-5, aquifer=-2, construction_length=14.5, construction_type=ConstructionTypeEnum.KISTDAM, diff --git a/tests/test_acceptance.py b/tests/test_acceptance.py index 476eee2a..6858847a 100644 --- a/tests/test_acceptance.py +++ b/tests/test_acceptance.py @@ -154,11 +154,11 @@ def _get_surroundings_wrapper_fixture( _koswat_general_settings, _koswat_costs = koswat_acceptance_settings() _surroundings_settings = _koswat_general_settings.surroundings_section _surroundings_settings.surroundings_database_dir = _temp_dir.parent - _surroundings_settings.bebouwing = _include_obstacles + _surroundings_settings.buildings = _include_obstacles # Generate Infrastructures section file model _infrastructure_settings = _koswat_general_settings.infrastructuur_section - _infrastructure_settings.infrastructuur = _include_infras + _infrastructure_settings.infrastructure = _include_infras # Generate wrapper _importer = SurroundingsWrapperCollectionImporter( @@ -293,25 +293,25 @@ def test_koswat_run_as_sandbox_with_surroundings( # Surroundings wrapper _surroundings_section = SurroundingsSectionFom( - constructieafstand=50, - constructieovergang=10, + construction_distance=50, + construction_buffer=10, surroundings_database_dir=_test_dir, - buitendijks=False, - bebouwing=True, - spoorwegen=False, - water=False, + waterside=False, + buildings=True, + railways=False, + waters=False, ) _infrastructure_section = InfrastructureSectionFom( - infrastructuur=False, - opslagfactor_wegen=SurtaxFactorEnum.NORMAAL, - infrakosten_0dh=InfraCostsEnum.GEEN, - buffer_buitendijks=0, - wegen_klasse2_breedte=2, - wegen_klasse24_breedte=5, - wegen_klasse47_breedte=8, - wegen_klasse7_breedte=12, - wegen_onbekend_breedte=8, + infrastructure=False, + surtax_factor_roads=SurtaxFactorEnum.NORMAAL, + infrastructure_costs_0dh=InfraCostsEnum.GEEN, + buffer_waterside=0, + roads_class2_width=2, + roads_class24_width=5, + roads_class47_width=8, + roads_class7_width=12, + roads_unknown_width=8, ) _surroundings = SurroundingsWrapperCollectionImporter( @@ -349,10 +349,10 @@ def test_koswat_run_as_sandbox_with_surroundings( profiling_layer_grass_m2=0.88, profiling_layer_clay_m2=0.65, profiling_layer_sand_m2=0.60, - bewerken_maaiveld_m2=0.25, + processing_ground_level_surface_m2=0.25, ), construction_costs=ConstructionCostsSettings( - cb_damwand=ConstructionFactors( + cb_sheetpile=ConstructionFactors( c_factor=0, d_factor=0, z_factor=999, @@ -445,7 +445,7 @@ def sandbox_acceptance_case( _run_settings.reinforcement_settings.vps_settings.land_purchase_surtax_factor = ( SurtaxFactorEnum.NORMAAL ) - _run_settings.reinforcement_settings.vps_settings.binnen_berm_breedte_vps = 10 + _run_settings.reinforcement_settings.vps_settings.polderside_berm_width_vps = 10 _run_settings.reinforcement_settings.piping_wall_settings.soil_surtax_factor = ( SurtaxFactorEnum.NORMAAL ) @@ -484,7 +484,9 @@ def sandbox_acceptance_case( _run_settings.costs_setting.dike_profile_costs.profiling_layer_grass_m2 = 0.88 _run_settings.costs_setting.dike_profile_costs.profiling_layer_clay_m2 = 0.65 _run_settings.costs_setting.dike_profile_costs.profiling_layer_sand_m2 = 0.60 - _run_settings.costs_setting.dike_profile_costs.bewerken_maaiveld_m2 = 0.25 + _run_settings.costs_setting.dike_profile_costs.processing_ground_level_surface_m2 = ( + 0.25 + ) _construction_costs = ConstructionCostsSettings() _construction_costs.vzg = ConstructionFactors() @@ -493,36 +495,36 @@ def sandbox_acceptance_case( _construction_costs.vzg.z_factor = 500 _construction_costs.vzg.f_factor = 0 _construction_costs.vzg.g_factor = 0 - _construction_costs.cb_damwand = ConstructionFactors() - _construction_costs.cb_damwand.c_factor = 0 - _construction_costs.cb_damwand.d_factor = 159.326 - _construction_costs.cb_damwand.z_factor = -34.794 - _construction_costs.cb_damwand.f_factor = 0 - _construction_costs.cb_damwand.g_factor = 0 - _construction_costs.damwand_onverankerd = ConstructionFactors() - _construction_costs.damwand_onverankerd.c_factor = 9.298 - _construction_costs.damwand_onverankerd.d_factor = 132.239 - _construction_costs.damwand_onverankerd.z_factor = 103.628 - _construction_costs.damwand_onverankerd.f_factor = 0 - _construction_costs.damwand_onverankerd.g_factor = 0 - _construction_costs.damwand_verankerd = ConstructionFactors() - _construction_costs.damwand_verankerd.c_factor = 9.298 - _construction_costs.damwand_verankerd.d_factor = 150.449 - _construction_costs.damwand_verankerd.z_factor = 1304.455 - _construction_costs.damwand_verankerd.f_factor = 0 - _construction_costs.damwand_verankerd.g_factor = 0 - _construction_costs.diepwand = ConstructionFactors() - _construction_costs.diepwand.c_factor = 0 - _construction_costs.diepwand.d_factor = 0 - _construction_costs.diepwand.z_factor = 0 - _construction_costs.diepwand.f_factor = 281.176 - _construction_costs.diepwand.g_factor = 1.205 - _construction_costs.kistdam = ConstructionFactors() - _construction_costs.kistdam.c_factor = 0 - _construction_costs.kistdam.d_factor = 680.782 - _construction_costs.kistdam.z_factor = -74.602 - _construction_costs.kistdam.f_factor = 0 - _construction_costs.kistdam.g_factor = 0 + _construction_costs.cb_sheetpile = ConstructionFactors() + _construction_costs.cb_sheetpile.c_factor = 0 + _construction_costs.cb_sheetpile.d_factor = 159.326 + _construction_costs.cb_sheetpile.z_factor = -34.794 + _construction_costs.cb_sheetpile.f_factor = 0 + _construction_costs.cb_sheetpile.g_factor = 0 + _construction_costs.sheetpile_unanchored = ConstructionFactors() + _construction_costs.sheetpile_unanchored.c_factor = 9.298 + _construction_costs.sheetpile_unanchored.d_factor = 132.239 + _construction_costs.sheetpile_unanchored.z_factor = 103.628 + _construction_costs.sheetpile_unanchored.f_factor = 0 + _construction_costs.sheetpile_unanchored.g_factor = 0 + _construction_costs.sheetpile_anchored = ConstructionFactors() + _construction_costs.sheetpile_anchored.c_factor = 9.298 + _construction_costs.sheetpile_anchored.d_factor = 150.449 + _construction_costs.sheetpile_anchored.z_factor = 1304.455 + _construction_costs.sheetpile_anchored.f_factor = 0 + _construction_costs.sheetpile_anchored.g_factor = 0 + _construction_costs.diaphragm_wall = ConstructionFactors() + _construction_costs.diaphragm_wall.c_factor = 0 + _construction_costs.diaphragm_wall.d_factor = 0 + _construction_costs.diaphragm_wall.z_factor = 0 + _construction_costs.diaphragm_wall.f_factor = 281.176 + _construction_costs.diaphragm_wall.g_factor = 1.205 + _construction_costs.cofferdam = ConstructionFactors() + _construction_costs.cofferdam.c_factor = 0 + _construction_costs.cofferdam.d_factor = 680.782 + _construction_costs.cofferdam.z_factor = -74.602 + _construction_costs.cofferdam.f_factor = 0 + _construction_costs.cofferdam.g_factor = 0 _run_settings.costs_setting.construction_costs = _construction_costs _run_settings.costs_setting.surtax_costs = SurtaxCostsSettings() diff --git a/tests/test_data/acceptance_reference_data/case_dijk1_1a_dh_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk1_1a_dh_with_default_layers/summary_costs.csv index 87a681a7..6718aae5 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk1_1a_dh_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk1_1a_dh_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;45.29;61.59;45.29;45.27;74.93 New core layer surface (quantity):;24.35;24.35;24.35;21.85;38.29 New core layer surface (cost):;14.61;14.61;14.61;13.11;22.97 New core layer surface (cost incl surtax):;36.65;36.65;36.65;36.41;63.79 -New maaiveld surface (quantity):;3.0;13.0;3.0;0.0;0.0 -New maaiveld surface (cost):;0.75;3.25;0.75;0.0;0.0 -New maaiveld surface (cost incl surtax):;1.88;8.15;1.88;0.0;0.0 +New ground level surface (quantity):;3.0;13.0;3.0;0.0;0.0 +New ground level surface (cost):;0.75;3.25;0.75;0.0;0.0 +New ground level surface (cost incl surtax):;1.88;8.15;1.88;0.0;0.0 Land purchase surface (quantity):;3.0;13.0;3.0;0.0;0.0 Land purchase surface (cost):;30.0;1950.0;450.0;0.0;0.0 Land purchase surface (cost incl surtax):;42.36;2753.4;635.4;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk1_1b_ds_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk1_1b_ds_with_default_layers/summary_costs.csv index 252f6a6b..2349b39f 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk1_1b_ds_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk1_1b_ds_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;49.06;65.37;49.06;0.0;0.0 New core layer surface (quantity):;21.47;21.47;21.47;0.0;0.0 New core layer surface (cost):;12.88;12.88;12.88;0.0;0.0 New core layer surface (cost incl surtax):;32.32;32.32;32.32;0.0;0.0 -New maaiveld surface (quantity):;6.0;16.0;6.0;0.0;0.0 -New maaiveld surface (cost):;1.5;4.0;1.5;0.0;0.0 -New maaiveld surface (cost incl surtax):;3.76;10.04;3.76;0.0;0.0 +New ground level surface (quantity):;6.0;16.0;6.0;0.0;0.0 +New ground level surface (cost):;1.5;4.0;1.5;0.0;0.0 +New ground level surface (cost incl surtax):;3.76;10.04;3.76;0.0;0.0 Land purchase surface (quantity):;6.0;16.0;6.0;0.0;0.0 Land purchase surface (cost):;60.0;2400.0;900.0;0.0;0.0 Land purchase surface (cost incl surtax):;84.72;3388.8;1270.8;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk1_1c_dp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk1_1c_dp_with_default_layers/summary_costs.csv index 51b50607..b69d239e 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk1_1c_dp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk1_1c_dp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;72.75;56.44;0.0;0.0;0.0 New core layer surface (quantity):;36.44;0.0;0.0;0.0;0.0 New core layer surface (cost):;21.87;0.0;0.0;0.0;0.0 New core layer surface (cost incl surtax):;54.86;0.0;0.0;0.0;0.0 -New maaiveld surface (quantity):;20.0;10.0;0.0;0.0;0.0 -New maaiveld surface (cost):;5.0;2.5;0.0;0.0;0.0 -New maaiveld surface (cost incl surtax):;12.54;6.27;0.0;0.0;0.0 +New ground level surface (quantity):;20.0;10.0;0.0;0.0;0.0 +New ground level surface (cost):;5.0;2.5;0.0;0.0;0.0 +New ground level surface (cost incl surtax):;12.54;6.27;0.0;0.0;0.0 Land purchase surface (quantity):;20.0;10.0;0.0;0.0;0.0 Land purchase surface (cost):;200.0;1500.0;0.0;0.0;0.0 Land purchase surface (cost incl surtax):;282.4;2118.0;0.0;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk1_1d_dhds_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk1_1d_dhds_with_default_layers/summary_costs.csv index 8e8510e5..2d5ea263 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk1_1d_dhds_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk1_1d_dhds_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;55.0;71.31;55.0;45.27;74.93 New core layer surface (quantity):;29.85;29.85;29.85;21.85;38.29 New core layer surface (cost):;17.91;17.91;17.91;13.11;22.97 New core layer surface (cost incl surtax):;44.94;44.94;44.94;36.41;63.79 -New maaiveld surface (quantity):;9.5;19.5;9.5;0.0;0.0 -New maaiveld surface (cost):;2.38;4.88;2.38;0.0;0.0 -New maaiveld surface (cost incl surtax):;5.96;12.23;5.96;0.0;0.0 +New ground level surface (quantity):;9.5;19.5;9.5;0.0;0.0 +New ground level surface (cost):;2.38;4.88;2.38;0.0;0.0 +New ground level surface (cost incl surtax):;5.96;12.23;5.96;0.0;0.0 Land purchase surface (quantity):;9.5;19.5;9.5;0.0;0.0 Land purchase surface (cost):;95.0;2925.0;1425.0;0.0;0.0 Land purchase surface (cost incl surtax):;134.14;4130.1;2012.1;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk1_1e_dhdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk1_1e_dhdp_with_default_layers/summary_costs.csv index f5550d9b..3e403a04 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk1_1e_dhdp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk1_1e_dhdp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;77.9;61.59;45.29;45.27;74.93 New core layer surface (quantity):;44.35;24.35;24.35;21.85;38.29 New core layer surface (cost):;26.61;14.61;14.61;13.11;22.97 New core layer surface (cost incl surtax):;66.76;36.65;36.65;36.41;63.79 -New maaiveld surface (quantity):;23.0;13.0;3.0;0.0;0.0 -New maaiveld surface (cost):;5.75;3.25;0.75;0.0;0.0 -New maaiveld surface (cost incl surtax):;14.43;8.15;1.88;0.0;0.0 +New ground level surface (quantity):;23.0;13.0;3.0;0.0;0.0 +New ground level surface (cost):;5.75;3.25;0.75;0.0;0.0 +New ground level surface (cost incl surtax):;14.43;8.15;1.88;0.0;0.0 Land purchase surface (quantity):;23.0;13.0;3.0;0.0;0.0 Land purchase surface (cost):;230.0;1950.0;450.0;0.0;0.0 Land purchase surface (cost incl surtax):;324.76;2753.4;635.4;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk1_1f_dsdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk1_1f_dsdp_with_default_layers/summary_costs.csv index d2c1bb44..bcf5b24c 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk1_1f_dsdp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk1_1f_dsdp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;81.68;65.37;49.06;0.0;0.0 New core layer surface (quantity):;41.47;21.47;21.47;0.0;0.0 New core layer surface (cost):;24.88;12.88;12.88;0.0;0.0 New core layer surface (cost incl surtax):;62.43;32.32;32.32;0.0;0.0 -New maaiveld surface (quantity):;26.0;16.0;6.0;0.0;0.0 -New maaiveld surface (cost):;6.5;4.0;1.5;0.0;0.0 -New maaiveld surface (cost incl surtax):;16.31;10.04;3.76;0.0;0.0 +New ground level surface (quantity):;26.0;16.0;6.0;0.0;0.0 +New ground level surface (cost):;6.5;4.0;1.5;0.0;0.0 +New ground level surface (cost incl surtax):;16.31;10.04;3.76;0.0;0.0 Land purchase surface (quantity):;26.0;16.0;6.0;0.0;0.0 Land purchase surface (cost):;260.0;2400.0;900.0;0.0;0.0 Land purchase surface (cost incl surtax):;367.12;3388.8;1270.8;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk1_1g_dhdsdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk1_1g_dhdsdp_with_default_layers/summary_costs.csv index 06a5435d..a3a31cb1 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk1_1g_dhdsdp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk1_1g_dhdsdp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;87.62;71.31;55.0;45.27;74.93 New core layer surface (quantity):;49.85;29.85;29.85;21.85;38.29 New core layer surface (cost):;29.91;17.91;17.91;13.11;22.97 New core layer surface (cost incl surtax):;75.05;44.94;44.94;36.41;63.79 -New maaiveld surface (quantity):;29.5;19.5;9.5;0.0;0.0 -New maaiveld surface (cost):;7.38;4.88;2.38;0.0;0.0 -New maaiveld surface (cost incl surtax):;18.5;12.23;5.96;0.0;0.0 +New ground level surface (quantity):;29.5;19.5;9.5;0.0;0.0 +New ground level surface (cost):;7.38;4.88;2.38;0.0;0.0 +New ground level surface (cost incl surtax):;18.5;12.23;5.96;0.0;0.0 Land purchase surface (quantity):;29.5;19.5;9.5;0.0;0.0 Land purchase surface (cost):;295.0;2925.0;1425.0;0.0;0.0 Land purchase surface (cost incl surtax):;416.54;4130.1;2012.1;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk1_2a_dh_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk1_2a_dh_with_default_layers/summary_costs.csv index d01defcf..99bc892f 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk1_2a_dh_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk1_2a_dh_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;50.44;66.75;50.44;46.19;75.76 New core layer surface (quantity):;27.51;27.51;27.51;22.52;38.91 New core layer surface (cost):;16.51;16.51;16.51;13.51;23.35 New core layer surface (cost incl surtax):;41.41;41.41;41.41;37.52;64.84 -New maaiveld surface (quantity):;6.0;16.0;6.0;0.0;0.0 -New maaiveld surface (cost):;1.5;4.0;1.5;0.0;0.0 -New maaiveld surface (cost incl surtax):;3.76;10.04;3.76;0.0;0.0 +New ground level surface (quantity):;6.0;16.0;6.0;0.0;0.0 +New ground level surface (cost):;1.5;4.0;1.5;0.0;0.0 +New ground level surface (cost incl surtax):;3.76;10.04;3.76;0.0;0.0 Land purchase surface (quantity):;6.0;16.0;6.0;0.0;0.0 Land purchase surface (cost):;60.0;2400.0;900.0;0.0;0.0 Land purchase surface (cost incl surtax):;84.72;3388.8;1270.8;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk1_2b_ds_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk1_2b_ds_with_default_layers/summary_costs.csv index 8d1e4774..85a5fc20 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk1_2b_ds_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk1_2b_ds_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;53.58;69.89;53.58;0.0;0.0 New core layer surface (quantity):;24.01;24.01;24.01;0.0;0.0 New core layer surface (cost):;14.41;14.41;14.41;0.0;0.0 New core layer surface (cost incl surtax):;36.15;36.15;36.15;0.0;0.0 -New maaiveld surface (quantity):;9.0;19.0;9.0;0.0;0.0 -New maaiveld surface (cost):;2.25;4.75;2.25;0.0;0.0 -New maaiveld surface (cost incl surtax):;5.65;11.92;5.65;0.0;0.0 +New ground level surface (quantity):;9.0;19.0;9.0;0.0;0.0 +New ground level surface (cost):;2.25;4.75;2.25;0.0;0.0 +New ground level surface (cost incl surtax):;5.65;11.92;5.65;0.0;0.0 Land purchase surface (quantity):;9.0;19.0;9.0;0.0;0.0 Land purchase surface (cost):;90.0;2850.0;1350.0;0.0;0.0 Land purchase surface (cost incl surtax):;127.08;4024.2;1906.2;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk1_2c_dp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk1_2c_dp_with_default_layers/summary_costs.csv index 1b76a589..56f664c1 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk1_2c_dp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk1_2c_dp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;121.67;56.44;0.0;0.0;0.0 New core layer surface (quantity):;66.44;0.0;0.0;0.0;0.0 New core layer surface (cost):;39.87;0.0;0.0;0.0;0.0 New core layer surface (cost incl surtax):;100.02;0.0;0.0;0.0;0.0 -New maaiveld surface (quantity):;50.0;10.0;0.0;0.0;0.0 -New maaiveld surface (cost):;12.5;2.5;0.0;0.0;0.0 -New maaiveld surface (cost incl surtax):;31.36;6.27;0.0;0.0;0.0 +New ground level surface (quantity):;50.0;10.0;0.0;0.0;0.0 +New ground level surface (cost):;12.5;2.5;0.0;0.0;0.0 +New ground level surface (cost incl surtax):;31.36;6.27;0.0;0.0;0.0 Land purchase surface (quantity):;50.0;10.0;0.0;0.0;0.0 Land purchase surface (cost):;500.0;1500.0;0.0;0.0;0.0 Land purchase surface (cost incl surtax):;706.0;2118.0;0.0;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk1_2d_dhds_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk1_2d_dhds_with_default_layers/summary_costs.csv index 043f36f2..1a3a938a 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk1_2d_dhds_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk1_2d_dhds_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;66.26;82.57;66.26;46.19;75.76 New core layer surface (quantity):;36.52;36.52;36.52;22.52;38.91 New core layer surface (cost):;21.91;21.91;21.91;13.51;23.35 New core layer surface (cost incl surtax):;54.98;54.98;54.98;37.52;64.84 -New maaiveld surface (quantity):;16.5;26.5;16.5;0.0;0.0 -New maaiveld surface (cost):;4.12;6.62;4.12;0.0;0.0 -New maaiveld surface (cost incl surtax):;10.35;16.62;10.35;0.0;0.0 +New ground level surface (quantity):;16.5;26.5;16.5;0.0;0.0 +New ground level surface (cost):;4.12;6.62;4.12;0.0;0.0 +New ground level surface (cost incl surtax):;10.35;16.62;10.35;0.0;0.0 Land purchase surface (quantity):;16.5;26.5;16.5;0.0;0.0 Land purchase surface (cost):;165.0;3975.0;2475.0;0.0;0.0 Land purchase surface (cost incl surtax):;232.98;5612.7;3494.7;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk1_2e_dhdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk1_2e_dhdp_with_default_layers/summary_costs.csv index dab43d9a..a96d077a 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk1_2e_dhdp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk1_2e_dhdp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;131.99;66.75;50.44;46.19;75.76 New core layer surface (quantity):;77.51;27.51;27.51;22.52;38.91 New core layer surface (cost):;46.51;16.51;16.51;13.51;23.35 New core layer surface (cost incl surtax):;116.68;41.41;41.41;37.52;64.84 -New maaiveld surface (quantity):;56.0;16.0;6.0;0.0;0.0 -New maaiveld surface (cost):;14.0;4.0;1.5;0.0;0.0 -New maaiveld surface (cost incl surtax):;35.13;10.04;3.76;0.0;0.0 +New ground level surface (quantity):;56.0;16.0;6.0;0.0;0.0 +New ground level surface (cost):;14.0;4.0;1.5;0.0;0.0 +New ground level surface (cost incl surtax):;35.13;10.04;3.76;0.0;0.0 Land purchase surface (quantity):;56.0;16.0;6.0;0.0;0.0 Land purchase surface (cost):;560.0;2400.0;900.0;0.0;0.0 Land purchase surface (cost incl surtax):;790.72;3388.8;1270.8;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk1_2f_dsdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk1_2f_dsdp_with_default_layers/summary_costs.csv index 03137af0..fae51e49 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk1_2f_dsdp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk1_2f_dsdp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;135.13;69.89;53.58;0.0;0.0 New core layer surface (quantity):;74.01;24.01;24.01;0.0;0.0 New core layer surface (cost):;44.41;14.41;14.41;0.0;0.0 New core layer surface (cost incl surtax):;111.42;36.15;36.15;0.0;0.0 -New maaiveld surface (quantity):;59.0;19.0;9.0;0.0;0.0 -New maaiveld surface (cost):;14.75;4.75;2.25;0.0;0.0 -New maaiveld surface (cost incl surtax):;37.01;11.92;5.65;0.0;0.0 +New ground level surface (quantity):;59.0;19.0;9.0;0.0;0.0 +New ground level surface (cost):;14.75;4.75;2.25;0.0;0.0 +New ground level surface (cost incl surtax):;37.01;11.92;5.65;0.0;0.0 Land purchase surface (quantity):;59.0;19.0;9.0;0.0;0.0 Land purchase surface (cost):;590.0;2850.0;1350.0;0.0;0.0 Land purchase surface (cost incl surtax):;833.08;4024.2;1906.2;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk1_2g_dhdsdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk1_2g_dhdsdp_with_default_layers/summary_costs.csv index 5e9b3fd1..b7f5a054 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk1_2g_dhdsdp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk1_2g_dhdsdp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;147.8;82.57;66.26;46.19;75.76 New core layer surface (quantity):;86.52;36.52;36.52;22.52;38.91 New core layer surface (cost):;51.91;21.91;21.91;13.51;23.35 New core layer surface (cost incl surtax):;130.25;54.98;54.98;37.52;64.84 -New maaiveld surface (quantity):;66.5;26.5;16.5;0.0;0.0 -New maaiveld surface (cost):;16.62;6.62;4.12;0.0;0.0 -New maaiveld surface (cost incl surtax):;41.71;16.62;10.35;0.0;0.0 +New ground level surface (quantity):;66.5;26.5;16.5;0.0;0.0 +New ground level surface (cost):;16.62;6.62;4.12;0.0;0.0 +New ground level surface (cost incl surtax):;41.71;16.62;10.35;0.0;0.0 Land purchase surface (quantity):;66.5;26.5;16.5;0.0;0.0 Land purchase surface (cost):;665.0;3975.0;2475.0;0.0;0.0 Land purchase surface (cost incl surtax):;938.98;5612.7;3494.7;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk2_1a_dh_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk2_1a_dh_with_default_layers/summary_costs.csv index 47ae2153..6ac813b2 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk2_1a_dh_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk2_1a_dh_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;45.29;61.59;45.29;45.27;86.31 New core layer surface (quantity):;24.35;24.35;24.35;21.85;44.57 New core layer surface (cost):;14.61;14.61;14.61;13.11;26.74 New core layer surface (cost incl surtax):;36.65;36.65;36.65;36.41;74.26 -New maaiveld surface (quantity):;3.0;13.0;3.0;0.0;0.0 -New maaiveld surface (cost):;0.75;3.25;0.75;0.0;0.0 -New maaiveld surface (cost incl surtax):;1.88;8.15;1.88;0.0;0.0 +New ground level surface (quantity):;3.0;13.0;3.0;0.0;0.0 +New ground level surface (cost):;0.75;3.25;0.75;0.0;0.0 +New ground level surface (cost incl surtax):;1.88;8.15;1.88;0.0;0.0 Land purchase surface (quantity):;3.0;13.0;3.0;0.0;0.0 Land purchase surface (cost):;30.0;1950.0;450.0;0.0;0.0 Land purchase surface (cost incl surtax):;42.36;2753.4;635.4;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk2_1b_ds_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk2_1b_ds_with_default_layers/summary_costs.csv index 252f6a6b..2349b39f 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk2_1b_ds_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk2_1b_ds_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;49.06;65.37;49.06;0.0;0.0 New core layer surface (quantity):;21.47;21.47;21.47;0.0;0.0 New core layer surface (cost):;12.88;12.88;12.88;0.0;0.0 New core layer surface (cost incl surtax):;32.32;32.32;32.32;0.0;0.0 -New maaiveld surface (quantity):;6.0;16.0;6.0;0.0;0.0 -New maaiveld surface (cost):;1.5;4.0;1.5;0.0;0.0 -New maaiveld surface (cost incl surtax):;3.76;10.04;3.76;0.0;0.0 +New ground level surface (quantity):;6.0;16.0;6.0;0.0;0.0 +New ground level surface (cost):;1.5;4.0;1.5;0.0;0.0 +New ground level surface (cost incl surtax):;3.76;10.04;3.76;0.0;0.0 Land purchase surface (quantity):;6.0;16.0;6.0;0.0;0.0 Land purchase surface (cost):;60.0;2400.0;900.0;0.0;0.0 Land purchase surface (cost incl surtax):;84.72;3388.8;1270.8;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk2_1c_dp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk2_1c_dp_with_default_layers/summary_costs.csv index 51b50607..b69d239e 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk2_1c_dp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk2_1c_dp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;72.75;56.44;0.0;0.0;0.0 New core layer surface (quantity):;36.44;0.0;0.0;0.0;0.0 New core layer surface (cost):;21.87;0.0;0.0;0.0;0.0 New core layer surface (cost incl surtax):;54.86;0.0;0.0;0.0;0.0 -New maaiveld surface (quantity):;20.0;10.0;0.0;0.0;0.0 -New maaiveld surface (cost):;5.0;2.5;0.0;0.0;0.0 -New maaiveld surface (cost incl surtax):;12.54;6.27;0.0;0.0;0.0 +New ground level surface (quantity):;20.0;10.0;0.0;0.0;0.0 +New ground level surface (cost):;5.0;2.5;0.0;0.0;0.0 +New ground level surface (cost incl surtax):;12.54;6.27;0.0;0.0;0.0 Land purchase surface (quantity):;20.0;10.0;0.0;0.0;0.0 Land purchase surface (cost):;200.0;1500.0;0.0;0.0;0.0 Land purchase surface (cost incl surtax):;282.4;2118.0;0.0;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk2_1d_dhds_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk2_1d_dhds_with_default_layers/summary_costs.csv index 4a1a5ce7..62be45b3 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk2_1d_dhds_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk2_1d_dhds_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;55.0;71.31;55.0;45.27;86.31 New core layer surface (quantity):;29.85;29.85;29.85;21.85;44.57 New core layer surface (cost):;17.91;17.91;17.91;13.11;26.74 New core layer surface (cost incl surtax):;44.94;44.94;44.94;36.41;74.26 -New maaiveld surface (quantity):;9.5;19.5;9.5;0.0;0.0 -New maaiveld surface (cost):;2.38;4.88;2.38;0.0;0.0 -New maaiveld surface (cost incl surtax):;5.96;12.23;5.96;0.0;0.0 +New ground level surface (quantity):;9.5;19.5;9.5;0.0;0.0 +New ground level surface (cost):;2.38;4.88;2.38;0.0;0.0 +New ground level surface (cost incl surtax):;5.96;12.23;5.96;0.0;0.0 Land purchase surface (quantity):;9.5;19.5;9.5;0.0;0.0 Land purchase surface (cost):;95.0;2925.0;1425.0;0.0;0.0 Land purchase surface (cost incl surtax):;134.14;4130.1;2012.1;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk2_1e_dhdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk2_1e_dhdp_with_default_layers/summary_costs.csv index cffdf576..b2feb6d7 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk2_1e_dhdp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk2_1e_dhdp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;77.9;61.59;45.29;45.27;86.31 New core layer surface (quantity):;44.35;24.35;24.35;21.85;44.57 New core layer surface (cost):;26.61;14.61;14.61;13.11;26.74 New core layer surface (cost incl surtax):;66.76;36.65;36.65;36.41;74.26 -New maaiveld surface (quantity):;23.0;13.0;3.0;0.0;0.0 -New maaiveld surface (cost):;5.75;3.25;0.75;0.0;0.0 -New maaiveld surface (cost incl surtax):;14.43;8.15;1.88;0.0;0.0 +New ground level surface (quantity):;23.0;13.0;3.0;0.0;0.0 +New ground level surface (cost):;5.75;3.25;0.75;0.0;0.0 +New ground level surface (cost incl surtax):;14.43;8.15;1.88;0.0;0.0 Land purchase surface (quantity):;23.0;13.0;3.0;0.0;0.0 Land purchase surface (cost):;230.0;1950.0;450.0;0.0;0.0 Land purchase surface (cost incl surtax):;324.76;2753.4;635.4;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk2_1f_dsdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk2_1f_dsdp_with_default_layers/summary_costs.csv index d2c1bb44..bcf5b24c 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk2_1f_dsdp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk2_1f_dsdp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;81.68;65.37;49.06;0.0;0.0 New core layer surface (quantity):;41.47;21.47;21.47;0.0;0.0 New core layer surface (cost):;24.88;12.88;12.88;0.0;0.0 New core layer surface (cost incl surtax):;62.43;32.32;32.32;0.0;0.0 -New maaiveld surface (quantity):;26.0;16.0;6.0;0.0;0.0 -New maaiveld surface (cost):;6.5;4.0;1.5;0.0;0.0 -New maaiveld surface (cost incl surtax):;16.31;10.04;3.76;0.0;0.0 +New ground level surface (quantity):;26.0;16.0;6.0;0.0;0.0 +New ground level surface (cost):;6.5;4.0;1.5;0.0;0.0 +New ground level surface (cost incl surtax):;16.31;10.04;3.76;0.0;0.0 Land purchase surface (quantity):;26.0;16.0;6.0;0.0;0.0 Land purchase surface (cost):;260.0;2400.0;900.0;0.0;0.0 Land purchase surface (cost incl surtax):;367.12;3388.8;1270.8;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk2_1g_dhdsdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk2_1g_dhdsdp_with_default_layers/summary_costs.csv index 3a308532..c4354e64 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk2_1g_dhdsdp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk2_1g_dhdsdp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;87.62;71.31;55.0;45.27;86.31 New core layer surface (quantity):;49.85;29.85;29.85;21.85;44.57 New core layer surface (cost):;29.91;17.91;17.91;13.11;26.74 New core layer surface (cost incl surtax):;75.05;44.94;44.94;36.41;74.26 -New maaiveld surface (quantity):;29.5;19.5;9.5;0.0;0.0 -New maaiveld surface (cost):;7.38;4.88;2.38;0.0;0.0 -New maaiveld surface (cost incl surtax):;18.5;12.23;5.96;0.0;0.0 +New ground level surface (quantity):;29.5;19.5;9.5;0.0;0.0 +New ground level surface (cost):;7.38;4.88;2.38;0.0;0.0 +New ground level surface (cost incl surtax):;18.5;12.23;5.96;0.0;0.0 Land purchase surface (quantity):;29.5;19.5;9.5;0.0;0.0 Land purchase surface (cost):;295.0;2925.0;1425.0;0.0;0.0 Land purchase surface (cost incl surtax):;416.54;4130.1;2012.1;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk2_2a_dh_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk2_2a_dh_with_default_layers/summary_costs.csv index ffc47ffd..f75a2ae1 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk2_2a_dh_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk2_2a_dh_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;50.44;66.75;50.44;46.19;87.12 New core layer surface (quantity):;27.51;27.51;27.51;22.52;45.17 New core layer surface (cost):;16.51;16.51;16.51;13.51;27.1 New core layer surface (cost incl surtax):;41.41;41.41;41.41;37.52;75.25 -New maaiveld surface (quantity):;6.0;16.0;6.0;0.0;0.0 -New maaiveld surface (cost):;1.5;4.0;1.5;0.0;0.0 -New maaiveld surface (cost incl surtax):;3.76;10.04;3.76;0.0;0.0 +New ground level surface (quantity):;6.0;16.0;6.0;0.0;0.0 +New ground level surface (cost):;1.5;4.0;1.5;0.0;0.0 +New ground level surface (cost incl surtax):;3.76;10.04;3.76;0.0;0.0 Land purchase surface (quantity):;6.0;16.0;6.0;0.0;0.0 Land purchase surface (cost):;60.0;2400.0;900.0;0.0;0.0 Land purchase surface (cost incl surtax):;84.72;3388.8;1270.8;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk2_2b_ds_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk2_2b_ds_with_default_layers/summary_costs.csv index 8d1e4774..85a5fc20 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk2_2b_ds_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk2_2b_ds_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;53.58;69.89;53.58;0.0;0.0 New core layer surface (quantity):;24.01;24.01;24.01;0.0;0.0 New core layer surface (cost):;14.41;14.41;14.41;0.0;0.0 New core layer surface (cost incl surtax):;36.15;36.15;36.15;0.0;0.0 -New maaiveld surface (quantity):;9.0;19.0;9.0;0.0;0.0 -New maaiveld surface (cost):;2.25;4.75;2.25;0.0;0.0 -New maaiveld surface (cost incl surtax):;5.65;11.92;5.65;0.0;0.0 +New ground level surface (quantity):;9.0;19.0;9.0;0.0;0.0 +New ground level surface (cost):;2.25;4.75;2.25;0.0;0.0 +New ground level surface (cost incl surtax):;5.65;11.92;5.65;0.0;0.0 Land purchase surface (quantity):;9.0;19.0;9.0;0.0;0.0 Land purchase surface (cost):;90.0;2850.0;1350.0;0.0;0.0 Land purchase surface (cost incl surtax):;127.08;4024.2;1906.2;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk2_2c_dp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk2_2c_dp_with_default_layers/summary_costs.csv index 1b76a589..56f664c1 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk2_2c_dp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk2_2c_dp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;121.67;56.44;0.0;0.0;0.0 New core layer surface (quantity):;66.44;0.0;0.0;0.0;0.0 New core layer surface (cost):;39.87;0.0;0.0;0.0;0.0 New core layer surface (cost incl surtax):;100.02;0.0;0.0;0.0;0.0 -New maaiveld surface (quantity):;50.0;10.0;0.0;0.0;0.0 -New maaiveld surface (cost):;12.5;2.5;0.0;0.0;0.0 -New maaiveld surface (cost incl surtax):;31.36;6.27;0.0;0.0;0.0 +New ground level surface (quantity):;50.0;10.0;0.0;0.0;0.0 +New ground level surface (cost):;12.5;2.5;0.0;0.0;0.0 +New ground level surface (cost incl surtax):;31.36;6.27;0.0;0.0;0.0 Land purchase surface (quantity):;50.0;10.0;0.0;0.0;0.0 Land purchase surface (cost):;500.0;1500.0;0.0;0.0;0.0 Land purchase surface (cost incl surtax):;706.0;2118.0;0.0;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk2_2d_dhds_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk2_2d_dhds_with_default_layers/summary_costs.csv index d445a34a..59e40942 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk2_2d_dhds_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk2_2d_dhds_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;66.26;82.57;66.26;46.19;87.12 New core layer surface (quantity):;36.52;36.52;36.52;22.52;45.17 New core layer surface (cost):;21.91;21.91;21.91;13.51;27.1 New core layer surface (cost incl surtax):;54.98;54.98;54.98;37.52;75.25 -New maaiveld surface (quantity):;16.5;26.5;16.5;0.0;0.0 -New maaiveld surface (cost):;4.12;6.62;4.12;0.0;0.0 -New maaiveld surface (cost incl surtax):;10.35;16.62;10.35;0.0;0.0 +New ground level surface (quantity):;16.5;26.5;16.5;0.0;0.0 +New ground level surface (cost):;4.12;6.62;4.12;0.0;0.0 +New ground level surface (cost incl surtax):;10.35;16.62;10.35;0.0;0.0 Land purchase surface (quantity):;16.5;26.5;16.5;0.0;0.0 Land purchase surface (cost):;165.0;3975.0;2475.0;0.0;0.0 Land purchase surface (cost incl surtax):;232.98;5612.7;3494.7;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk2_2e_dhdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk2_2e_dhdp_with_default_layers/summary_costs.csv index e568c4cd..41dd9e64 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk2_2e_dhdp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk2_2e_dhdp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;131.99;66.75;50.44;46.19;87.12 New core layer surface (quantity):;77.51;27.51;27.51;22.52;45.17 New core layer surface (cost):;46.51;16.51;16.51;13.51;27.1 New core layer surface (cost incl surtax):;116.68;41.41;41.41;37.52;75.25 -New maaiveld surface (quantity):;56.0;16.0;6.0;0.0;0.0 -New maaiveld surface (cost):;14.0;4.0;1.5;0.0;0.0 -New maaiveld surface (cost incl surtax):;35.13;10.04;3.76;0.0;0.0 +New ground level surface (quantity):;56.0;16.0;6.0;0.0;0.0 +New ground level surface (cost):;14.0;4.0;1.5;0.0;0.0 +New ground level surface (cost incl surtax):;35.13;10.04;3.76;0.0;0.0 Land purchase surface (quantity):;56.0;16.0;6.0;0.0;0.0 Land purchase surface (cost):;560.0;2400.0;900.0;0.0;0.0 Land purchase surface (cost incl surtax):;790.72;3388.8;1270.8;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk2_2f_dsdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk2_2f_dsdp_with_default_layers/summary_costs.csv index 03137af0..fae51e49 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk2_2f_dsdp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk2_2f_dsdp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;135.13;69.89;53.58;0.0;0.0 New core layer surface (quantity):;74.01;24.01;24.01;0.0;0.0 New core layer surface (cost):;44.41;14.41;14.41;0.0;0.0 New core layer surface (cost incl surtax):;111.42;36.15;36.15;0.0;0.0 -New maaiveld surface (quantity):;59.0;19.0;9.0;0.0;0.0 -New maaiveld surface (cost):;14.75;4.75;2.25;0.0;0.0 -New maaiveld surface (cost incl surtax):;37.01;11.92;5.65;0.0;0.0 +New ground level surface (quantity):;59.0;19.0;9.0;0.0;0.0 +New ground level surface (cost):;14.75;4.75;2.25;0.0;0.0 +New ground level surface (cost incl surtax):;37.01;11.92;5.65;0.0;0.0 Land purchase surface (quantity):;59.0;19.0;9.0;0.0;0.0 Land purchase surface (cost):;590.0;2850.0;1350.0;0.0;0.0 Land purchase surface (cost incl surtax):;833.08;4024.2;1906.2;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk2_2g_dhdsdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk2_2g_dhdsdp_with_default_layers/summary_costs.csv index 4f11e0b7..b4339421 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk2_2g_dhdsdp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk2_2g_dhdsdp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;147.8;82.57;66.26;46.19;87.12 New core layer surface (quantity):;86.52;36.52;36.52;22.52;45.17 New core layer surface (cost):;51.91;21.91;21.91;13.51;27.1 New core layer surface (cost incl surtax):;130.25;54.98;54.98;37.52;75.25 -New maaiveld surface (quantity):;66.5;26.5;16.5;0.0;0.0 -New maaiveld surface (cost):;16.62;6.62;4.12;0.0;0.0 -New maaiveld surface (cost incl surtax):;41.71;16.62;10.35;0.0;0.0 +New ground level surface (quantity):;66.5;26.5;16.5;0.0;0.0 +New ground level surface (cost):;16.62;6.62;4.12;0.0;0.0 +New ground level surface (cost incl surtax):;41.71;16.62;10.35;0.0;0.0 Land purchase surface (quantity):;66.5;26.5;16.5;0.0;0.0 Land purchase surface (cost):;665.0;3975.0;2475.0;0.0;0.0 Land purchase surface (cost incl surtax):;938.98;5612.7;3494.7;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk3_1a_dh_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk3_1a_dh_with_default_layers/summary_costs.csv index d17af34f..ee598a65 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk3_1a_dh_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk3_1a_dh_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;55.6;71.91;55.6;56.62;86.31 New core layer surface (quantity):;30.67;30.67;30.67;28.09;44.57 New core layer surface (cost):;18.4;18.4;18.4;16.86;26.74 New core layer surface (cost incl surtax):;46.17;46.17;46.17;46.81;74.26 -New maaiveld surface (quantity):;3.0;13.0;3.0;0.0;0.0 -New maaiveld surface (cost):;0.75;3.25;0.75;0.0;0.0 -New maaiveld surface (cost incl surtax):;1.88;8.15;1.88;0.0;0.0 +New ground level surface (quantity):;3.0;13.0;3.0;0.0;0.0 +New ground level surface (cost):;0.75;3.25;0.75;0.0;0.0 +New ground level surface (cost incl surtax):;1.88;8.15;1.88;0.0;0.0 Land purchase surface (quantity):;3.0;13.0;3.0;0.0;0.0 Land purchase surface (cost):;30.0;1950.0;450.0;0.0;0.0 Land purchase surface (cost incl surtax):;42.36;2753.4;635.4;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk3_1b_ds_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk3_1b_ds_with_default_layers/summary_costs.csv index b15c15f4..67a607b5 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk3_1b_ds_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk3_1b_ds_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;62.51;78.82;62.51;0.0;0.0 New core layer surface (quantity):;29.72;29.72;29.72;0.0;0.0 New core layer surface (cost):;17.83;17.83;17.83;0.0;0.0 New core layer surface (cost incl surtax):;44.74;44.74;44.74;0.0;0.0 -New maaiveld surface (quantity):;8.0;18.0;8.0;0.0;0.0 -New maaiveld surface (cost):;2.0;4.5;2.0;0.0;0.0 -New maaiveld surface (cost incl surtax):;5.02;11.29;5.02;0.0;0.0 +New ground level surface (quantity):;8.0;18.0;8.0;0.0;0.0 +New ground level surface (cost):;2.0;4.5;2.0;0.0;0.0 +New ground level surface (cost incl surtax):;5.02;11.29;5.02;0.0;0.0 Land purchase surface (quantity):;8.0;18.0;8.0;0.0;0.0 Land purchase surface (cost):;80.0;2700.0;1200.0;0.0;0.0 Land purchase surface (cost incl surtax):;112.96;3812.4;1694.4;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk3_1c_dp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk3_1c_dp_with_default_layers/summary_costs.csv index e5a05669..68291fdd 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk3_1c_dp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk3_1c_dp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;83.06;66.75;0.0;0.0;0.0 New core layer surface (quantity):;42.77;0.0;0.0;0.0;0.0 New core layer surface (cost):;25.66;0.0;0.0;0.0;0.0 New core layer surface (cost incl surtax):;64.38;0.0;0.0;0.0;0.0 -New maaiveld surface (quantity):;20.0;10.0;0.0;0.0;0.0 -New maaiveld surface (cost):;5.0;2.5;0.0;0.0;0.0 -New maaiveld surface (cost incl surtax):;12.54;6.27;0.0;0.0;0.0 +New ground level surface (quantity):;20.0;10.0;0.0;0.0;0.0 +New ground level surface (cost):;5.0;2.5;0.0;0.0;0.0 +New ground level surface (cost incl surtax):;12.54;6.27;0.0;0.0;0.0 Land purchase surface (quantity):;20.0;10.0;0.0;0.0;0.0 Land purchase surface (cost):;200.0;1500.0;0.0;0.0;0.0 Land purchase surface (cost incl surtax):;282.4;2118.0;0.0;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk3_1d_dhds_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk3_1d_dhds_with_default_layers/summary_costs.csv index 97740c1c..27ad0e0f 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk3_1d_dhds_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk3_1d_dhds_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;68.45;84.76;68.45;56.62;86.31 New core layer surface (quantity):;38.1;38.1;38.1;28.09;44.57 New core layer surface (cost):;22.86;22.86;22.86;16.86;26.74 New core layer surface (cost incl surtax):;57.36;57.36;57.36;46.81;74.26 -New maaiveld surface (quantity):;11.5;21.5;11.5;0.0;0.0 -New maaiveld surface (cost):;2.88;5.38;2.88;0.0;0.0 -New maaiveld surface (cost incl surtax):;7.21;13.49;7.21;0.0;0.0 +New ground level surface (quantity):;11.5;21.5;11.5;0.0;0.0 +New ground level surface (cost):;2.88;5.38;2.88;0.0;0.0 +New ground level surface (cost incl surtax):;7.21;13.49;7.21;0.0;0.0 Land purchase surface (quantity):;11.5;21.5;11.5;0.0;0.0 Land purchase surface (cost):;115.0;3225.0;1725.0;0.0;0.0 Land purchase surface (cost incl surtax):;162.38;4553.7;2435.7;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk3_1e_dhdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk3_1e_dhdp_with_default_layers/summary_costs.csv index 21041b08..de057f67 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk3_1e_dhdp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk3_1e_dhdp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;88.22;71.91;55.6;56.62;86.31 New core layer surface (quantity):;50.67;30.67;30.67;28.09;44.57 New core layer surface (cost):;30.4;18.4;18.4;16.86;26.74 New core layer surface (cost incl surtax):;76.28;46.17;46.17;46.81;74.26 -New maaiveld surface (quantity):;23.0;13.0;3.0;0.0;0.0 -New maaiveld surface (cost):;5.75;3.25;0.75;0.0;0.0 -New maaiveld surface (cost incl surtax):;14.43;8.15;1.88;0.0;0.0 +New ground level surface (quantity):;23.0;13.0;3.0;0.0;0.0 +New ground level surface (cost):;5.75;3.25;0.75;0.0;0.0 +New ground level surface (cost incl surtax):;14.43;8.15;1.88;0.0;0.0 Land purchase surface (quantity):;23.0;13.0;3.0;0.0;0.0 Land purchase surface (cost):;230.0;1950.0;450.0;0.0;0.0 Land purchase surface (cost incl surtax):;324.76;2753.4;635.4;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk3_1f_dsdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk3_1f_dsdp_with_default_layers/summary_costs.csv index f78d7fd7..f85f7d8b 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk3_1f_dsdp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk3_1f_dsdp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;95.13;78.82;62.51;0.0;0.0 New core layer surface (quantity):;49.72;29.72;29.72;0.0;0.0 New core layer surface (cost):;29.83;17.83;17.83;0.0;0.0 New core layer surface (cost incl surtax):;74.84;44.74;44.74;0.0;0.0 -New maaiveld surface (quantity):;28.0;18.0;8.0;0.0;0.0 -New maaiveld surface (cost):;7.0;4.5;2.0;0.0;0.0 -New maaiveld surface (cost incl surtax):;17.56;11.29;5.02;0.0;0.0 +New ground level surface (quantity):;28.0;18.0;8.0;0.0;0.0 +New ground level surface (cost):;7.0;4.5;2.0;0.0;0.0 +New ground level surface (cost incl surtax):;17.56;11.29;5.02;0.0;0.0 Land purchase surface (quantity):;28.0;18.0;8.0;0.0;0.0 Land purchase surface (cost):;280.0;2700.0;1200.0;0.0;0.0 Land purchase surface (cost incl surtax):;395.36;3812.4;1694.4;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk3_1g_dhdsdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk3_1g_dhdsdp_with_default_layers/summary_costs.csv index e309c269..051b830e 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk3_1g_dhdsdp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk3_1g_dhdsdp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;101.07;84.76;68.45;56.62;86.31 New core layer surface (quantity):;58.1;38.1;38.1;28.09;44.57 New core layer surface (cost):;34.86;22.86;22.86;16.86;26.74 New core layer surface (cost incl surtax):;87.46;57.36;57.36;46.81;74.26 -New maaiveld surface (quantity):;31.5;21.5;11.5;0.0;0.0 -New maaiveld surface (cost):;7.88;5.38;2.88;0.0;0.0 -New maaiveld surface (cost incl surtax):;19.76;13.49;7.21;0.0;0.0 +New ground level surface (quantity):;31.5;21.5;11.5;0.0;0.0 +New ground level surface (cost):;7.88;5.38;2.88;0.0;0.0 +New ground level surface (cost incl surtax):;19.76;13.49;7.21;0.0;0.0 Land purchase surface (quantity):;31.5;21.5;11.5;0.0;0.0 Land purchase surface (cost):;315.0;3225.0;1725.0;0.0;0.0 Land purchase surface (cost incl surtax):;444.78;4553.7;2435.7;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk3_2a_dh_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk3_2a_dh_with_default_layers/summary_costs.csv index 23e10f1c..e107e87b 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk3_2a_dh_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk3_2a_dh_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;60.76;77.07;60.76;57.45;87.12 New core layer surface (quantity):;33.83;33.83;33.83;28.68;45.17 New core layer surface (cost):;20.3;20.3;20.3;17.21;27.1 New core layer surface (cost incl surtax):;50.93;50.93;50.93;47.79;75.25 -New maaiveld surface (quantity):;6.0;16.0;6.0;0.0;0.0 -New maaiveld surface (cost):;1.5;4.0;1.5;0.0;0.0 -New maaiveld surface (cost incl surtax):;3.76;10.04;3.76;0.0;0.0 +New ground level surface (quantity):;6.0;16.0;6.0;0.0;0.0 +New ground level surface (cost):;1.5;4.0;1.5;0.0;0.0 +New ground level surface (cost incl surtax):;3.76;10.04;3.76;0.0;0.0 Land purchase surface (quantity):;6.0;16.0;6.0;0.0;0.0 Land purchase surface (cost):;60.0;2400.0;900.0;0.0;0.0 Land purchase surface (cost incl surtax):;84.72;3388.8;1270.8;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk3_2b_ds_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk3_2b_ds_with_default_layers/summary_costs.csv index fecef651..75990299 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk3_2b_ds_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk3_2b_ds_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;68.62;84.93;68.62;0.0;0.0 New core layer surface (quantity):;33.23;33.23;33.23;0.0;0.0 New core layer surface (cost):;19.94;19.94;19.94;0.0;0.0 New core layer surface (cost incl surtax):;50.03;50.03;50.03;0.0;0.0 -New maaiveld surface (quantity):;12.0;22.0;12.0;0.0;0.0 -New maaiveld surface (cost):;3.0;5.5;3.0;0.0;0.0 -New maaiveld surface (cost incl surtax):;7.53;13.8;7.53;0.0;0.0 +New ground level surface (quantity):;12.0;22.0;12.0;0.0;0.0 +New ground level surface (cost):;3.0;5.5;3.0;0.0;0.0 +New ground level surface (cost incl surtax):;7.53;13.8;7.53;0.0;0.0 Land purchase surface (quantity):;12.0;22.0;12.0;0.0;0.0 Land purchase surface (cost):;120.0;3300.0;1800.0;0.0;0.0 Land purchase surface (cost incl surtax):;169.44;4659.6;2541.6;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk3_2c_dp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk3_2c_dp_with_default_layers/summary_costs.csv index 89e02265..600b5164 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk3_2c_dp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk3_2c_dp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;131.99;66.75;0.0;0.0;0.0 New core layer surface (quantity):;72.77;0.0;0.0;0.0;0.0 New core layer surface (cost):;43.66;0.0;0.0;0.0;0.0 New core layer surface (cost incl surtax):;109.55;0.0;0.0;0.0;0.0 -New maaiveld surface (quantity):;50.0;10.0;0.0;0.0;0.0 -New maaiveld surface (cost):;12.5;2.5;0.0;0.0;0.0 -New maaiveld surface (cost incl surtax):;31.36;6.27;0.0;0.0;0.0 +New ground level surface (quantity):;50.0;10.0;0.0;0.0;0.0 +New ground level surface (cost):;12.5;2.5;0.0;0.0;0.0 +New ground level surface (cost incl surtax):;31.36;6.27;0.0;0.0;0.0 Land purchase surface (quantity):;50.0;10.0;0.0;0.0;0.0 Land purchase surface (cost):;500.0;1500.0;0.0;0.0;0.0 Land purchase surface (cost incl surtax):;706.0;2118.0;0.0;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk3_2d_dhds_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk3_2d_dhds_with_default_layers/summary_costs.csv index e6aeb259..3016c731 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk3_2d_dhds_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk3_2d_dhds_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;81.3;97.6;81.3;57.45;87.12 New core layer surface (quantity):;45.74;45.74;45.74;28.68;45.17 New core layer surface (cost):;27.45;27.45;27.45;17.21;27.1 New core layer surface (cost incl surtax):;68.86;68.86;68.86;47.79;75.25 -New maaiveld surface (quantity):;19.5;29.5;19.5;0.0;0.0 -New maaiveld surface (cost):;4.88;7.38;4.88;0.0;0.0 -New maaiveld surface (cost incl surtax):;12.23;18.5;12.23;0.0;0.0 +New ground level surface (quantity):;19.5;29.5;19.5;0.0;0.0 +New ground level surface (cost):;4.88;7.38;4.88;0.0;0.0 +New ground level surface (cost incl surtax):;12.23;18.5;12.23;0.0;0.0 Land purchase surface (quantity):;19.5;29.5;19.5;0.0;0.0 Land purchase surface (cost):;195.0;4425.0;2925.0;0.0;0.0 Land purchase surface (cost incl surtax):;275.34;6248.1;4130.1;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk3_2e_dhdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk3_2e_dhdp_with_default_layers/summary_costs.csv index 80b63a63..682bde59 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk3_2e_dhdp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk3_2e_dhdp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;142.3;77.07;60.76;57.45;87.12 New core layer surface (quantity):;83.83;33.83;33.83;28.68;45.17 New core layer surface (cost):;50.3;20.3;20.3;17.21;27.1 New core layer surface (cost incl surtax):;126.2;50.93;50.93;47.79;75.25 -New maaiveld surface (quantity):;56.0;16.0;6.0;0.0;0.0 -New maaiveld surface (cost):;14.0;4.0;1.5;0.0;0.0 -New maaiveld surface (cost incl surtax):;35.13;10.04;3.76;0.0;0.0 +New ground level surface (quantity):;56.0;16.0;6.0;0.0;0.0 +New ground level surface (cost):;14.0;4.0;1.5;0.0;0.0 +New ground level surface (cost incl surtax):;35.13;10.04;3.76;0.0;0.0 Land purchase surface (quantity):;56.0;16.0;6.0;0.0;0.0 Land purchase surface (cost):;560.0;2400.0;900.0;0.0;0.0 Land purchase surface (cost incl surtax):;790.72;3388.8;1270.8;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk3_2f_dsdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk3_2f_dsdp_with_default_layers/summary_costs.csv index ff6a129b..0337632d 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk3_2f_dsdp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk3_2f_dsdp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;150.16;84.93;68.62;0.0;0.0 New core layer surface (quantity):;83.23;33.23;33.23;0.0;0.0 New core layer surface (cost):;49.94;19.94;19.94;0.0;0.0 New core layer surface (cost incl surtax):;125.3;50.03;50.03;0.0;0.0 -New maaiveld surface (quantity):;62.0;22.0;12.0;0.0;0.0 -New maaiveld surface (cost):;15.5;5.5;3.0;0.0;0.0 -New maaiveld surface (cost incl surtax):;38.89;13.8;7.53;0.0;0.0 +New ground level surface (quantity):;62.0;22.0;12.0;0.0;0.0 +New ground level surface (cost):;15.5;5.5;3.0;0.0;0.0 +New ground level surface (cost incl surtax):;38.89;13.8;7.53;0.0;0.0 Land purchase surface (quantity):;62.0;22.0;12.0;0.0;0.0 Land purchase surface (cost):;620.0;3300.0;1800.0;0.0;0.0 Land purchase surface (cost incl surtax):;875.44;4659.6;2541.6;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk3_2g_dhdsdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk3_2g_dhdsdp_with_default_layers/summary_costs.csv index c91e7d93..6e865d25 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk3_2g_dhdsdp_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk3_2g_dhdsdp_with_default_layers/summary_costs.csv @@ -28,9 +28,9 @@ New clay layer surface (cost incl surtax):;162.84;97.6;81.3;57.45;87.12 New core layer surface (quantity):;95.74;45.74;45.74;28.68;45.17 New core layer surface (cost):;57.45;27.45;27.45;17.21;27.1 New core layer surface (cost incl surtax):;144.13;68.86;68.86;47.79;75.25 -New maaiveld surface (quantity):;69.5;29.5;19.5;0.0;0.0 -New maaiveld surface (cost):;17.38;7.38;4.88;0.0;0.0 -New maaiveld surface (cost incl surtax):;43.59;18.5;12.23;0.0;0.0 +New ground level surface (quantity):;69.5;29.5;19.5;0.0;0.0 +New ground level surface (cost):;17.38;7.38;4.88;0.0;0.0 +New ground level surface (cost incl surtax):;43.59;18.5;12.23;0.0;0.0 Land purchase surface (quantity):;69.5;29.5;19.5;0.0;0.0 Land purchase surface (cost):;695.0;4425.0;2925.0;0.0;0.0 Land purchase surface (cost incl surtax):;981.34;6248.1;4130.1;0.0;0.0