diff --git a/koswat.log b/koswat.log new file mode 100644 index 00000000..0fe1afdf --- /dev/null +++ b/koswat.log @@ -0,0 +1,182 @@ +2024-11-06 10:47:20 AM - [koswat_handler.py:119] - root - INFO - Initialized Koswat. +2024-11-06 10:48:01 AM - [koswat_run_settings_importer.py:67] - root - INFO - Importing INI configuration from c:\KOSWAT_app\invoer\RaLi\KOSWAT_analyse_RaLi.ini +2024-11-06 10:48:01 AM - [koswat_costs_importer.py:41] - root - INFO - Importing costs settings from c:\KOSWAT_app\invoer\koswat_costs_2023.ini. +2024-11-06 10:51:37 AM - [surroundings_wrapper_collection_importer.py:77] - root - ERROR - Could not load surroundings for dike section DV_11A_2. Detailed error: No point fromt the *.shp file matches the ones in the *.csv file. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:96] - root - INFO - Importing INI configuration completed. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:99] - root - INFO - Mapping data to Koswat Settings +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_1_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_1_2. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_1_3. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_1_4. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_2A_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_2A_2. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_2B_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_2B_2. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_2B_3. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_2B_4. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_2B_5. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_2B_6. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_2B_7. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_2B_8. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_3_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_3_2. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_3_3. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_3_4. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_3_5. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_4_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_4_2. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_4_3. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_4_4. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_4_5. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_5A. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_5B_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_5B_2. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_5B_3. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_6_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_6_2. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_7A_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_7A_2. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_7A_3. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_7A_4. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_7A_5. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_7B_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_7B_2. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_7B_3. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_8_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_8_2. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_9A_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_9A_2. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_9A_3. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_9A_4. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_9A_5. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_9B_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_9B_2. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_9B_3. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_9B_4. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_9B_5. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_9B_6. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_9B_7. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_10_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_10_2. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_10_3. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_10_4. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_10_5. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_11A_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_11A_2. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:153] - root - INFO - Creating scenarios for profile DV_11B_3. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:166] - root - INFO - Created sub scenario Scenario_1. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:170] - root - INFO - Finished generating koswat scenarios. A total of 60 scenarios were created. +2024-11-06 10:51:37 AM - [koswat_run_settings_importer.py:108] - root - INFO - Settings import completed. +2024-11-06 10:55:27 AM - [koswat_summary_builder.py:118] - root - INFO - Creating analysis for DV_1_1 - scenario - Scenario_1 +2024-11-06 10:55:27 AM - [reinforcement_profile_builder_base.py:64] - root - INFO - Building reinforcement SoilReinforcementProfile +2024-11-06 10:55:27 AM - [calc_library.py:18] - root - WARNING - Polygon with 'multi line', most likely due to a geometry split in two parts. Ordering of points is not supported, some calculation errors might occur as a consequence of this. +2024-11-06 10:55:27 AM - [reinforcement_profile_builder_base.py:74] - root - INFO - Built reinforcement Grondmaatregel profiel +2024-11-06 10:55:27 AM - [reinforcement_profile_builder_base.py:64] - root - INFO - Building reinforcement VPSReinforcementProfile +2024-11-06 10:55:27 AM - [calc_library.py:18] - root - WARNING - Polygon with 'multi line', most likely due to a geometry split in two parts. Ordering of points is not supported, some calculation errors might occur as a consequence of this. +2024-11-06 10:55:27 AM - [reinforcement_profile_builder_base.py:74] - root - INFO - Built reinforcement Verticale piping oplossing +2024-11-06 10:55:27 AM - [reinforcement_profile_builder_base.py:64] - root - INFO - Building reinforcement PipingWallReinforcementProfile +2024-11-06 10:55:27 AM - [reinforcement_profile_builder_base.py:74] - root - INFO - Built reinforcement Kwelscherm +2024-11-06 10:55:27 AM - [reinforcement_profile_builder_base.py:64] - root - INFO - Building reinforcement StabilityWallReinforcementProfile +2024-11-06 10:55:27 AM - [calc_library.py:18] - root - WARNING - Polygon with 'multi line', most likely due to a geometry split in two parts. Ordering of points is not supported, some calculation errors might occur as a consequence of this. +2024-11-06 10:55:27 AM - [calc_library.py:18] - root - WARNING - Polygon with 'multi line', most likely due to a geometry split in two parts. Ordering of points is not supported, some calculation errors might occur as a consequence of this. +2024-11-06 10:55:27 AM - [reinforcement_profile_builder_base.py:74] - root - INFO - Built reinforcement Stabiliteitswand +2024-11-06 10:55:27 AM - [reinforcement_profile_builder_base.py:64] - root - INFO - Building reinforcement CofferdamReinforcementProfile +2024-11-06 10:55:27 AM - [reinforcement_profile_builder_base.py:74] - root - INFO - Built reinforcement Kistdam +2024-11-06 10:55:28 AM - [koswat_summary_location_matrix_builder.py:115] - root - INFO - Initalizing locations-reinforcements matrix. +2024-11-06 10:55:29 AM - [koswat_summary_location_matrix_builder.py:152] - root - INFO - Finalized locations-reinforcements matrix. +2024-11-06 10:55:29 AM - [order_strategy_clustering.py:70] - root - INFO - Non-compliant clusters found for Grondmaatregel profiel: 0 +2024-11-06 10:55:29 AM - [order_strategy_clustering.py:70] - root - INFO - Non-compliant clusters found for Kwelscherm: 0 +2024-11-06 10:55:29 AM - [koswat_handler.py:45] - root - INFO - Analysis created. +2024-11-06 10:55:29 AM - [koswat_handler.py:53] - root - INFO - Exporting csv results to c:\KOSWAT_app\uitvoer\uitvoer_Rali_20241016\dike_DV_1_1\scenario_scenario_1. +2024-11-06 10:55:30 AM - [raw.py:723] - pyogrio._io - INFO - Created 3 records +2024-11-06 10:55:30 AM - [raw.py:723] - pyogrio._io - INFO - Created 3 records +2024-11-06 10:55:30 AM - [raw.py:723] - pyogrio._io - INFO - Created 3 records +2024-11-06 10:55:30 AM - [koswat_handler.py:59] - root - INFO - Exported summary results to: c:\KOSWAT_app\uitvoer\uitvoer_Rali_20241016\dike_DV_1_1\scenario_scenario_1 +2024-11-06 10:55:31 AM - [koswat_handler.py:71] - root - INFO - Exported comparison plots to: c:\KOSWAT_app\uitvoer\uitvoer_Rali_20241016\dike_DV_1_1\scenario_scenario_1 +2024-11-06 10:55:32 AM - [koswat_handler.py:71] - root - INFO - Exported comparison plots to: c:\KOSWAT_app\uitvoer\uitvoer_Rali_20241016\dike_DV_1_1\scenario_scenario_1 +2024-11-06 10:55:33 AM - [koswat_handler.py:71] - root - INFO - Exported comparison plots to: c:\KOSWAT_app\uitvoer\uitvoer_Rali_20241016\dike_DV_1_1\scenario_scenario_1 +2024-11-06 10:55:34 AM - [koswat_handler.py:71] - root - INFO - Exported comparison plots to: c:\KOSWAT_app\uitvoer\uitvoer_Rali_20241016\dike_DV_1_1\scenario_scenario_1 +2024-11-06 10:55:35 AM - [koswat_handler.py:71] - root - INFO - Exported comparison plots to: c:\KOSWAT_app\uitvoer\uitvoer_Rali_20241016\dike_DV_1_1\scenario_scenario_1 +2024-11-06 10:55:35 AM - [koswat_summary_builder.py:118] - root - INFO - Creating analysis for DV_1_2 - scenario - Scenario_1 +2024-11-06 10:55:35 AM - [reinforcement_profile_builder_base.py:64] - root - INFO - Building reinforcement SoilReinforcementProfile +2024-11-06 10:55:35 AM - [calc_library.py:18] - root - WARNING - Polygon with 'multi line', most likely due to a geometry split in two parts. Ordering of points is not supported, some calculation errors might occur as a consequence of this. +2024-11-06 10:55:35 AM - [reinforcement_profile_builder_base.py:74] - root - INFO - Built reinforcement Grondmaatregel profiel +2024-11-06 10:55:35 AM - [reinforcement_profile_builder_base.py:64] - root - INFO - Building reinforcement VPSReinforcementProfile +2024-11-06 10:55:35 AM - [calc_library.py:18] - root - WARNING - Polygon with 'multi line', most likely due to a geometry split in two parts. Ordering of points is not supported, some calculation errors might occur as a consequence of this. +2024-11-06 10:55:36 AM - [reinforcement_profile_builder_base.py:74] - root - INFO - Built reinforcement Verticale piping oplossing +2024-11-06 10:55:36 AM - [reinforcement_profile_builder_base.py:64] - root - INFO - Building reinforcement PipingWallReinforcementProfile +2024-11-06 10:55:36 AM - [reinforcement_profile_builder_base.py:74] - root - INFO - Built reinforcement Kwelscherm +2024-11-06 10:55:36 AM - [reinforcement_profile_builder_base.py:64] - root - INFO - Building reinforcement StabilityWallReinforcementProfile +2024-11-06 10:55:36 AM - [calc_library.py:18] - root - WARNING - Polygon with 'multi line', most likely due to a geometry split in two parts. Ordering of points is not supported, some calculation errors might occur as a consequence of this. +2024-11-06 10:55:36 AM - [calc_library.py:18] - root - WARNING - Polygon with 'multi line', most likely due to a geometry split in two parts. Ordering of points is not supported, some calculation errors might occur as a consequence of this. +2024-11-06 10:55:36 AM - [reinforcement_profile_builder_base.py:74] - root - INFO - Built reinforcement Stabiliteitswand +2024-11-06 10:55:36 AM - [reinforcement_profile_builder_base.py:64] - root - INFO - Building reinforcement CofferdamReinforcementProfile +2024-11-06 10:55:36 AM - [reinforcement_profile_builder_base.py:74] - root - INFO - Built reinforcement Kistdam +2024-11-06 10:55:36 AM - [koswat_summary_location_matrix_builder.py:115] - root - INFO - Initalizing locations-reinforcements matrix. +2024-11-06 10:55:37 AM - [koswat_summary_location_matrix_builder.py:152] - root - INFO - Finalized locations-reinforcements matrix. +2024-11-06 10:55:37 AM - [order_strategy_clustering.py:70] - root - INFO - Non-compliant clusters found for Grondmaatregel profiel: 0 +2024-11-06 10:55:37 AM - [order_strategy_clustering.py:70] - root - INFO - Non-compliant clusters found for Kwelscherm: 0 +2024-11-06 10:55:37 AM - [koswat_handler.py:45] - root - INFO - Analysis created. +2024-11-06 10:55:37 AM - [koswat_handler.py:53] - root - INFO - Exporting csv results to c:\KOSWAT_app\uitvoer\uitvoer_Rali_20241016\dike_DV_1_2\scenario_scenario_1. +2024-11-06 10:55:37 AM - [koswat_handler.py:109] - root - ERROR - Error while running scenario Scenario_1__DV_1_2, more details: IllegalArgumentException: point array must contain 0 or >1 elements + +2024-11-06 10:55:37 AM - [koswat_handler.py:123] - root - INFO - Finalized Koswat. diff --git a/koswat/configuration/settings/reinforcements/koswat_soil_settings.py b/koswat/configuration/settings/reinforcements/koswat_soil_settings.py index 7be00a2b..c1f8e395 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_berm_height: float = 0 - max_berm_height_factor: float = 0 - factor_increase_berm_height: float = 0 + min_berm_height: float = 0.5 + max_berm_height_factor: float = 0.4 + factor_increase_berm_height: float = 0.05 def is_valid(self) -> bool: return True 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 abc21392..5025f89f 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 @@ -6,6 +6,9 @@ from koswat.configuration.settings.reinforcements.koswat_reinforcement_settings import ( KoswatReinforcementSettings, ) +from koswat.configuration.settings.reinforcements.koswat_soil_settings import ( + KoswatSoilSettings, +) from koswat.dike.koswat_input_profile_protocol import KoswatInputProfileProtocol from koswat.dike.koswat_profile_protocol import KoswatProfileProtocol from koswat.dike.profile.koswat_input_profile_base import KoswatInputProfileBase @@ -32,41 +35,35 @@ def __init__(self) -> None: self.base_profile = None self.scenario = None - def _calculate_new_crest_height( + def _calculate_new_waterside_slope( self, base_data: KoswatInputProfileBase, scenario: KoswatScenario ) -> float: - return base_data.crest_height + scenario.d_h + _operand = ( + 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_new_polderside_slope( + def _calculate_new_polderside_berm_height( self, base_data: KoswatInputProfileBase, scenario: KoswatScenario ) -> float: - """ - ( Kruin_Breedte_Oud - + (Kruin_Hoogte_Oud-Binnen_Maaiveld_Oud) - *Binnen_Talud_Oud-Kruin_Breedte_Nieuw) - /(Kruin_Hoogte_Oud+dH) - """ - _mid_operand = base_data.polderside_slope * ( - base_data.crest_height - base_data.polderside_ground_level + _dike_height_old = base_data.crest_height - base_data.polderside_ground_level + _berm_height_old = ( + base_data.polderside_berm_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 - ) - return _operand / _dividend + _berm_factor_old = _berm_height_old / _dike_height_old + return base_data.polderside_berm_height + _berm_factor_old * scenario.d_h - def _calculate_new_waterside_slope( + def _calculate_new_polderside_slope( self, base_data: KoswatInputProfileBase, scenario: KoswatScenario ) -> float: - """ - Kruin_Hoogte_Oud*Buiten_Talud_Oud - /(Kruin_Hoogte_Oud+dH) - """ _operand = ( - base_data.crest_height - base_data.waterside_ground_level - ) * base_data.waterside_slope + base_data.crest_height - base_data.polderside_ground_level + ) * base_data.polderside_slope _dividend = ( - base_data.crest_height - base_data.waterside_ground_level + scenario.d_h + base_data.crest_height - base_data.polderside_ground_level + scenario.d_h ) return _operand / _dividend @@ -74,22 +71,18 @@ def _calculate_length_cofferdam( self, old_data: KoswatInputProfileProtocol, cofferdam_settings: KoswatCofferdamSettings, - soil_polderside_berm_width: float, + seepage_length: float, new_crest_height: float, ) -> float: - """ - Identical to calculation of Stability wall - """ - if soil_polderside_berm_width == 0: + _length_stability = (new_crest_height - 0.5) - (old_data.pleistocene - 1) + if seepage_length == 0: # Length of wall is not determined by piping. _length_piping = 0.0 else: _length_piping = ( - (soil_polderside_berm_width / 6) - + (new_crest_height - 0.5) - - old_data.aquifer + (seepage_length / 6) + (new_crest_height - 0.5) - old_data.aquifer ) - _length_stability = (new_crest_height - 0.5) - (old_data.pleistocene - 1) + return round( min( max( @@ -114,42 +107,49 @@ def _determine_construction_type( def _calculate_new_input_profile( self, base_data: KoswatInputProfileBase, + soil_settings: KoswatSoilSettings, cofferdam_settings: KoswatCofferdamSettings, scenario: KoswatScenario, ) -> CofferDamInputProfile: _new_data = CofferDamInputProfile() _new_data.dike_section = base_data.dike_section _new_data.waterside_ground_level = base_data.waterside_ground_level + _new_data.waterside_berm_width = ( + base_data.waterside_berm_width + ) # maintain current berm waterside + _new_data.waterside_berm_height = ( + self._calculate_soil_new_waterside_berm_height(base_data, scenario) + ) _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( + _new_data.crest_height = self._calculate_soil_new_crest_height( base_data, scenario ) - _new_data.polderside_berm_width = 0 - _new_data.polderside_berm_height = base_data.polderside_ground_level + _new_data.crest_width = base_data.crest_width # no widening of crest allowed _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.polderside_berm_width = ( + base_data.polderside_berm_width + ) # maintain current berm polderside + _new_data.polderside_berm_height = self._calculate_new_polderside_berm_height( + base_data, scenario ) - _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.polderside_slope = self._calculate_new_polderside_slope( + base_data, scenario + ) + + _seepage_length = scenario.d_p _new_data.construction_length = self._calculate_length_cofferdam( - base_data, - cofferdam_settings, - _soil_polderside_berm_width, - _new_data.crest_height, + base_data, cofferdam_settings, _seepage_length, _new_data.crest_height ) _new_data.construction_type = self._determine_construction_type( _new_data.construction_length ) + _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 = cofferdam_settings.soil_surtax_factor _new_data.constructive_surtax_factor = ( cofferdam_settings.constructive_surtax_factor @@ -160,6 +160,7 @@ def _calculate_new_input_profile( def build(self) -> CofferDamInputProfile: return self._calculate_new_input_profile( self.base_profile.input_data, + self.reinforcement_settings.soil_settings, self.reinforcement_settings.cofferdam_settings, self.scenario, ) 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 bc8cb099..f8d412da 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 @@ -6,6 +6,9 @@ from koswat.configuration.settings.reinforcements.koswat_reinforcement_settings import ( KoswatReinforcementSettings, ) +from koswat.configuration.settings.reinforcements.koswat_soil_settings import ( + KoswatSoilSettings, +) from koswat.dike.koswat_profile_protocol import KoswatProfileProtocol from koswat.dike.profile.koswat_input_profile_base import KoswatInputProfileBase from koswat.dike_reinforcements.input_profile.piping_wall.piping_wall_input_profile import ( @@ -35,13 +38,13 @@ def _calculate_length_piping_wall( self, old_data: KoswatInputProfileBase, piping_wall_settings: KoswatPipingWallSettings, - soil_polderside_berm_width: float, + seepage_length: float, ) -> float: - if soil_polderside_berm_width == 0: + if seepage_length == 0: # No wall is needed. return 0 _length_piping = ( - (soil_polderside_berm_width / 6) + (seepage_length / 6) + (old_data.polderside_ground_level - old_data.aquifer) + 1 ) @@ -56,37 +59,6 @@ def _calculate_length_piping_wall( 1, ) - def _calculate_new_crest_height( - self, base_data: KoswatInputProfileBase, scenario: KoswatScenario - ) -> float: - return base_data.crest_height + scenario.d_h - - def _calculate_new_polderside_slope( - self, base_data: KoswatInputProfileBase, scenario: KoswatScenario - ) -> float: - """ - MAX( - Binnen_Talud_Oud, - ( - dS - -dH*Buiten_Talud_Nieuw - -(Kruin_Breedte_Nieuw-Kruin_Breedte_Oud) - +(Kruin_Hoogte_Oud-Binnen_Maaiveld_Oud)*Binnen_Talud_Oud) - /(Kruin_Hoogte_Oud-Binnen_Maaiveld_Oud+dH)) - """ - _first_part = scenario.d_h * scenario.waterside_slope - _second_part = scenario.crest_width - base_data.crest_width - _third_parth = ( - 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.polderside_slope, _right_side) - def _determine_construction_type( self, overgang: float, construction_length: float ) -> ConstructionTypeEnum | None: @@ -100,33 +72,118 @@ def _determine_construction_type( def _calculate_new_input_profile( self, base_data: KoswatInputProfileBase, + soil_settings: KoswatSoilSettings, piping_wall_settings: KoswatPipingWallSettings, scenario: KoswatScenario, ) -> PipingWallInputProfile: _new_data = PipingWallInputProfile() _new_data.dike_section = base_data.dike_section _new_data.waterside_ground_level = base_data.waterside_ground_level + _new_data.polderside_ground_level = base_data.polderside_ground_level _new_data.waterside_slope = scenario.waterside_slope - _new_data.waterside_berm_height = base_data.waterside_berm_height + _new_data.waterside_berm_height = ( + self._calculate_soil_new_waterside_berm_height(base_data, scenario) + ) _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( + _new_data.crest_height = self._calculate_soil_new_crest_height( 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.crest_width = scenario.crest_width + + _dike_height_old = base_data.crest_height - base_data.polderside_ground_level + _berm_height_old = ( + base_data.polderside_berm_height - base_data.polderside_ground_level ) + _berm_factor_old = _berm_height_old / _dike_height_old + + if _berm_factor_old > soil_settings.max_berm_height_factor: + _berm_old_is_stability = True + else: + _berm_old_is_stability = False + + _dikebase_stability_old = ( + base_data.crest_width + + _dike_height_old * base_data.polderside_slope + + _berm_old_is_stability * base_data.polderside_berm_width + ) + _dikebase_piping_old = ( + base_data.crest_width + + _dike_height_old * base_data.polderside_slope + + base_data.polderside_berm_width + ) + + _dike_height_new = _new_data.crest_height - _new_data.polderside_ground_level + _dikebase_heigth_new = ( + scenario.d_h * _new_data.waterside_slope + + _new_data.crest_width + + _dike_height_new * base_data.polderside_slope + ) + _dikebase_stability_new = _dikebase_stability_old + scenario.d_s + _dikebase_piping_new = max( + _dikebase_piping_old, _dikebase_heigth_new, _dikebase_stability_new + ) + _dikebase_piping_needed = _dikebase_piping_old + scenario.d_p + _seepage_length = max(_dikebase_piping_needed - _dikebase_piping_new, 0) + + # Is a berm for piping neccesary --> Maybe there was an old one?? + if _dikebase_piping_new > max(_dikebase_heigth_new, _dikebase_stability_new): + _new_data.polderside_berm_width = _dikebase_piping_new - max( + _dikebase_heigth_new, _dikebase_stability_new + ) + _new_data.polderside_slope = self._calculate_soil_new_polderside_slope( + base_data, scenario, _dikebase_heigth_new, _dikebase_stability_new + ) + # extend existing berm? + if base_data.polderside_berm_width > 0 and _dikebase_piping_old > max( + _dikebase_heigth_new, _dikebase_stability_new + ): + _new_data.polderside_berm_height = ( + self._calculate_soil_new_polderside_berm_height_piping( + base_data, _new_data, scenario, soil_settings, True + ) + ) + else: + _new_data.polderside_berm_height = ( + self._calculate_soil_new_polderside_berm_height_piping( + base_data, _new_data, scenario, soil_settings, False + ) + ) + else: + # Is measure for stability neccesary? + if _dikebase_stability_new > _dikebase_heigth_new: + # in case of existing stab berm + if _berm_old_is_stability: + _new_data.polderside_berm_width = ( + _dikebase_stability_new - _dikebase_heigth_new + ) + _new_data.polderside_berm_height = ( + _berm_factor_old * _dike_height_new + + _new_data.polderside_ground_level + ) + _new_data.polderside_slope = base_data.polderside_slope + else: + _new_data.polderside_berm_width = 0 + _new_data.polderside_berm_height = base_data.polderside_ground_level + _new_data.polderside_slope = ( + self._calculate_soil_new_polderside_slope( + base_data, + scenario, + _dikebase_heigth_new, + _dikebase_stability_new, + ) + ) + else: + _new_data.polderside_berm_width = 0 + _new_data.polderside_berm_height = base_data.polderside_ground_level + _new_data.polderside_slope = base_data.polderside_slope + _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_polderside_berm_width + base_data, piping_wall_settings, _seepage_length ) _new_data.construction_type = self._determine_construction_type( piping_wall_settings.transition_cbwall_sheetpile, @@ -144,6 +201,7 @@ def _calculate_new_input_profile( def build(self) -> PipingWallInputProfile: return self._calculate_new_input_profile( self.base_profile.input_data, + self.reinforcement_settings.soil_settings, self.reinforcement_settings.piping_wall_settings, self.scenario, ) 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 57652c19..8c3bfbe7 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 @@ -1,6 +1,9 @@ from abc import ABC from koswat.configuration.settings.koswat_scenario import KoswatScenario +from koswat.configuration.settings.reinforcements.koswat_soil_settings import ( + KoswatSoilSettings, +) from koswat.dike.profile.koswat_input_profile_base import KoswatInputProfileBase @@ -9,28 +12,82 @@ class ReinforcementInputProfileCalculationBase(ABC): Abstract class to provide common functions to child classes """ - def _calculate_soil_polderside_berm_width( + def _calculate_soil_new_crest_height( + self, base_data: KoswatInputProfileBase, scenario: KoswatScenario + ) -> float: + return base_data.crest_height + scenario.d_h + + def _calculate_soil_new_waterside_berm_height( + self, base_data: KoswatInputProfileBase, scenario: KoswatScenario + ) -> float: + if base_data.waterside_berm_height > base_data.waterside_ground_level: + return base_data.waterside_berm_height + scenario.d_h + return base_data.waterside_berm_height + + def _calculate_soil_new_polderside_slope( + self, + base_data: KoswatInputProfileBase, + scenario: KoswatScenario, + dikebase_heigth_new: float, + dikebase_stability_new: float, + ) -> float: + _operand = ( + max(dikebase_heigth_new, dikebase_stability_new) + - scenario.d_h * scenario.waterside_slope + - scenario.crest_width + ) + _dividend = ( + base_data.crest_height - base_data.polderside_ground_level + scenario.d_h + ) + return _operand / _dividend + + def _calculate_soil_new_polderside_berm_height_piping( self, old_data: KoswatInputProfileBase, new_data: KoswatInputProfileBase, scenario: KoswatScenario, + soil_settings: KoswatSoilSettings, + berm_extend_existing: bool, ) -> float: - _dikebase_old = ( - (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 + if berm_extend_existing: + _old_berm_height = ( + old_data.polderside_berm_height - old_data.polderside_ground_level + ) + else: + _old_berm_height = 0 + _max = max( + soil_settings.min_berm_height, + _old_berm_height, + new_data.polderside_berm_width * soil_settings.factor_increase_berm_height, ) - _dikebase_new = ( - (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 + return ( + min( + _max, + soil_settings.max_berm_height_factor + * (new_data.crest_height - new_data.polderside_ground_level), + ) + + new_data.polderside_ground_level ) - _berm = scenario.d_p - (_dikebase_new - _dikebase_old) - return max(_berm, 0) + + +# def _calculate_soil_binnen_berm_breedte( +# 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 +# ) +# _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 +# ) +# _berm = scenario.d_p - (_dikebase_new - _dikebase_old) +# return max(_berm, 0) 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 55537c8a..92755ad9 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,62 +30,6 @@ def __init__(self) -> None: self.base_profile = None self.scenario = None - def _calculate_new_polderside_slope( - self, base_data: KoswatInputProfileBase, scenario: KoswatScenario - ) -> float: - """ - MAX( - Binnen_Talud_Oud, - ( - dS - -dH*Buiten_Talud_Nieuw - -(Kruin_Breedte_Nieuw-Kruin_Breedte_Oud) - +(Kruin_Hoogte_Oud-Binnen_Maaiveld_Oud)*Binnen_Talud_Oud) - /(Kruin_Hoogte_Oud-Binnen_Maaiveld_Oud+dH)) - """ - _first_part = scenario.d_h * scenario.waterside_slope - _second_part = scenario.crest_width - base_data.crest_width - _third_parth = ( - 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.polderside_slope, _right_side) - - def _calculate_new_polderside_berm_height( - self, - old_data: KoswatInputProfileBase, - new_data: KoswatInputProfileBase, - scenario: KoswatScenario, - ) -> float: - if new_data.polderside_berm_width > 0: - _max = max( - 0.5, - (old_data.polderside_berm_height - old_data.polderside_ground_level), - new_data.polderside_berm_width * 0.05, - ) - return ( - min( - _max, - 0.4 - * ( - (old_data.crest_height - old_data.polderside_ground_level) - + scenario.d_h - ), - ) - + old_data.polderside_ground_level - ) - return old_data.polderside_ground_level - - def _calculate_new_crest_height( - self, base_data: KoswatInputProfileBase, scenario: KoswatScenario - ) -> float: - return base_data.crest_height + scenario.d_h - def _calculate_new_input_profile( self, base_data: KoswatInputProfileBase, @@ -95,21 +39,99 @@ def _calculate_new_input_profile( _new_data = SoilInputProfile() _new_data.dike_section = base_data.dike_section _new_data.waterside_ground_level = base_data.waterside_ground_level + _new_data.polderside_ground_level = base_data.polderside_ground_level _new_data.waterside_slope = scenario.waterside_slope - _new_data.waterside_berm_height = base_data.waterside_berm_height + _new_data.waterside_berm_height = ( + self._calculate_soil_new_waterside_berm_height(base_data, scenario) + ) _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( + _new_data.crest_height = self._calculate_soil_new_crest_height( base_data, scenario ) - _new_data.polderside_berm_width = self._calculate_soil_polderside_berm_width( - base_data, _new_data, scenario + + _dike_height_old = base_data.crest_height - base_data.polderside_ground_level + _berm_height_old = ( + base_data.polderside_berm_height - base_data.polderside_ground_level + ) + _berm_factor_old = _berm_height_old / _dike_height_old + if _berm_factor_old > soil_settings.max_berm_height_factor: + _berm_old_is_stability = True + else: + _berm_old_is_stability = False + + _dikebase_stability_old = ( + base_data.crest_width + + _dike_height_old * base_data.polderside_slope + + _berm_old_is_stability * base_data.polderside_berm_width ) - _new_data.polderside_berm_height = self._calculate_new_polderside_berm_height( - base_data, _new_data, scenario + _dikebase_piping_old = ( + base_data.crest_width + + _dike_height_old * base_data.polderside_slope + + base_data.polderside_berm_width ) + + _dike_height_new = _new_data.crest_height - _new_data.polderside_ground_level + _dikebase_heigth_new = ( + scenario.d_h * _new_data.waterside_slope + + _new_data.crest_width + + _dike_height_new * base_data.polderside_slope + ) + _dikebase_stability_new = _dikebase_stability_old + scenario.d_s + _dikebase_piping_new = _dikebase_piping_old + scenario.d_p + + # Is a berm for piping neccesary? + if _dikebase_piping_new > max(_dikebase_heigth_new, _dikebase_stability_new): + _new_data.polderside_berm_width = _dikebase_piping_new - max( + _dikebase_heigth_new, _dikebase_stability_new + ) + _new_data.polderside_slope = self._calculate_soil_new_polderside_slope( + base_data, scenario, _dikebase_heigth_new, _dikebase_stability_new + ) + # extend existing berm? + if base_data.polderside_berm_width > 0 and _dikebase_piping_old > max( + _dikebase_heigth_new, _dikebase_stability_new + ): + _new_data.polderside_berm_height = ( + self._calculate_soil_new_polderside_berm_height_piping( + base_data, _new_data, scenario, soil_settings, True + ) + ) + else: + _new_data.polderside_berm_height = ( + self._calculate_soil_new_polderside_berm_height_piping( + base_data, _new_data, scenario, soil_settings, False + ) + ) + else: + # Is measure for stability neccesary? + if _dikebase_stability_new > _dikebase_heigth_new: + # in case of existing stab berm + if _berm_old_is_stability: + _new_data.polderside_berm_width = ( + _dikebase_stability_new - _dikebase_heigth_new + ) + _new_data.polderside_berm_height = ( + _berm_factor_old * _dike_height_new + + _new_data.polderside_ground_level + ) + _new_data.polderside_slope = base_data.polderside_slope + else: + _new_data.polderside_berm_width = 0 + _new_data.polderside_berm_height = base_data.polderside_ground_level + _new_data.polderside_slope = ( + self._calculate_soil_new_polderside_slope( + base_data, + scenario, + _dikebase_heigth_new, + _dikebase_stability_new, + ) + ) + else: + _new_data.polderside_berm_width = 0 + _new_data.polderside_berm_height = base_data.polderside_ground_level + _new_data.polderside_slope = base_data.polderside_slope + _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 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 1d9eb59b..49f81d61 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 @@ -3,6 +3,9 @@ from koswat.configuration.settings.reinforcements.koswat_reinforcement_settings import ( KoswatReinforcementSettings, ) +from koswat.configuration.settings.reinforcements.koswat_soil_settings import ( + KoswatSoilSettings, +) from koswat.configuration.settings.reinforcements.koswat_stability_wall_settings import ( KoswatStabilityWallSettings, ) @@ -36,22 +39,32 @@ def _calculate_length_stability_wall( self, old_data: KoswatInputProfileProtocol, stability_wall_settings: KoswatStabilityWallSettings, - soil_polderside_berm_width: float, + seepage_length: float, + stab_wall: bool, new_crest_height: float, ) -> float: - """ - Identical to calculation of Cofferdam - """ - if soil_polderside_berm_width == 0: - # Length of wall is not determined by piping. - _length_piping = 0.0 + if stab_wall: + _length_stability = (new_crest_height - 0.5) - (old_data.pleistocene - 1) + if seepage_length == 0: + # Length of wall is not determined by piping. + _length_piping = 0.0 + else: + _length_piping = ( + (seepage_length / 6) + (new_crest_height - 0.5) - old_data.aquifer + ) else: - _length_piping = ( - (soil_polderside_berm_width / 6) - + (new_crest_height - 0.5) - - old_data.aquifer - ) - _length_stability = (new_crest_height - 0.5) - (old_data.pleistocene - 1) + _length_stability = 0 + if seepage_length == 0: + # Length of wall is not determined by piping. + _length_piping = 0.0 + else: + # Length of wall zoals bij kwelscherm + _length_piping = ( + (seepage_length / 6) + + (old_data.polderside_ground_level - old_data.aquifer) + + 1 # 1 m in bestaande dijklichaam + ) + return round( min( max( @@ -64,38 +77,24 @@ def _calculate_length_stability_wall( 1, ) - def _calculate_new_crest_height( - self, base_data: KoswatInputProfileBase, scenario: KoswatScenario - ) -> float: - return base_data.crest_height + scenario.d_h - def _calculate_new_polderside_slope( - self, base_data: KoswatInputProfileBase, scenario: KoswatScenario + self, + base_data: KoswatInputProfileBase, + scenario: KoswatScenario, + stability_wall_settings: KoswatStabilityWallSettings, + _dikebase_piping_old: float, ) -> float: - """ - MAX( - 2, - ( Kruin_Breedte_Oud - + - (Kruin_Hoogte_Oud-Binnen_Maaiveld_Oud) - *Binnen_Talud_Oud - -dH*Buiten_Talud_Nieuw - -Kruin_Breedte_Nieuw) - /(Kruin_Hoogte_Oud+dH)) - - """ - _first_part = ( - base_data.crest_height - base_data.polderside_ground_level - ) * base_data.polderside_slope - _second_part = scenario.d_h * scenario.waterside_slope _operand = ( - base_data.crest_width + _first_part - _second_part - scenario.crest_width + _dikebase_piping_old + - scenario.d_h * scenario.waterside_slope + - scenario.crest_width ) _dividend = ( base_data.crest_height - base_data.polderside_ground_level + scenario.d_h ) - _right_side = _operand / _dividend - return max(2, _right_side) + return max( + stability_wall_settings.steepening_polderside_slope, _operand / _dividend + ) def _determine_construction_type( self, @@ -112,35 +111,108 @@ def _determine_construction_type( def _calculate_new_input_profile( self, base_data: KoswatInputProfileProtocol, + soil_settings: KoswatSoilSettings, stability_wall_settings: KoswatStabilityWallSettings, scenario: KoswatScenario, ) -> StabilityWallInputProfile: _new_data = StabilityWallInputProfile() _new_data.dike_section = base_data.dike_section _new_data.waterside_ground_level = base_data.waterside_ground_level + _new_data.polderside_ground_level = base_data.polderside_ground_level _new_data.waterside_slope = scenario.waterside_slope - _new_data.waterside_berm_height = base_data.waterside_berm_height + _new_data.waterside_berm_height = ( + self._calculate_soil_new_waterside_berm_height(base_data, scenario) + ) _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( + _new_data.crest_height = self._calculate_soil_new_crest_height( 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.crest_width = scenario.crest_width + + _dike_height_old = base_data.crest_height - base_data.polderside_ground_level + _berm_height_old = ( + base_data.polderside_berm_height - base_data.polderside_ground_level + ) + _berm_factor_old = _berm_height_old / _dike_height_old + + if _berm_factor_old > soil_settings.max_berm_height_factor: + _berm_old_is_stability = True + else: + _berm_old_is_stability = False + + _dikebase_stability_old = ( + base_data.crest_width + + _dike_height_old * base_data.polderside_slope + + _berm_old_is_stability * base_data.polderside_berm_width + ) + _dikebase_piping_old = ( + base_data.crest_width + + _dike_height_old * base_data.polderside_slope + + base_data.polderside_berm_width + ) + + _dike_height_new = _new_data.crest_height - _new_data.polderside_ground_level + _dikebase_heigth_new = ( + scenario.d_h * _new_data.waterside_slope + + _new_data.crest_width + + _dike_height_new * base_data.polderside_slope + ) + _dikebase_stability_new = _dikebase_stability_old + scenario.d_s + # _dikebase_piping_new = max( + # _dikebase_piping_old, _dikebase_heigth_new, _dikebase_stability_new + # ) + _dikebase_piping_needed = _dikebase_piping_old + scenario.d_p + + # steepening of slope polderside when dikebase height or stability is outside of existing profile + if max(_dikebase_heigth_new, _dikebase_stability_new) > _dikebase_piping_old: + # stability wall is neccesary here + _stab_wall = True + _new_data.polderside_berm_width = 0 + _new_data.polderside_berm_height = base_data.polderside_ground_level + _new_data.polderside_slope = self._calculate_new_polderside_slope(base_data, scenario, stability_wall_settings, _dikebase_piping_old) + else: + # height & stab measure soil fits within the current profile, no wall neccesary + _stab_wall = False + # Do we have an existing piping berm remaining after the reinforcement? + if max(_dikebase_heigth_new, _dikebase_stability_new) < _dikebase_piping_old: + _new_data.polderside_berm_width = _dikebase_piping_old - max(_dikebase_heigth_new, _dikebase_stability_new) + _new_data.polderside_berm_height = base_data.polderside_berm_height + _new_data.polderside_slope = self._calculate_soil_new_polderside_slope(base_data, scenario, _dikebase_heigth_new, _dikebase_stability_new) + else: + # Is measure for stability neccesary? + if _dikebase_stability_new > _dikebase_heigth_new: + # in case of existing stab berm + if _berm_old_is_stability: + _new_data.polderside_berm_width = _dikebase_stability_new - _dikebase_heigth_new + _new_data.polderside_berm_height = _berm_factor_old * _dike_height_new + _new_data.polderside_ground_level + _new_data.polderside_slope = base_data.polderside_slope + else: + _new_data.polderside_berm_width = 0 + _new_data.polderside_berm_height = base_data.polderside_ground_level + _new_data.polderside_slope = self._calculate_soil_new_polderside_slope(base_data, scenario, _dikebase_heigth_new, _dikebase_stability_new) + else: + _new_data.polderside_berm_width = 0 + _new_data.polderside_berm_height = base_data.polderside_ground_level + _new_data.polderside_slope = base_data.polderside_slope + _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_polderside_berm_width = self._calculate_soil_polderside_berm_width( - base_data, _new_data, scenario + + _dikebase_piping_realized = ( + scenario.d_h * _new_data.waterside_slope + + _new_data.crest_width + + _dike_height_new * _new_data.polderside_slope + + _new_data.polderside_berm_width ) + _seepage_length = max(_dikebase_piping_needed - _dikebase_piping_realized, 0) _new_data.construction_length = self._calculate_length_stability_wall( base_data, stability_wall_settings, - _soil_polderside_berm_width, + _seepage_length, + _stab_wall, _new_data.crest_height, ) _new_data.construction_type = self._determine_construction_type( @@ -159,6 +231,7 @@ def _calculate_new_input_profile( def build(self) -> StabilityWallInputProfile: return self._calculate_new_input_profile( self.base_profile.input_data, + self.reinforcement_settings.soil_settings, self.reinforcement_settings.stability_wall_settings, self.scenario, ) 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 0254f22d..8f2ef239 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 @@ -16,4 +16,5 @@ def reinforcement_domain_name(self) -> str: @property def ground_price(self) -> float: - return self.ground_price_builtup + # return self.ground_price_builtup + return self.ground_price_unbuilt 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 ac73d981..77ae6126 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 @@ -3,24 +3,27 @@ from koswat.configuration.settings.reinforcements.koswat_reinforcement_settings import ( KoswatReinforcementSettings, ) +from koswat.configuration.settings.reinforcements.koswat_soil_settings import ( + KoswatSoilSettings, +) from koswat.configuration.settings.reinforcements.koswat_vps_settings import ( KoswatVPSSettings, ) from koswat.dike.koswat_profile_protocol import KoswatProfileProtocol from koswat.dike.profile.koswat_input_profile_base import KoswatInputProfileBase +from koswat.dike_reinforcements.input_profile.reinforcement_input_profile_calculation_base import ( + ReinforcementInputProfileCalculationBase, +) from koswat.dike_reinforcements.input_profile.reinforcement_input_profile_calculation_protocol import ( ReinforcementInputProfileCalculationProtocol, ) -from koswat.dike_reinforcements.input_profile.soil.soil_input_profile_calculation import ( - SoilInputProfileCalculation, -) from koswat.dike_reinforcements.input_profile.vertical_piping_solution.vps_input_profile import ( VPSInputProfile, ) class VPSInputProfileCalculation( - SoilInputProfileCalculation, + ReinforcementInputProfileCalculationBase, ReinforcementInputProfileCalculationProtocol, ): base_profile: KoswatProfileProtocol @@ -30,25 +33,110 @@ class VPSInputProfileCalculation( def _calculate_new_input_profile( self, base_data: KoswatInputProfileBase, + soil_settings: KoswatSoilSettings, vps_settings: KoswatVPSSettings, scenario: KoswatScenario, ) -> KoswatInputProfileBase: _new_data = VPSInputProfile() _new_data.dike_section = base_data.dike_section _new_data.waterside_ground_level = base_data.waterside_ground_level + _new_data.polderside_ground_level = base_data.polderside_ground_level _new_data.waterside_slope = scenario.waterside_slope - _new_data.waterside_berm_height = base_data.waterside_berm_height + _new_data.waterside_berm_height = ( + self._calculate_soil_new_waterside_berm_height(base_data, scenario) + ) _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( + _new_data.crest_height = self._calculate_soil_new_crest_height( 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 + + _dike_height_old = base_data.crest_height - base_data.polderside_ground_level + _berm_height_old = ( + base_data.polderside_berm_height - base_data.polderside_ground_level ) + _berm_factor_old = _berm_height_old / _dike_height_old + if _berm_factor_old > soil_settings.max_berm_height_factor: + _berm_old_is_stability = True + else: + _berm_old_is_stability = False + + _dikebase_stability_old = ( + base_data.crest_width + + _dike_height_old * base_data.polderside_slope + + _berm_old_is_stability * base_data.polderside_berm_width + ) + _dikebase_piping_old = ( + base_data.crest_width + + _dike_height_old * base_data.polderside_slope + + base_data.polderside_berm_width + ) + + _dike_height_new = _new_data.crest_height - _new_data.polderside_ground_level + _dikebase_heigth_new = ( + scenario.d_h * _new_data.waterside_slope + + _new_data.crest_width + + _dike_height_new * base_data.polderside_slope + ) + _dikebase_stability_new = _dikebase_stability_old + scenario.d_s + _dikebase_piping_new = max( + _dikebase_piping_old, + max(_dikebase_heigth_new, _dikebase_stability_new) + + vps_settings.polderside_berm_width_vps, + ) + + # Is a berm for piping neccesary? --> vps_settings.binnen_berm_breedte_vps + if _dikebase_piping_new > max(_dikebase_heigth_new, _dikebase_stability_new): + _new_data.polderside_berm_width = _dikebase_piping_new - max( + _dikebase_heigth_new, _dikebase_stability_new + ) + _new_data.polderside_slope = self._calculate_soil_new_polderside_slope( + base_data, scenario, _dikebase_heigth_new, _dikebase_stability_new + ) + # extend existing berm? + if base_data.polderside_berm_width > 0 and _dikebase_piping_old > max( + _dikebase_heigth_new, _dikebase_stability_new + ): + _new_data.polderside_berm_height = ( + self._calculate_soil_new_polderside_berm_height_piping( + base_data, _new_data, scenario, soil_settings, True + ) + ) + else: + _new_data.polderside_berm_height = ( + self._calculate_soil_new_polderside_berm_height_piping( + base_data, _new_data, scenario, soil_settings, False + ) + ) + else: + # Is measure for stability neccesary? + if _dikebase_stability_new > _dikebase_heigth_new: + # in case of existing stab berm + if _berm_old_is_stability: + _new_data.polderside_berm_width = ( + _dikebase_stability_new - _dikebase_heigth_new + ) + _new_data.polderside_berm_height = ( + _berm_factor_old * _dike_height_new + + _new_data.polderside_ground_level + ) + _new_data.polderside_slope = base_data.polderside_slope + else: + _new_data.polderside_berm_width = 0 + _new_data.polderside_berm_height = base_data.polderside_ground_level + _new_data.polderside_slope = ( + self._calculate_soil_new_polderside_slope( + base_data, + scenario, + _dikebase_heigth_new, + _dikebase_stability_new, + ) + ) + else: + _new_data.polderside_berm_width = 0 + _new_data.polderside_berm_height = base_data.polderside_ground_level + _new_data.polderside_slope = base_data.polderside_slope + _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 @@ -63,6 +151,7 @@ def _calculate_new_input_profile( def build(self) -> VPSInputProfile: return self._calculate_new_input_profile( self.base_profile.input_data, + self.reinforcement_settings.soil_settings, self.reinforcement_settings.vps_settings, self.scenario, ) diff --git a/tests/acceptance_scenarios/koswat_input_profile_base_cases.py b/tests/acceptance_scenarios/koswat_input_profile_base_cases.py index bed29c7f..664a2170 100644 --- a/tests/acceptance_scenarios/koswat_input_profile_base_cases.py +++ b/tests/acceptance_scenarios/koswat_input_profile_base_cases.py @@ -126,19 +126,19 @@ class AcceptanceTestInputProfileCases(CasesProtocol): aquifer=-2, ) - # Waterside ground level lower than polderside, waterside and polderside berm + # Waterside ground level higher than polderside, waterside and polderside berm profile_dijk4 = KoswatInputProfileBase( dike_section="dijk4", - waterside_ground_level=6.38, - waterside_slope=2.56, - waterside_berm_height=6.38, - waterside_berm_width=0, - crest_height=11.38, - crest_width=10.36, - polderside_slope=3.57, - polderside_berm_height=9.06, - polderside_berm_width=19.23, - polderside_ground_level=6.45, + waterside_ground_level=6.28, + waterside_slope=2.74, + waterside_berm_height=8.9, + waterside_berm_width=4.42, + crest_height=10.41, + crest_width=2.75, + polderside_slope=2.07, + polderside_berm_height=9.43, + polderside_berm_width=14.59, + polderside_ground_level=5.17, ground_price_builtup=322.63, ground_price_unbuilt=13.87, factor_settlement=1.2, 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 9274a75a..95946cb8 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);503185.05;3014405.05;923185.05;4804450.96;8743316.81 -Cost per km incl surtax (Euro/km);1229581.28;5625492.26;1822621.28;13942542.25;28473287.86 +Cost per km (Euro/km);503185.05;1194405.05;923185.05;4804450.96;8743316.81 +Cost per km incl surtax (Euro/km);1229581.28;3055652.26;1822621.28;13942542.25;28473287.86 New grass volume (quantity):;0.9;3.9;0.9;0.02;0.02 New grass volume (cost):;11.2;48.52;11.2;0.26;0.26 New grass volume (cost incl surtax):;28.09;121.73;28.09;0.72;0.72 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;30.0;130.0;450.0;0.0;0.0 +Land purchase surface (cost incl surtax):;42.36;183.56;635.4;0.0;0.0 Construction length (quantity):;0;0;0;12.0;12.0 Construction length (cost):;0;500;0;4448.76;8094.78 Construction length (cost incl surtax):;0;1456.0;0.0;12954.77;26672.31 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 38ae88ec..68ab48dd 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);513426.24;3444646.24;1353426.24;4264279.0;7754391.0 -Cost per km incl surtax (Euro/km);1222366.44;6211317.42;2408446.44;12417580.45;25550718.35 +Cost per km (Euro/km);513426.24;1204646.24;1353426.24;4264279.0;7754391.0 +Cost per km incl surtax (Euro/km);1222366.44;3048437.42;2408446.44;12417580.45;25550718.35 New grass volume (quantity):;1.76;4.76;1.76;0.0;0.0 New grass volume (cost):;21.83;59.15;21.83;0.0;0.0 New grass volume (cost incl surtax):;54.78;148.41;54.78;0.0;0.0 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;60.0;160.0;900.0;0.0;0.0 +Land purchase surface (cost incl surtax):;84.72;225.92;1270.8;0.0;0.0 Construction length (quantity):;0;0;0;11.5;11.5 Construction length (cost):;0;500;0;4264.28;7754.39 Construction length (cost incl surtax):;0;1456.0;0.0;12417.58;25550.72 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 0ebe6f2f..3761e642 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);869072.67;2457286.37;968959.8;4264279.0;7754391.0 -Cost per km incl surtax (Euro/km);1961103.34;4721331.5;2821610.94;12417580.45;25550718.35 +Cost per km (Euro/km);869072.67;1057286.37;968959.8;2621321.32;7754391.0 +Cost per km incl surtax (Euro/km);1961103.34;2744531.5;2821610.94;7633287.68;25550718.35 New grass volume (quantity):;6.0;3.0;0.0;0.0;0.0 New grass volume (cost):;74.64;37.32;0.0;0.0;0.0 New grass volume (cost incl surtax):;187.27;93.64;0.0;0.0;0.0 @@ -33,11 +33,11 @@ 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 -Construction length (quantity):;0;0;6.3;11.5;11.5 -Construction length (cost):;0;500;968.96;4264.28;7754.39 -Construction length (cost incl surtax):;0;1456.0;2821.61;12417.58;25550.72 +Land purchase surface (cost):;200.0;100.0;0.0;0.0;0.0 +Land purchase surface (cost incl surtax):;282.4;141.2;0.0;0.0;0.0 +Construction length (quantity):;0;0;6.3;6.3;11.5 +Construction length (cost):;0;500;968.96;2621.32;7754.39 +Construction length (cost incl surtax):;0;1456.0;2821.61;7633.29;25550.72 Total measure meters;0;0;0;0;0 Total measure cost;0.0;0.0;0.0;0.0;0.0;0.0 Total measure cost incl surtax;0.0;0.0;0.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 d0327804..c220adb6 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);840189.97;4261409.97;2170189.97;4804450.96;8743316.81 -Cost per km incl surtax (Euro/km);2003821.63;7684652.61;3881781.63;13942542.25;28473287.86 +Cost per km (Euro/km);840189.97;1531409.97;2170189.97;4804450.96;8743316.81 +Cost per km incl surtax (Euro/km);2003821.63;3829892.61;3881781.63;13942542.25;28473287.86 New grass volume (quantity):;2.8;5.81;2.8;0.02;0.02 New grass volume (cost):;34.89;72.21;34.89;0.26;0.26 New grass volume (cost incl surtax):;87.55;181.19;87.55;0.72;0.72 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;95.0;195.0;1425.0;0.0;0.0 +Land purchase surface (cost incl surtax):;134.14;275.34;2012.1;0.0;0.0 Construction length (quantity):;0;0;0;12.0;12.0 Construction length (cost):;0;500;0;4448.76;8094.78 Construction length (cost incl surtax):;0;1456.0;0.0;12954.77;26672.31 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 38967c4d..618983f9 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);1049845.05;3014405.05;1892144.85;4804450.96;8743316.81 -Cost per km incl surtax (Euro/km);2381751.22;5625492.26;4644232.22;13942542.25;28473287.86 +Cost per km (Euro/km);1049845.05;1194405.05;1892144.85;4804450.96;8743316.81 +Cost per km incl surtax (Euro/km);2381751.22;3055652.26;4644232.22;13942542.25;28473287.86 New grass volume (quantity):;6.9;3.9;0.9;0.02;0.02 New grass volume (cost):;85.84;48.52;11.2;0.26;0.26 New grass volume (cost incl surtax):;215.36;121.73;28.09;0.72;0.72 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;230.0;130.0;450.0;0.0;0.0 +Land purchase surface (cost incl surtax):;324.76;183.56;635.4;0.0;0.0 Construction length (quantity):;0;0;6.3;12.0;12.0 Construction length (cost):;0;500;968.96;4448.76;8094.78 Construction length (cost incl surtax):;0;1456.0;2821.61;12954.77;26672.31 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 832e0c0a..00aebd04 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);1060086.24;3444646.24;2322386.04;4374406.72;7958625.6 -Cost per km incl surtax (Euro/km);2374536.38;6211317.42;5230057.38;12738272.37;26223671.35 +Cost per km (Euro/km);1060086.24;1204646.24;2322386.04;4374406.72;7958625.6 +Cost per km incl surtax (Euro/km);2374536.38;3048437.42;5230057.38;12738272.37;26223671.35 New grass volume (quantity):;7.76;4.76;1.76;0.0;0.0 New grass volume (cost):;96.47;59.15;21.83;0.0;0.0 New grass volume (cost incl surtax):;242.05;148.41;54.78;0.0;0.0 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;260.0;160.0;900.0;0.0;0.0 +Land purchase surface (cost incl surtax):;367.12;225.92;1270.8;0.0;0.0 Construction length (quantity):;0;0;6.3;11.8;11.8 Construction length (cost):;0;500;968.96;4374.41;7958.63 Construction length (cost incl surtax):;0;1456.0;2821.61;12738.27;26223.67 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 19ca3333..0bf69379 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);1386849.97;4261409.97;3139149.77;5148223.24;9356020.61 -Cost per km incl surtax (Euro/km);3155991.57;7684652.61;6703392.56;14943607.12;30492146.88 +Cost per km (Euro/km);1386849.97;1531409.97;3139149.77;5148223.24;9356020.61 +Cost per km incl surtax (Euro/km);3155991.57;3829892.61;6703392.56;14943607.12;30492146.88 New grass volume (quantity):;8.81;5.81;2.8;0.02;0.02 New grass volume (cost):;109.53;72.21;34.89;0.26;0.26 New grass volume (cost incl surtax):;274.82;181.19;87.55;0.72;0.72 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;295.0;195.0;1425.0;0.0;0.0 +Land purchase surface (cost incl surtax):;416.54;275.34;2012.1;0.0;0.0 Construction length (quantity):;0;0;6.3;12.9;12.9 Construction length (cost):;0;500;968.96;4792.53;8707.49 Construction length (cost incl surtax):;0;1456.0;2821.61;13955.84;28691.17 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 8770af8e..09968222 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);800957.3;3732177.3;1640957.3;5110036.7;9091873.53 -Cost per km incl surtax (Euro/km);1943781.86;6932732.84;3129861.86;14816685.72;29617552.4 +Cost per km (Euro/km);800957.3;1492177.3;1640957.3;5110036.7;9091873.53 +Cost per km incl surtax (Euro/km);1943781.86;3769852.84;3129861.86;14816685.72;29617552.4 New grass volume (quantity):;1.8;4.8;1.8;0.04;0.04 New grass volume (cost):;22.39;59.71;22.39;0.48;0.48 New grass volume (cost incl surtax):;56.18;149.82;56.18;1.33;1.33 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;60.0;160.0;900.0;0.0;0.0 +Land purchase surface (cost incl surtax):;84.72;225.92;1270.8;0.0;0.0 Construction length (quantity):;0;0;0;12.5;12.5 Construction length (cost):;0;500;0;4637.88;8435.17 Construction length (cost incl surtax):;0;1456.0;0.0;13505.51;27793.9 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 413c23a1..ab348814 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);660436.02;4011656.02;1920436.02;4264279.0;7754391.0 -Cost per km incl surtax (Euro/km);1558303.98;7140294.96;3337423.98;12417580.45;25550718.35 +Cost per km (Euro/km);660436.02;1351656.02;1920436.02;4264279.0;7754391.0 +Cost per km incl surtax (Euro/km);1558303.98;3384374.96;3337423.98;12417580.45;25550718.35 New grass volume (quantity):;2.63;5.63;2.63;0.0;0.0 New grass volume (cost):;32.75;70.07;32.75;0.0;0.0 New grass volume (cost incl surtax):;82.17;175.8;82.17;0.0;0.0 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;90.0;190.0;1350.0;0.0;0.0 +Land purchase surface (cost incl surtax):;127.08;268.28;1906.2;0.0;0.0 Construction length (quantity):;0;0;0;11.5;11.5 Construction length (cost):;0;500;0;4264.28;7754.39 Construction length (cost incl surtax):;0;1456.0;0.0;12417.58;25550.72 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 dce4e86c..69dc3e99 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);2354288.79;2457286.37;1765589.8;6002701.92;10681753.6 -Cost per km incl surtax (Euro/km);5358410.59;4721331.5;5141397.5;17479867.99;35196378.11 +Cost per km (Euro/km);2354288.79;1057286.37;1765589.8;4191790.32;10681753.6 +Cost per km incl surtax (Euro/km);5358410.59;2744531.5;5141397.5;12206493.41;35196378.11 New grass volume (quantity):;15.0;3.0;0.0;0.0;0.0 New grass volume (cost):;186.6;37.32;0.0;0.0;0.0 New grass volume (cost incl surtax):;468.18;93.64;0.0;0.0;0.0 @@ -33,11 +33,11 @@ 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 -Construction length (quantity):;0;0;11.3;15.8;15.8 -Construction length (cost):;0;500;1765.59;6002.7;10681.75 -Construction length (cost incl surtax):;0;1456.0;5141.4;17479.87;35196.38 +Land purchase surface (cost):;500.0;100.0;0.0;0.0;0.0 +Land purchase surface (cost incl surtax):;706.0;141.2;0.0;0.0;0.0 +Construction length (quantity):;0;0;11.3;11.3;15.8 +Construction length (cost):;0;500;1765.59;4191.79;10681.75 +Construction length (cost incl surtax):;0;1456.0;5141.4;12206.49;35196.38 Total measure meters;0;0;0;0;0 Total measure cost;0.0;0.0;0.0;0.0;0.0;0.0 Total measure cost incl surtax;0.0;0.0;0.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 726df96d..58d0a3a3 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);1374288.35;5775508.35;3684288.35;5110036.7;9091873.53 -Cost per km incl surtax (Euro/km);3267084.47;10331675.45;6528804.47;14816685.72;29617552.4 +Cost per km (Euro/km);1374288.35;2065508.35;3684288.35;5110036.7;9091873.53 +Cost per km incl surtax (Euro/km);3267084.47;5093155.45;6528804.47;14816685.72;29617552.4 New grass volume (quantity):;4.88;7.88;4.88;0.04;0.04 New grass volume (cost):;60.74;98.06;60.74;0.48;0.48 New grass volume (cost incl surtax):;152.39;246.03;152.39;1.33;1.33 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;165.0;265.0;2475.0;0.0;0.0 +Land purchase surface (cost incl surtax):;232.98;374.18;3494.7;0.0;0.0 Construction length (quantity):;0;0;0;12.5;12.5 Construction length (cost):;0;500;0;4637.88;8435.17 Construction length (cost incl surtax):;0;1456.0;0.0;13505.51;27793.9 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 afd655a3..fb6d736a 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);2991107.3;3732177.3;3406547.1;7400582.22;12700018.13 -Cost per km incl surtax (Euro/km);6890368.21;6932732.84;8271259.36;21486754.27;41506388.86 +Cost per km (Euro/km);2991107.3;1492177.3;3406547.1;7400582.22;12700018.13 +Cost per km incl surtax (Euro/km);6890368.21;3769852.84;8271259.36;21486754.27;41506388.86 New grass volume (quantity):;16.8;4.8;1.8;0.04;0.04 New grass volume (cost):;208.99;59.71;22.39;0.48;0.48 New grass volume (cost incl surtax):;524.36;149.82;56.18;1.33;1.33 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;560.0;160.0;900.0;0.0;0.0 +Land purchase surface (cost incl surtax):;790.72;225.92;1270.8;0.0;0.0 Construction length (quantity):;0;0;11.3;17.8;17.8 Construction length (cost):;0;500;1765.59;6928.43;12043.32 Construction length (cost incl surtax):;0;1456.0;5141.4;20175.58;39682.73 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 4f96e1cd..5e804d9a 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);2795686.02;4011656.02;3686025.82;6690021.12;11702926.6 -Cost per km incl surtax (Euro/km);6367146.23;7140294.96;8478821.48;19481341.5;38561143.15 +Cost per km (Euro/km);2795686.02;1351656.02;3686025.82;6690021.12;11702926.6 +Cost per km incl surtax (Euro/km);6367146.23;3384374.96;8478821.48;19481341.5;38561143.15 New grass volume (quantity):;17.63;5.63;2.63;0.0;0.0 New grass volume (cost):;219.35;70.07;32.75;0.0;0.0 New grass volume (cost incl surtax):;550.34;175.8;82.17;0.0;0.0 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;590.0;190.0;1350.0;0.0;0.0 +Land purchase surface (cost incl surtax):;833.08;268.28;1906.2;0.0;0.0 Construction length (quantity):;0;0;11.3;17.3;17.3 Construction length (cost):;0;500;1765.59;6690.02;11702.93 Construction length (cost incl surtax):;0;1456.0;5141.4;19481.34;38561.14 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 c6d3d85f..16cc23fc 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);3564438.35;5775508.35;5449878.15;8297331.78;13925425.73 -Cost per km incl surtax (Euro/km);8213670.82;10331675.45;11670201.97;24098088.99;45544106.9 +Cost per km (Euro/km);3564438.35;2065508.35;5449878.15;8297331.78;13925425.73 +Cost per km incl surtax (Euro/km);8213670.82;5093155.45;11670201.97;24098088.99;45544106.9 New grass volume (quantity):;19.88;7.88;4.88;0.04;0.04 New grass volume (cost):;247.34;98.06;60.74;0.48;0.48 New grass volume (cost incl surtax):;620.57;246.03;152.39;1.33;1.33 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;665.0;265.0;2475.0;0.0;0.0 +Land purchase surface (cost incl surtax):;938.98;374.18;3494.7;0.0;0.0 Construction length (quantity):;0;0;11.3;19.6;19.6 Construction length (cost):;0;500;1765.59;7825.18;13268.73 Construction length (cost incl surtax):;0;1456.0;5141.4;22786.91;43720.45 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 36e35275..288b7ec8 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);503185.05;3014405.05;923185.05;4804450.96;8845645.09 -Cost per km incl surtax (Euro/km);1229581.28;5625492.26;1822621.28;13942542.25;28757453.48 +Cost per km (Euro/km);503185.05;1194405.05;923185.05;4804450.96;8845645.09 +Cost per km incl surtax (Euro/km);1229581.28;3055652.26;1822621.28;13942542.25;28757453.48 New grass volume (quantity):;0.9;3.9;0.9;0.02;0.02 New grass volume (cost):;11.2;48.52;11.2;0.26;0.23 New grass volume (cost incl surtax):;28.09;121.73;28.09;0.72;0.63 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;30.0;130.0;450.0;0.0;0.0 +Land purchase surface (cost incl surtax):;42.36;183.56;635.4;0.0;0.0 Construction length (quantity):;0;0;0;12.0;12.0 Construction length (cost):;0;500;0;4448.76;8094.78 Construction length (cost incl surtax):;0;1456.0;0.0;12954.77;26672.31 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 38ae88ec..68ab48dd 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);513426.24;3444646.24;1353426.24;4264279.0;7754391.0 -Cost per km incl surtax (Euro/km);1222366.44;6211317.42;2408446.44;12417580.45;25550718.35 +Cost per km (Euro/km);513426.24;1204646.24;1353426.24;4264279.0;7754391.0 +Cost per km incl surtax (Euro/km);1222366.44;3048437.42;2408446.44;12417580.45;25550718.35 New grass volume (quantity):;1.76;4.76;1.76;0.0;0.0 New grass volume (cost):;21.83;59.15;21.83;0.0;0.0 New grass volume (cost incl surtax):;54.78;148.41;54.78;0.0;0.0 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;60.0;160.0;900.0;0.0;0.0 +Land purchase surface (cost incl surtax):;84.72;225.92;1270.8;0.0;0.0 Construction length (quantity):;0;0;0;11.5;11.5 Construction length (cost):;0;500;0;4264.28;7754.39 Construction length (cost incl surtax):;0;1456.0;0.0;12417.58;25550.72 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 0ebe6f2f..3761e642 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);869072.67;2457286.37;968959.8;4264279.0;7754391.0 -Cost per km incl surtax (Euro/km);1961103.34;4721331.5;2821610.94;12417580.45;25550718.35 +Cost per km (Euro/km);869072.67;1057286.37;968959.8;2621321.32;7754391.0 +Cost per km incl surtax (Euro/km);1961103.34;2744531.5;2821610.94;7633287.68;25550718.35 New grass volume (quantity):;6.0;3.0;0.0;0.0;0.0 New grass volume (cost):;74.64;37.32;0.0;0.0;0.0 New grass volume (cost incl surtax):;187.27;93.64;0.0;0.0;0.0 @@ -33,11 +33,11 @@ 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 -Construction length (quantity):;0;0;6.3;11.5;11.5 -Construction length (cost):;0;500;968.96;4264.28;7754.39 -Construction length (cost incl surtax):;0;1456.0;2821.61;12417.58;25550.72 +Land purchase surface (cost):;200.0;100.0;0.0;0.0;0.0 +Land purchase surface (cost incl surtax):;282.4;141.2;0.0;0.0;0.0 +Construction length (quantity):;0;0;6.3;6.3;11.5 +Construction length (cost):;0;500;968.96;2621.32;7754.39 +Construction length (cost incl surtax):;0;1456.0;2821.61;7633.29;25550.72 Total measure meters;0;0;0;0;0 Total measure cost;0.0;0.0;0.0;0.0;0.0;0.0 Total measure cost incl surtax;0.0;0.0;0.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 ce00e714..ddadae80 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);840189.97;4261409.97;2170189.97;4804450.96;8845645.09 -Cost per km incl surtax (Euro/km);2003821.63;7684652.61;3881781.63;13942542.25;28757453.48 +Cost per km (Euro/km);840189.97;1531409.97;2170189.97;4804450.96;8845645.09 +Cost per km incl surtax (Euro/km);2003821.63;3829892.61;3881781.63;13942542.25;28757453.48 New grass volume (quantity):;2.8;5.81;2.8;0.02;0.02 New grass volume (cost):;34.89;72.21;34.89;0.26;0.23 New grass volume (cost incl surtax):;87.55;181.19;87.55;0.72;0.63 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;95.0;195.0;1425.0;0.0;0.0 +Land purchase surface (cost incl surtax):;134.14;275.34;2012.1;0.0;0.0 Construction length (quantity):;0;0;0;12.0;12.0 Construction length (cost):;0;500;0;4448.76;8094.78 Construction length (cost incl surtax):;0;1456.0;0.0;12954.77;26672.31 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 c905cf71..0400f57e 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);1049845.05;3014405.05;1892144.85;4804450.96;8845645.09 -Cost per km incl surtax (Euro/km);2381751.22;5625492.26;4644232.22;13942542.25;28757453.48 +Cost per km (Euro/km);1049845.05;1194405.05;1892144.85;4804450.96;8845645.09 +Cost per km incl surtax (Euro/km);2381751.22;3055652.26;4644232.22;13942542.25;28757453.48 New grass volume (quantity):;6.9;3.9;0.9;0.02;0.02 New grass volume (cost):;85.84;48.52;11.2;0.26;0.23 New grass volume (cost incl surtax):;215.36;121.73;28.09;0.72;0.63 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;230.0;130.0;450.0;0.0;0.0 +Land purchase surface (cost incl surtax):;324.76;183.56;635.4;0.0;0.0 Construction length (quantity):;0;0;6.3;12.0;12.0 Construction length (cost):;0;500;968.96;4448.76;8094.78 Construction length (cost incl surtax):;0;1456.0;2821.61;12954.77;26672.31 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 832e0c0a..00aebd04 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);1060086.24;3444646.24;2322386.04;4374406.72;7958625.6 -Cost per km incl surtax (Euro/km);2374536.38;6211317.42;5230057.38;12738272.37;26223671.35 +Cost per km (Euro/km);1060086.24;1204646.24;2322386.04;4374406.72;7958625.6 +Cost per km incl surtax (Euro/km);2374536.38;3048437.42;5230057.38;12738272.37;26223671.35 New grass volume (quantity):;7.76;4.76;1.76;0.0;0.0 New grass volume (cost):;96.47;59.15;21.83;0.0;0.0 New grass volume (cost incl surtax):;242.05;148.41;54.78;0.0;0.0 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;260.0;160.0;900.0;0.0;0.0 +Land purchase surface (cost incl surtax):;367.12;225.92;1270.8;0.0;0.0 Construction length (quantity):;0;0;6.3;11.8;11.8 Construction length (cost):;0;500;968.96;4374.41;7958.63 Construction length (cost incl surtax):;0;1456.0;2821.61;12738.27;26223.67 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 f0a1e37f..600d61c5 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);1386849.97;4261409.97;3139149.77;5148223.24;9458348.89 -Cost per km incl surtax (Euro/km);3155991.57;7684652.61;6703392.56;14943607.12;30776312.5 +Cost per km (Euro/km);1386849.97;1531409.97;3139149.77;5148223.24;9458348.89 +Cost per km incl surtax (Euro/km);3155991.57;3829892.61;6703392.56;14943607.12;30776312.5 New grass volume (quantity):;8.81;5.81;2.8;0.02;0.02 New grass volume (cost):;109.53;72.21;34.89;0.26;0.23 New grass volume (cost incl surtax):;274.82;181.19;87.55;0.72;0.63 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;295.0;195.0;1425.0;0.0;0.0 +Land purchase surface (cost incl surtax):;416.54;275.34;2012.1;0.0;0.0 Construction length (quantity):;0;0;6.3;12.9;12.9 Construction length (cost):;0;500;968.96;4792.53;8707.49 Construction length (cost incl surtax):;0;1456.0;2821.61;13955.84;28691.17 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 416477a8..e3690bd6 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);800957.3;3732177.3;1640957.3;5110036.7;9187155.01 -Cost per km incl surtax (Euro/km);1943781.86;6932732.84;3129861.86;14816685.72;29882149.06 +Cost per km (Euro/km);800957.3;1492177.3;1640957.3;5110036.7;9187155.01 +Cost per km incl surtax (Euro/km);1943781.86;3769852.84;3129861.86;14816685.72;29882149.06 New grass volume (quantity):;1.8;4.8;1.8;0.04;0.03 New grass volume (cost):;22.39;59.71;22.39;0.48;0.43 New grass volume (cost incl surtax):;56.18;149.82;56.18;1.33;1.18 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;60.0;160.0;900.0;0.0;0.0 +Land purchase surface (cost incl surtax):;84.72;225.92;1270.8;0.0;0.0 Construction length (quantity):;0;0;0;12.5;12.5 Construction length (cost):;0;500;0;4637.88;8435.17 Construction length (cost incl surtax):;0;1456.0;0.0;13505.51;27793.9 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 413c23a1..ab348814 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);660436.02;4011656.02;1920436.02;4264279.0;7754391.0 -Cost per km incl surtax (Euro/km);1558303.98;7140294.96;3337423.98;12417580.45;25550718.35 +Cost per km (Euro/km);660436.02;1351656.02;1920436.02;4264279.0;7754391.0 +Cost per km incl surtax (Euro/km);1558303.98;3384374.96;3337423.98;12417580.45;25550718.35 New grass volume (quantity):;2.63;5.63;2.63;0.0;0.0 New grass volume (cost):;32.75;70.07;32.75;0.0;0.0 New grass volume (cost incl surtax):;82.17;175.8;82.17;0.0;0.0 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;90.0;190.0;1350.0;0.0;0.0 +Land purchase surface (cost incl surtax):;127.08;268.28;1906.2;0.0;0.0 Construction length (quantity):;0;0;0;11.5;11.5 Construction length (cost):;0;500;0;4264.28;7754.39 Construction length (cost incl surtax):;0;1456.0;0.0;12417.58;25550.72 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 dce4e86c..69dc3e99 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);2354288.79;2457286.37;1765589.8;6002701.92;10681753.6 -Cost per km incl surtax (Euro/km);5358410.59;4721331.5;5141397.5;17479867.99;35196378.11 +Cost per km (Euro/km);2354288.79;1057286.37;1765589.8;4191790.32;10681753.6 +Cost per km incl surtax (Euro/km);5358410.59;2744531.5;5141397.5;12206493.41;35196378.11 New grass volume (quantity):;15.0;3.0;0.0;0.0;0.0 New grass volume (cost):;186.6;37.32;0.0;0.0;0.0 New grass volume (cost incl surtax):;468.18;93.64;0.0;0.0;0.0 @@ -33,11 +33,11 @@ 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 -Construction length (quantity):;0;0;11.3;15.8;15.8 -Construction length (cost):;0;500;1765.59;6002.7;10681.75 -Construction length (cost incl surtax):;0;1456.0;5141.4;17479.87;35196.38 +Land purchase surface (cost):;500.0;100.0;0.0;0.0;0.0 +Land purchase surface (cost incl surtax):;706.0;141.2;0.0;0.0;0.0 +Construction length (quantity):;0;0;11.3;11.3;15.8 +Construction length (cost):;0;500;1765.59;4191.79;10681.75 +Construction length (cost incl surtax):;0;1456.0;5141.4;12206.49;35196.38 Total measure meters;0;0;0;0;0 Total measure cost;0.0;0.0;0.0;0.0;0.0;0.0 Total measure cost incl surtax;0.0;0.0;0.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 d9563b4a..7210bda9 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);1374288.35;5775508.35;3684288.35;5110036.7;9187155.01 -Cost per km incl surtax (Euro/km);3267084.47;10331675.45;6528804.47;14816685.72;29882149.06 +Cost per km (Euro/km);1374288.35;2065508.35;3684288.35;5110036.7;9187155.01 +Cost per km incl surtax (Euro/km);3267084.47;5093155.45;6528804.47;14816685.72;29882149.06 New grass volume (quantity):;4.88;7.88;4.88;0.04;0.03 New grass volume (cost):;60.74;98.06;60.74;0.48;0.43 New grass volume (cost incl surtax):;152.39;246.03;152.39;1.33;1.18 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;165.0;265.0;2475.0;0.0;0.0 +Land purchase surface (cost incl surtax):;232.98;374.18;3494.7;0.0;0.0 Construction length (quantity):;0;0;0;12.5;12.5 Construction length (cost):;0;500;0;4637.88;8435.17 Construction length (cost incl surtax):;0;1456.0;0.0;13505.51;27793.9 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 b7b4173d..3b39985a 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);2991107.3;3732177.3;3406547.1;7400582.22;12795299.61 -Cost per km incl surtax (Euro/km);6890368.21;6932732.84;8271259.36;21486754.27;41770985.52 +Cost per km (Euro/km);2991107.3;1492177.3;3406547.1;7400582.22;12795299.61 +Cost per km incl surtax (Euro/km);6890368.21;3769852.84;8271259.36;21486754.27;41770985.52 New grass volume (quantity):;16.8;4.8;1.8;0.04;0.03 New grass volume (cost):;208.99;59.71;22.39;0.48;0.43 New grass volume (cost incl surtax):;524.36;149.82;56.18;1.33;1.18 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;560.0;160.0;900.0;0.0;0.0 +Land purchase surface (cost incl surtax):;790.72;225.92;1270.8;0.0;0.0 Construction length (quantity):;0;0;11.3;17.8;17.8 Construction length (cost):;0;500;1765.59;6928.43;12043.32 Construction length (cost incl surtax):;0;1456.0;5141.4;20175.58;39682.73 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 4f96e1cd..5e804d9a 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);2795686.02;4011656.02;3686025.82;6690021.12;11702926.6 -Cost per km incl surtax (Euro/km);6367146.23;7140294.96;8478821.48;19481341.5;38561143.15 +Cost per km (Euro/km);2795686.02;1351656.02;3686025.82;6690021.12;11702926.6 +Cost per km incl surtax (Euro/km);6367146.23;3384374.96;8478821.48;19481341.5;38561143.15 New grass volume (quantity):;17.63;5.63;2.63;0.0;0.0 New grass volume (cost):;219.35;70.07;32.75;0.0;0.0 New grass volume (cost incl surtax):;550.34;175.8;82.17;0.0;0.0 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;590.0;190.0;1350.0;0.0;0.0 +Land purchase surface (cost incl surtax):;833.08;268.28;1906.2;0.0;0.0 Construction length (quantity):;0;0;11.3;17.3;17.3 Construction length (cost):;0;500;1765.59;6690.02;11702.93 Construction length (cost incl surtax):;0;1456.0;5141.4;19481.34;38561.14 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 b9fc0f4f..5b626861 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);3564438.35;5775508.35;5449878.15;8297331.78;14020707.21 -Cost per km incl surtax (Euro/km);8213670.82;10331675.45;11670201.97;24098088.99;45808703.56 +Cost per km (Euro/km);3564438.35;2065508.35;5449878.15;8297331.78;14020707.21 +Cost per km incl surtax (Euro/km);8213670.82;5093155.45;11670201.97;24098088.99;45808703.56 New grass volume (quantity):;19.88;7.88;4.88;0.04;0.03 New grass volume (cost):;247.34;98.06;60.74;0.48;0.43 New grass volume (cost incl surtax):;620.57;246.03;152.39;1.33;1.18 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;665.0;265.0;2475.0;0.0;0.0 +Land purchase surface (cost incl surtax):;938.98;374.18;3494.7;0.0;0.0 Construction length (quantity):;0;0;11.3;19.6;19.6 Construction length (cost):;0;500;1765.59;7825.18;13268.73 Construction length (cost incl surtax):;0;1456.0;5141.4;22786.91;43720.45 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 e3560fce..d068a462 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);626987.75;3138207.75;1046987.75;4898032.82;8845645.09 -Cost per km incl surtax (Euro/km);1540202.26;5936113.24;2133242.26;14202419.07;28757453.48 +Cost per km (Euro/km);626987.75;1318207.75;1046987.75;4898032.82;8845645.09 +Cost per km incl surtax (Euro/km);1540202.26;3366273.24;2133242.26;14202419.07;28757453.48 New grass volume (quantity):;0.9;3.9;0.9;0.02;0.02 New grass volume (cost):;11.2;48.52;11.2;0.2;0.23 New grass volume (cost incl surtax):;28.09;121.73;28.09;0.55;0.63 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;30.0;130.0;450.0;0.0;0.0 +Land purchase surface (cost incl surtax):;42.36;183.56;635.4;0.0;0.0 Construction length (quantity):;0;0;0;12.0;12.0 Construction length (cost):;0;500;0;4448.76;8094.78 Construction length (cost incl surtax):;0;1456.0;0.0;12954.77;26672.31 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 bfa11459..a13e0f43 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);758288.83;3969508.83;1878288.83;4264279.0;7754391.0 -Cost per km incl surtax (Euro/km);1814786.68;7199097.66;3396226.68;12417580.45;25550718.35 +Cost per km (Euro/km);758288.83;1449508.83;1878288.83;4264279.0;7754391.0 +Cost per km incl surtax (Euro/km);1814786.68;3640857.66;3396226.68;12417580.45;25550718.35 New grass volume (quantity):;2.36;5.35;2.36;0.0;0.0 New grass volume (cost):;29.3;66.62;29.3;0.0;0.0 New grass volume (cost incl surtax):;73.5;167.14;73.5;0.0;0.0 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;80.0;180.0;1200.0;0.0;0.0 +Land purchase surface (cost incl surtax):;112.96;254.16;1694.4;0.0;0.0 Construction length (quantity):;0;0;0;11.5;11.5 Construction length (cost):;0;500;0;4264.28;7754.39 Construction length (cost incl surtax):;0;1456.0;0.0;12417.58;25550.72 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 b77ea979..fb318056 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);970614.18;2555033.14;650307.8;4264279.0;7754391.0 -Cost per km incl surtax (Euro/km);2215870.97;4966578.14;1893696.31;12417580.45;25550718.35 +Cost per km (Euro/km);970614.18;1155033.14;650307.8;2123305.72;7754391.0 +Cost per km incl surtax (Euro/km);2215870.97;2989778.14;1893696.31;6183066.26;25550718.35 New grass volume (quantity):;6.0;3.0;0.0;0.0;0.0 New grass volume (cost):;74.64;37.32;0.0;0.0;0.0 New grass volume (cost incl surtax):;187.27;93.64;0.0;0.0;0.0 @@ -33,11 +33,11 @@ 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 -Construction length (quantity):;0;0;4.3;11.5;11.5 -Construction length (cost):;0;500;650.31;4264.28;7754.39 -Construction length (cost incl surtax):;0;1456.0;1893.7;12417.58;25550.72 +Land purchase surface (cost):;200.0;100.0;0.0;0.0;0.0 +Land purchase surface (cost incl surtax):;282.4;141.2;0.0;0.0;0.0 +Construction length (quantity):;0;0;4.3;4.3;11.5 +Construction length (cost):;0;500;650.31;2123.31;7754.39 +Construction length (cost incl surtax):;0;1456.0;1893.7;6183.07;25550.72 Total measure meters;0;0;0;0;0 Total measure cost;0.0;0.0;0.0;0.0;0.0;0.0 Total measure cost incl surtax;0.0;0.0;0.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 b53048cf..606ad288 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);1161912.56;4863132.56;2771912.56;4898032.82;8845645.09 -Cost per km incl surtax (Euro/km);2789083.6;8865274.58;5062403.6;14202419.07;28757453.48 +Cost per km (Euro/km);1161912.56;1853132.56;2771912.56;4898032.82;8845645.09 +Cost per km incl surtax (Euro/km);2789083.6;4615154.58;5062403.6;14202419.07;28757453.48 New grass volume (quantity):;3.41;6.41;3.41;0.02;0.02 New grass volume (cost):;42.36;79.68;42.36;0.2;0.23 New grass volume (cost incl surtax):;106.28;199.91;106.28;0.55;0.63 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;115.0;215.0;1725.0;0.0;0.0 +Land purchase surface (cost incl surtax):;162.38;303.58;2435.7;0.0;0.0 Construction length (quantity):;0;0;0;12.0;12.0 Construction length (cost):;0;500;0;4448.76;8094.78 Construction length (cost incl surtax):;0;1456.0;0.0;12954.77;26672.31 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 38130e25..3f0a523b 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);1173647.75;3138207.75;1697295.55;4898032.82;8845645.09 -Cost per km incl surtax (Euro/km);2692372.2;5936113.24;4026938.58;14202419.07;28757453.48 +Cost per km (Euro/km);1173647.75;1318207.75;1697295.55;4898032.82;8845645.09 +Cost per km incl surtax (Euro/km);2692372.2;3366273.24;4026938.58;14202419.07;28757453.48 New grass volume (quantity):;6.9;3.9;0.9;0.02;0.02 New grass volume (cost):;85.84;48.52;11.2;0.2;0.23 New grass volume (cost incl surtax):;215.36;121.73;28.09;0.55;0.63 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;230.0;130.0;450.0;0.0;0.0 +Land purchase surface (cost incl surtax):;324.76;183.56;635.4;0.0;0.0 Construction length (quantity):;0;0;4.3;12.0;12.0 Construction length (cost):;0;500;650.31;4448.76;8094.78 Construction length (cost incl surtax):;0;1456.0;1893.7;12954.77;26672.31 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 a35e3353..47ace149 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);1304948.83;3969508.83;2528596.63;4523847.12;8230938.4 -Cost per km incl surtax (Euro/km);2966956.62;7199097.66;5289923.0;13173442.81;27120942.03 +Cost per km (Euro/km);1304948.83;1449508.83;2528596.63;4523847.12;8230938.4 +Cost per km incl surtax (Euro/km);2966956.62;3640857.66;5289923.0;13173442.81;27120942.03 New grass volume (quantity):;8.36;5.35;2.36;0.0;0.0 New grass volume (cost):;103.94;66.62;29.3;0.0;0.0 New grass volume (cost incl surtax):;260.78;167.14;73.5;0.0;0.0 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;280.0;180.0;1200.0;0.0;0.0 +Land purchase surface (cost incl surtax):;395.36;254.16;1694.4;0.0;0.0 Construction length (quantity):;0;0;4.3;12.2;12.2 Construction length (cost):;0;500;650.31;4523.85;8230.94 Construction length (cost incl surtax):;0;1456.0;1893.7;13173.44;27120.94 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 0ca47884..bf47e01d 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);1708572.56;4863132.56;3422220.36;5359743.14;9662583.49 -Cost per km incl surtax (Euro/km);3941253.54;8865274.58;6956099.92;15546919.53;31449265.51 +Cost per km (Euro/km);1708572.56;1853132.56;3422220.36;5359743.14;9662583.49 +Cost per km incl surtax (Euro/km);3941253.54;4615154.58;6956099.92;15546919.53;31449265.51 New grass volume (quantity):;9.4;6.41;3.41;0.02;0.02 New grass volume (cost):;117.0;79.68;42.36;0.2;0.23 New grass volume (cost incl surtax):;293.55;199.91;106.28;0.55;0.63 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;315.0;215.0;1725.0;0.0;0.0 +Land purchase surface (cost incl surtax):;444.78;303.58;2435.7;0.0;0.0 Construction length (quantity):;0;0;4.3;13.2;13.2 Construction length (cost):;0;500;650.31;4910.47;8911.72 Construction length (cost incl surtax):;0;1456.0;1893.7;14299.28;29364.12 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 c8793daf..e3c7a59a 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);990640.0;3921860.0;1830640.0;5233385.0;9187155.01 -Cost per km incl surtax (Euro/km);2419695.76;7408646.74;3605775.76;15159223.95;29882149.06 +Cost per km (Euro/km);990640.0;1681860.0;1830640.0;5233385.0;9187155.01 +Cost per km incl surtax (Euro/km);2419695.76;4245766.74;3605775.76;15159223.95;29882149.06 New grass volume (quantity):;1.8;4.8;1.8;0.03;0.03 New grass volume (cost):;22.39;59.71;22.39;0.37;0.43 New grass volume (cost incl surtax):;56.18;149.82;56.18;1.04;1.18 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;60.0;160.0;900.0;0.0;0.0 +Land purchase surface (cost incl surtax):;84.72;225.92;1270.8;0.0;0.0 Construction length (quantity):;0;0;0;12.5;12.5 Construction length (cost):;0;500;0;4637.88;8435.17 Construction length (cost incl surtax):;0;1456.0;0.0;13505.51;27793.9 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 f8882ff8..2f1ce10a 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);998696.37;4769916.37;2678696.37;4264279.0;7754391.0 -Cost per km incl surtax (Euro/km);2374089.2;8549120.18;4746249.2;12417580.45;25550718.35 +Cost per km (Euro/km);998696.37;1689916.37;2678696.37;4264279.0;7754391.0 +Cost per km incl surtax (Euro/km);2374089.2;4200160.18;4746249.2;12417580.45;25550718.35 New grass volume (quantity):;3.53;6.53;3.53;0.0;0.0 New grass volume (cost):;43.94;81.26;43.94;0.0;0.0 New grass volume (cost incl surtax):;110.26;203.89;110.26;0.0;0.0 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;120.0;220.0;1800.0;0.0;0.0 +Land purchase surface (cost incl surtax):;169.44;310.64;2541.6;0.0;0.0 Construction length (quantity):;0;0;0;11.5;11.5 Construction length (cost):;0;500;0;4264.28;7754.39 Construction length (cost incl surtax):;0;1456.0;0.0;12417.58;25550.72 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 635de7ab..c1f1f34a 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);2467111.5;2555033.14;1446937.8;6002701.92;10681753.6 -Cost per km incl surtax (Euro/km);5641482.75;4966578.14;4213482.87;17479867.99;35196378.11 +Cost per km (Euro/km);2467111.5;1155033.14;1446937.8;3507814.72;10681753.6 +Cost per km incl surtax (Euro/km);5641482.75;2989778.14;4213482.87;10214756.46;35196378.11 New grass volume (quantity):;15.0;3.0;0.0;0.0;0.0 New grass volume (cost):;186.6;37.32;0.0;0.0;0.0 New grass volume (cost incl surtax):;468.18;93.64;0.0;0.0;0.0 @@ -33,11 +33,11 @@ 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 -Construction length (quantity):;0;0;9.3;15.8;15.8 -Construction length (cost):;0;500;1446.94;6002.7;10681.75 -Construction length (cost incl surtax):;0;1456.0;4213.48;17479.87;35196.38 +Land purchase surface (cost):;500.0;100.0;0.0;0.0;0.0 +Land purchase surface (cost incl surtax):;706.0;141.2;0.0;0.0;0.0 +Construction length (quantity):;0;0;9.3;9.3;15.8 +Construction length (cost):;0;500;1446.94;3507.81;10681.75 +Construction length (cost incl surtax):;0;1456.0;4213.48;10214.76;35196.38 Total measure meters;0;0;0;0;0 Total measure cost;0.0;0.0;0.0;0.0;0.0;0.0 Total measure cost incl surtax;0.0;0.0;0.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 a86af129..00677a0c 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);1877248.7;6698468.7;4607248.7;5233385.0;9187155.01 -Cost per km incl surtax (Euro/km);4496101.99;12153732.97;8350861.99;15159223.95;29882149.06 +Cost per km (Euro/km);1877248.7;2568468.7;4607248.7;5233385.0;9187155.01 +Cost per km incl surtax (Euro/km);4496101.99;6322172.97;8350861.99;15159223.95;29882149.06 New grass volume (quantity):;5.78;8.78;5.78;0.03;0.03 New grass volume (cost):;71.93;109.25;71.93;0.37;0.43 New grass volume (cost incl surtax):;180.48;274.12;180.48;1.04;1.18 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;195.0;295.0;2925.0;0.0;0.0 +Land purchase surface (cost incl surtax):;275.34;416.54;4130.1;0.0;0.0 Construction length (quantity):;0;0;0;12.5;12.5 Construction length (cost):;0;500;0;4637.88;8435.17 Construction length (cost incl surtax):;0;1456.0;0.0;13505.51;27793.9 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 cbff6cfa..5cec4d30 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);3180790.0;3921860.0;3277577.8;7523930.52;12795299.61 -Cost per km incl surtax (Euro/km);7366282.11;7408646.74;7819258.63;21829292.51;41770985.52 +Cost per km (Euro/km);3180790.0;1681860.0;3277577.8;7523930.52;12795299.61 +Cost per km incl surtax (Euro/km);7366282.11;4245766.74;7819258.63;21829292.51;41770985.52 New grass volume (quantity):;16.8;4.8;1.8;0.03;0.03 New grass volume (cost):;208.99;59.71;22.39;0.37;0.43 New grass volume (cost incl surtax):;524.36;149.82;56.18;1.04;1.18 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;560.0;160.0;900.0;0.0;0.0 +Land purchase surface (cost incl surtax):;790.72;225.92;1270.8;0.0;0.0 Construction length (quantity):;0;0;9.3;17.8;17.8 Construction length (cost):;0;500;1446.94;6928.43;12043.32 Construction length (cost incl surtax):;0;1456.0;4213.48;20175.58;39682.73 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 5ce82767..ce519058 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);3188846.37;4769916.37;4125634.17;6928425.52;12043317.6 -Cost per km incl surtax (Euro/km);7320675.55;8549120.18;8959732.07;20175575.11;39682731.49 +Cost per km (Euro/km);3188846.37;1689916.37;4125634.17;6928425.52;12043317.6 +Cost per km incl surtax (Euro/km);7320675.55;4200160.18;8959732.07;20175575.11;39682731.49 New grass volume (quantity):;18.53;6.53;3.53;0.0;0.0 New grass volume (cost):;230.54;81.26;43.94;0.0;0.0 New grass volume (cost incl surtax):;578.44;203.89;110.26;0.0;0.0 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;620.0;220.0;1800.0;0.0;0.0 +Land purchase surface (cost incl surtax):;875.44;310.64;2541.6;0.0;0.0 Construction length (quantity):;0;0;9.3;17.8;17.8 Construction length (cost):;0;500;1446.94;6928.43;12043.32 Construction length (cost incl surtax):;0;1456.0;4213.48;20175.58;39682.73 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 fea96273..1609b973 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 @@ -1,7 +1,7 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);4067398.7;6698468.7;6054186.5;8680469.88;14361098.21 -Cost per km incl surtax (Euro/km);9442688.34;12153732.97;12564344.86;25197135.12;46930291.91 +Cost per km (Euro/km);4067398.7;2568468.7;6054186.5;8680469.88;14361098.21 +Cost per km incl surtax (Euro/km);9442688.34;6322172.97;12564344.86;25197135.12;46930291.91 New grass volume (quantity):;20.78;8.78;5.78;0.03;0.03 New grass volume (cost):;258.53;109.25;71.93;0.37;0.43 New grass volume (cost incl surtax):;648.66;274.12;180.48;1.04;1.18 @@ -33,8 +33,8 @@ 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 +Land purchase surface (cost):;695.0;295.0;2925.0;0.0;0.0 +Land purchase surface (cost incl surtax):;981.34;416.54;4130.1;0.0;0.0 Construction length (quantity):;0;0;9.3;20.1;20.1 Construction length (cost):;0;500;1446.94;8084.96;13609.12 Construction length (cost incl surtax):;0;1456.0;4213.48;23543.42;44842.04 diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kistdam/dijk4_added_Kistdam_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kistdam/dijk4_added_Kistdam_CLAY.png new file mode 100644 index 00000000..0df4a6cc4 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kistdam/dijk4_added_Kistdam_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kistdam/dijk4_added_Kistdam_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kistdam/dijk4_added_Kistdam_GRASS.png new file mode 100644 index 00000000..e45af402 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kistdam/dijk4_added_Kistdam_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kistdam/dijk4_added_Kistdam_SAND.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kistdam/dijk4_added_Kistdam_SAND.png new file mode 100644 index 00000000..9debf97d Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kistdam/dijk4_added_Kistdam_SAND.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kistdam/dijk4_removed_Kistdam_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kistdam/dijk4_removed_Kistdam_CLAY.png new file mode 100644 index 00000000..9074ffb6 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kistdam/dijk4_removed_Kistdam_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kistdam/dijk4_removed_Kistdam_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kistdam/dijk4_removed_Kistdam_GRASS.png new file mode 100644 index 00000000..18121eed Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kistdam/dijk4_removed_Kistdam_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kwelscherm/dijk4_added_Kwelscherm_SAND.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kwelscherm/dijk4_added_Kwelscherm_SAND.png new file mode 100644 index 00000000..6416cbd6 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kwelscherm/dijk4_added_Kwelscherm_SAND.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kwelscherm/dijk4_removed_Kwelscherm_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kwelscherm/dijk4_removed_Kwelscherm_CLAY.png new file mode 100644 index 00000000..f23b609a Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kwelscherm/dijk4_removed_Kwelscherm_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kwelscherm/dijk4_removed_Kwelscherm_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kwelscherm/dijk4_removed_Kwelscherm_GRASS.png new file mode 100644 index 00000000..584775d2 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/Kwelscherm/dijk4_removed_Kwelscherm_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/dijk4_Kistdam.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/dijk4_Kistdam.png new file mode 100644 index 00000000..23368e8f Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/dijk4_Kistdam.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/dijk4_Kwelscherm.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/dijk4_Kwelscherm.png new file mode 100644 index 00000000..cf023148 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/figures/dijk4_Kwelscherm.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/summary_infrastructure_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/summary_infrastructure_costs.csv new file mode 100644 index 00000000..c92eafbf --- /dev/null +++ b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/summary_infrastructure_costs.csv @@ -0,0 +1,3 @@ +;;;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam +;;;*) Kosten incl. opslagfactoren;;;; +Section;X coord;Y coord;Totale kosten* (Euro);Totale kosten* (Euro);Totale kosten* (Euro);Totale kosten* (Euro);Totale kosten* (Euro) \ No newline at end of file diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/summary_locations.csv b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/summary_locations.csv new file mode 100644 index 00000000..e8e54718 --- /dev/null +++ b/tests/test_data/acceptance_reference_data/case_dijk4_scen1_with_default_layers/summary_locations.csv @@ -0,0 +1 @@ +Section;X coord;Y coord;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam;Initial selection;Ordered selection;Optimized selection diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk4_added_Grondmaatregel_profiel_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk4_added_Grondmaatregel_profiel_CLAY.png new file mode 100644 index 00000000..c5101ba1 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk4_added_Grondmaatregel_profiel_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk4_added_Grondmaatregel_profiel_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk4_added_Grondmaatregel_profiel_GRASS.png new file mode 100644 index 00000000..f7be7b08 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk4_added_Grondmaatregel_profiel_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk4_added_Grondmaatregel_profiel_SAND.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk4_added_Grondmaatregel_profiel_SAND.png new file mode 100644 index 00000000..cb100ffe Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk4_added_Grondmaatregel_profiel_SAND.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk4_removed_Grondmaatregel_profiel_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk4_removed_Grondmaatregel_profiel_CLAY.png new file mode 100644 index 00000000..fc95d1b4 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk4_removed_Grondmaatregel_profiel_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk4_removed_Grondmaatregel_profiel_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk4_removed_Grondmaatregel_profiel_GRASS.png new file mode 100644 index 00000000..9e0d282b Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk4_removed_Grondmaatregel_profiel_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kistdam/dijk4_added_Kistdam_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kistdam/dijk4_added_Kistdam_CLAY.png new file mode 100644 index 00000000..0df4a6cc4 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kistdam/dijk4_added_Kistdam_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kistdam/dijk4_added_Kistdam_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kistdam/dijk4_added_Kistdam_GRASS.png new file mode 100644 index 00000000..e45af402 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kistdam/dijk4_added_Kistdam_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kistdam/dijk4_added_Kistdam_SAND.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kistdam/dijk4_added_Kistdam_SAND.png new file mode 100644 index 00000000..9debf97d Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kistdam/dijk4_added_Kistdam_SAND.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kistdam/dijk4_removed_Kistdam_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kistdam/dijk4_removed_Kistdam_CLAY.png new file mode 100644 index 00000000..9074ffb6 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kistdam/dijk4_removed_Kistdam_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kistdam/dijk4_removed_Kistdam_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kistdam/dijk4_removed_Kistdam_GRASS.png new file mode 100644 index 00000000..18121eed Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kistdam/dijk4_removed_Kistdam_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kwelscherm/dijk4_added_Kwelscherm_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kwelscherm/dijk4_added_Kwelscherm_CLAY.png new file mode 100644 index 00000000..ec99ef80 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kwelscherm/dijk4_added_Kwelscherm_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kwelscherm/dijk4_added_Kwelscherm_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kwelscherm/dijk4_added_Kwelscherm_GRASS.png new file mode 100644 index 00000000..66efd30a Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kwelscherm/dijk4_added_Kwelscherm_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kwelscherm/dijk4_added_Kwelscherm_SAND.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kwelscherm/dijk4_added_Kwelscherm_SAND.png new file mode 100644 index 00000000..fd647bbb Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kwelscherm/dijk4_added_Kwelscherm_SAND.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kwelscherm/dijk4_removed_Kwelscherm_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kwelscherm/dijk4_removed_Kwelscherm_CLAY.png new file mode 100644 index 00000000..be3adff7 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kwelscherm/dijk4_removed_Kwelscherm_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kwelscherm/dijk4_removed_Kwelscherm_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kwelscherm/dijk4_removed_Kwelscherm_GRASS.png new file mode 100644 index 00000000..8fb2282e Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Kwelscherm/dijk4_removed_Kwelscherm_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Stabiliteitswand/dijk4_added_Stabiliteitswand_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Stabiliteitswand/dijk4_added_Stabiliteitswand_CLAY.png new file mode 100644 index 00000000..030ddcc2 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Stabiliteitswand/dijk4_added_Stabiliteitswand_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Stabiliteitswand/dijk4_added_Stabiliteitswand_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Stabiliteitswand/dijk4_added_Stabiliteitswand_GRASS.png new file mode 100644 index 00000000..1232bb45 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Stabiliteitswand/dijk4_added_Stabiliteitswand_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Stabiliteitswand/dijk4_added_Stabiliteitswand_SAND.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Stabiliteitswand/dijk4_added_Stabiliteitswand_SAND.png new file mode 100644 index 00000000..eb14a864 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Stabiliteitswand/dijk4_added_Stabiliteitswand_SAND.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Stabiliteitswand/dijk4_removed_Stabiliteitswand_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Stabiliteitswand/dijk4_removed_Stabiliteitswand_CLAY.png new file mode 100644 index 00000000..cc5cd286 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Stabiliteitswand/dijk4_removed_Stabiliteitswand_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Stabiliteitswand/dijk4_removed_Stabiliteitswand_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Stabiliteitswand/dijk4_removed_Stabiliteitswand_GRASS.png new file mode 100644 index 00000000..77da3a4a Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Stabiliteitswand/dijk4_removed_Stabiliteitswand_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk4_added_Verticale_piping_oplossing_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk4_added_Verticale_piping_oplossing_CLAY.png new file mode 100644 index 00000000..12a54fec Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk4_added_Verticale_piping_oplossing_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk4_added_Verticale_piping_oplossing_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk4_added_Verticale_piping_oplossing_GRASS.png new file mode 100644 index 00000000..5644a2d7 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk4_added_Verticale_piping_oplossing_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk4_added_Verticale_piping_oplossing_SAND.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk4_added_Verticale_piping_oplossing_SAND.png new file mode 100644 index 00000000..1ab57be6 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk4_added_Verticale_piping_oplossing_SAND.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk4_removed_Verticale_piping_oplossing_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk4_removed_Verticale_piping_oplossing_CLAY.png new file mode 100644 index 00000000..92f585a9 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk4_removed_Verticale_piping_oplossing_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk4_removed_Verticale_piping_oplossing_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk4_removed_Verticale_piping_oplossing_GRASS.png new file mode 100644 index 00000000..1376eed7 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk4_removed_Verticale_piping_oplossing_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/dijk4_Grondmaatregel_profiel.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/dijk4_Grondmaatregel_profiel.png new file mode 100644 index 00000000..0d7303d4 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/dijk4_Grondmaatregel_profiel.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/dijk4_Kistdam.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/dijk4_Kistdam.png new file mode 100644 index 00000000..23368e8f Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/dijk4_Kistdam.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/dijk4_Kwelscherm.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/dijk4_Kwelscherm.png new file mode 100644 index 00000000..310bf8da Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/dijk4_Kwelscherm.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/dijk4_Stabiliteitswand.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/dijk4_Stabiliteitswand.png new file mode 100644 index 00000000..18a45fff Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/dijk4_Stabiliteitswand.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/dijk4_Verticale_piping_oplossing.png b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/dijk4_Verticale_piping_oplossing.png new file mode 100644 index 00000000..f489b364 Binary files /dev/null and b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/figures/dijk4_Verticale_piping_oplossing.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/summary_costs.csv new file mode 100644 index 00000000..1dfc6677 --- /dev/null +++ b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/summary_costs.csv @@ -0,0 +1,47 @@ +Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam +Strategy reinforcement order;-1;-1;-1;-1;-1 +Cost per km (Euro/km);2462014.13;1722059.21;6070699.59;5330681.16;9142990.92 +Cost per km incl surtax (Euro/km);5415795.55;4185714.5;11341803.71;15414331.91;29759505.4 +New grass volume (quantity):;14.81;6.43;3.63;0;0.01 +New grass volume (cost):;184.19;79.96;45.19;0.0;0.16 +New grass volume (cost incl surtax):;462.14;200.61;113.39;0.0;0.45 +New clay volume (quantity):;45.16;28.23;28.06;20.93;22.17 +New clay volume (cost):;815.21;509.52;506.44;377.76;400.12 +New clay volume (cost incl surtax):;2045.37;1278.38;1270.67;1049.03;1111.14 +New core volume (quantity):;35.13;0;29.42;0;0 +New core volume (cost):;385.72;0.0;323.04;0.0;0.0 +New core volume (cost incl surtax):;967.78;0.0;810.5;0.0;0.0 +Reused grass volume (quantity):;12.96;12.96;12.96;12.87;12.96 +Reused grass volume (cost):;78.28;78.28;78.28;77.7;78.28 +Reused grass volume (cost incl surtax):;196.41;196.41;196.41;215.79;217.39 +Reused core volume (quantity):;21.92;15.43;21.92;5.66;8.47 +Reused core volume (cost):;102.37;72.08;102.37;26.43;39.57 +Reused core volume (cost incl surtax):;256.84;180.85;256.84;73.39;109.88 +Removed material volume (quantity):;0;6.49;0;16.36;13.45 +Removed material volume (cost):;0.0;45.85;0.0;115.64;95.07 +Removed material volume (cost incl surtax):;0.0;115.05;0.0;321.14;264.02 +New grass layer surface (quantity):;95.16;67.23;58.08;45.36;46.08 +New grass layer surface (cost):;83.74;59.16;51.11;39.91;40.55 +New grass layer surface (cost incl surtax):;210.1;148.43;128.23;110.84;112.62 +New clay layer surface (quantity):;92.27;64.34;56.51;43.11;44.6 +New clay layer surface (cost):;59.97;41.82;36.73;28.02;28.99 +New clay layer surface (cost incl surtax):;150.47;104.92;92.16;77.81;80.5 +New core layer surface (quantity):;76.57;38.64;53.58;23.33;41.78 +New core layer surface (cost):;45.94;23.18;32.15;14.0;25.07 +New core layer surface (cost incl surtax):;115.27;58.16;80.65;38.88;69.62 +New ground level surface (quantity):;50.04;22.11;12.11;0.04;-0.0 +New ground level surface (cost):;12.51;5.53;3.03;0.01;-0.0 +New ground level surface (cost incl surtax):;31.39;13.87;7.6;0.03;-0.0 +Land purchase surface (quantity):;50.04;22.11;12.11;0.04;-0.0 +Land purchase surface (cost):;694.07;306.68;3907.47;13.32;-0.0 +Land purchase surface (cost incl surtax):;980.03;433.04;5517.35;21.92;-0.0 +Construction length (quantity):;0;0;6.4;12.5;12.5 +Construction length (cost):;0;500;984.89;4637.88;8435.17 +Construction length (cost incl surtax):;0;1456.0;2868.01;13505.51;27793.9 +Total measure meters;0;0;0;0;0 +Total measure cost;0.0;0.0;0.0;0.0;0.0;0.0 +Total measure cost incl surtax;0.0;0.0;0.0;0.0;0.0;0.0 +Infrastructure cost;0.0;0.0;0.0;0.0;0.0;0.0 +Infrastructure cost incl surtax;0.0;0.0;0.0;0.0;0.0;0.0 +Total cost;0.0;0.0;0.0;0.0;0.0;0.0 +Total cost incl surtax;0.0;0.0;0.0;0.0;0.0;0.0 \ No newline at end of file diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/summary_infrastructure_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/summary_infrastructure_costs.csv new file mode 100644 index 00000000..c92eafbf --- /dev/null +++ b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/summary_infrastructure_costs.csv @@ -0,0 +1,3 @@ +;;;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam +;;;*) Kosten incl. opslagfactoren;;;; +Section;X coord;Y coord;Totale kosten* (Euro);Totale kosten* (Euro);Totale kosten* (Euro);Totale kosten* (Euro);Totale kosten* (Euro) \ No newline at end of file diff --git a/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/summary_locations.csv b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/summary_locations.csv new file mode 100644 index 00000000..e8e54718 --- /dev/null +++ b/tests/test_data/acceptance_reference_data/case_dijk4_scen2_with_default_layers/summary_locations.csv @@ -0,0 +1 @@ +Section;X coord;Y coord;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam;Initial selection;Ordered selection;Optimized selection diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_CLAY.png index 37dd5c41..dc17ad4e 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_GRASS.png index 245eb048..a09905d9 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_SAND.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_SAND.png index 355f3a41..0140b363 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_SAND.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_SAND.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_removed_Grondmaatregel_profiel_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_removed_Grondmaatregel_profiel_CLAY.png index d889a365..e5091900 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_removed_Grondmaatregel_profiel_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_removed_Grondmaatregel_profiel_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_removed_Grondmaatregel_profiel_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_removed_Grondmaatregel_profiel_GRASS.png index cf72f023..02537d74 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_removed_Grondmaatregel_profiel_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Grondmaatregel_profiel/dijk5_removed_Grondmaatregel_profiel_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_CLAY.png index 920ab426..ba1b5316 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_GRASS.png index ada41438..22cdd0cf 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_SAND.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_SAND.png index d306c8b2..7e08dce4 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_SAND.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_SAND.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_removed_Kistdam_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_removed_Kistdam_CLAY.png index b8e98930..c5870669 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_removed_Kistdam_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_removed_Kistdam_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_removed_Kistdam_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_removed_Kistdam_GRASS.png index 5265ff55..e452df72 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_removed_Kistdam_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kistdam/dijk5_removed_Kistdam_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_CLAY.png index 51bce171..d15137b0 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_GRASS.png index 1471f4c3..cc86a20a 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_SAND.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_SAND.png index 9d9dee3d..e6d262f7 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_SAND.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_SAND.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_removed_Kwelscherm_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_removed_Kwelscherm_CLAY.png index da3a9c4f..33b756c3 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_removed_Kwelscherm_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_removed_Kwelscherm_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_removed_Kwelscherm_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_removed_Kwelscherm_GRASS.png index e7b970a3..853ba9f1 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_removed_Kwelscherm_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Kwelscherm/dijk5_removed_Kwelscherm_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_CLAY.png index fe8cd364..4f354343 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_GRASS.png index 5a4efdff..1084d77b 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_SAND.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_SAND.png index fa1f4a75..7f44b2dd 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_SAND.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_SAND.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_removed_Stabiliteitswand_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_removed_Stabiliteitswand_CLAY.png index 22ff97bb..1c9222c5 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_removed_Stabiliteitswand_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_removed_Stabiliteitswand_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_removed_Stabiliteitswand_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_removed_Stabiliteitswand_GRASS.png index 168c6b2f..ae60beb1 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_removed_Stabiliteitswand_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Stabiliteitswand/dijk5_removed_Stabiliteitswand_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_CLAY.png index bf3b25bb..8ba1e44f 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_GRASS.png index f28512e1..e54aeb1c 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_SAND.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_SAND.png index e9fe77db..5694ac36 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_SAND.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_SAND.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_removed_Verticale_piping_oplossing_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_removed_Verticale_piping_oplossing_CLAY.png index f3f604e3..d652a27c 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_removed_Verticale_piping_oplossing_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_removed_Verticale_piping_oplossing_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_removed_Verticale_piping_oplossing_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_removed_Verticale_piping_oplossing_GRASS.png index 831516d4..4bffe7db 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_removed_Verticale_piping_oplossing_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/Verticale_piping_oplossing/dijk5_removed_Verticale_piping_oplossing_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Grondmaatregel_profiel.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Grondmaatregel_profiel.png index a612df4f..a53bd6d3 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Grondmaatregel_profiel.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Grondmaatregel_profiel.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Kistdam.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Kistdam.png index 0ec05f13..0079e8fb 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Kistdam.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Kistdam.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Kwelscherm.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Kwelscherm.png index de6ac40a..43468cf0 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Kwelscherm.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Kwelscherm.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Stabiliteitswand.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Stabiliteitswand.png index 1c645216..c356fc07 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Stabiliteitswand.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Stabiliteitswand.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Verticale_piping_oplossing.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Verticale_piping_oplossing.png index 566ca2ce..e7e20e08 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Verticale_piping_oplossing.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen1_with_default_layers/figures/dijk5_Verticale_piping_oplossing.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_CLAY.png index 3083e512..04ce66fd 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_GRASS.png index f8a130af..df2759c0 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_SAND.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_SAND.png index 6fc68b71..eaa92e08 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_SAND.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_added_Grondmaatregel_profiel_SAND.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_removed_Grondmaatregel_profiel_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_removed_Grondmaatregel_profiel_CLAY.png index b2bfdb03..e0e8559d 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_removed_Grondmaatregel_profiel_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_removed_Grondmaatregel_profiel_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_removed_Grondmaatregel_profiel_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_removed_Grondmaatregel_profiel_GRASS.png index a333bebe..da8774df 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_removed_Grondmaatregel_profiel_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Grondmaatregel_profiel/dijk5_removed_Grondmaatregel_profiel_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_CLAY.png index 920ab426..ba1b5316 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_GRASS.png index ada41438..22cdd0cf 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_SAND.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_SAND.png index d306c8b2..7e08dce4 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_SAND.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_added_Kistdam_SAND.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_removed_Kistdam_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_removed_Kistdam_CLAY.png index b8e98930..c5870669 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_removed_Kistdam_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_removed_Kistdam_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_removed_Kistdam_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_removed_Kistdam_GRASS.png index 5265ff55..e452df72 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_removed_Kistdam_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kistdam/dijk5_removed_Kistdam_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_CLAY.png index d16af366..72451439 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_GRASS.png index 9379da5d..8dea4ec6 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_SAND.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_SAND.png index 2c41e0ff..73ac96be 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_SAND.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_added_Kwelscherm_SAND.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_removed_Kwelscherm_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_removed_Kwelscherm_CLAY.png index e9d6b04f..7c1cf92c 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_removed_Kwelscherm_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_removed_Kwelscherm_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_removed_Kwelscherm_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_removed_Kwelscherm_GRASS.png index 65ea26e5..d189375f 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_removed_Kwelscherm_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Kwelscherm/dijk5_removed_Kwelscherm_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_CLAY.png index e5ef33ae..7032750c 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_GRASS.png index 029efc19..068f7436 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_SAND.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_SAND.png index ea535f13..64b19f86 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_SAND.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_added_Stabiliteitswand_SAND.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_removed_Stabiliteitswand_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_removed_Stabiliteitswand_CLAY.png index ffdd5668..af99ab55 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_removed_Stabiliteitswand_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_removed_Stabiliteitswand_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_removed_Stabiliteitswand_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_removed_Stabiliteitswand_GRASS.png index 0977873b..ea5172c7 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_removed_Stabiliteitswand_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Stabiliteitswand/dijk5_removed_Stabiliteitswand_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_CLAY.png index fadde4e1..9925ae82 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_GRASS.png index fa8ed451..ab8d8747 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_SAND.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_SAND.png index e1a17141..c1b21be8 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_SAND.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_added_Verticale_piping_oplossing_SAND.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_removed_Verticale_piping_oplossing_CLAY.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_removed_Verticale_piping_oplossing_CLAY.png index 87743142..84b947bf 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_removed_Verticale_piping_oplossing_CLAY.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_removed_Verticale_piping_oplossing_CLAY.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_removed_Verticale_piping_oplossing_GRASS.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_removed_Verticale_piping_oplossing_GRASS.png index aa433057..a37eab85 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_removed_Verticale_piping_oplossing_GRASS.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/Verticale_piping_oplossing/dijk5_removed_Verticale_piping_oplossing_GRASS.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Grondmaatregel_profiel.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Grondmaatregel_profiel.png index 6e07ecd2..f02072b1 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Grondmaatregel_profiel.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Grondmaatregel_profiel.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Kistdam.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Kistdam.png index 0ec05f13..0079e8fb 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Kistdam.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Kistdam.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Kwelscherm.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Kwelscherm.png index 068c6c07..8faa4b2a 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Kwelscherm.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Kwelscherm.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Stabiliteitswand.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Stabiliteitswand.png index b5795efd..64f1214d 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Stabiliteitswand.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Stabiliteitswand.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Verticale_piping_oplossing.png b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Verticale_piping_oplossing.png index 7bcc28a3..da765b6f 100644 Binary files a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Verticale_piping_oplossing.png and b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/figures/dijk5_Verticale_piping_oplossing.png differ diff --git a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/summary_costs.csv index 400b1c22..47fc527a 100644 --- a/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/summary_costs.csv +++ b/tests/test_data/acceptance_reference_data/case_dijk5_scen2_with_default_layers/summary_costs.csv @@ -1,43 +1,43 @@ Profile type;Grondmaatregel profiel;Verticale piping oplossing;Kwelscherm;Stabiliteitswand;Kistdam Strategy reinforcement order;-1;-1;-1;-1;-1 -Cost per km (Euro/km);2474448.03;4365453.51;2020654.1;2794401.96;6621062.09 -Cost per km incl surtax (Euro/km);5447620.61;7648299.14;5711747.82;12273181.88;35703214.63 -New grass volume (quantity):;14.91;2.88;0;0;0 -New grass volume (cost):;185.49;35.86;0.0;0.0;0.0 -New grass volume (cost incl surtax):;465.4;89.98;0.0;0.0;0.0 -New clay volume (quantity):;41.74;21.7;16.69;12.55;11.38 -New clay volume (cost):;753.46;391.6;301.34;226.45;205.49 -New clay volume (cost incl surtax):;1890.42;982.52;756.06;628.85;570.64 -New core volume (quantity):;46.61;0;0;0;0 -New core volume (cost):;511.76;0.0;0.0;0.0;0.0 -New core volume (cost incl surtax):;1284.0;0.0;0.0;0.0;0.0 -Reused grass volume (quantity):;10.45;10.45;10.33;7.37;6.5 -Reused grass volume (cost):;63.12;63.12;62.41;44.52;39.26 -Reused grass volume (cost incl surtax):;158.37;158.37;156.59;123.63;109.03 -Reused core volume (quantity):;17.46;14.52;5.66;4.09;5.35 -Reused core volume (cost):;81.56;67.8;26.43;19.09;25.0 -Reused core volume (cost incl surtax):;204.63;170.1;66.32;53.02;69.42 -Removed material volume (quantity):;0;2.95;11.92;16.46;16.06 -Removed material volume (cost):;0.0;20.83;84.28;116.34;113.55 -Removed material volume (cost incl surtax):;0.0;52.27;211.46;323.08;315.34 -New grass layer surface (quantity):;86.91;46.81;36.81;27.21;24.45 -New grass layer surface (cost):;76.48;41.19;32.39;23.95;21.52 -New grass layer surface (cost incl surtax):;191.88;103.36;81.28;66.5;59.75 -New clay layer surface (quantity):;84.72;44.63;34.63;25.59;23.02 -New clay layer surface (cost):;55.07;29.01;22.51;16.64;14.96 -New clay layer surface (cost incl surtax):;138.17;72.78;56.47;46.2;41.54 -New core layer surface (quantity):;69.2;29.1;18.06;15.69;13.97 -New core layer surface (cost):;41.52;17.46;10.84;9.41;8.38 -New core layer surface (cost incl surtax):;104.17;43.81;27.19;26.14;23.27 -New ground level surface (quantity):;50.0;9.91;-0.09;-10.27;-13.27 -New ground level surface (cost):;12.5;2.48;-0.02;-2.57;-3.32 -New ground level surface (cost incl surtax):;31.36;6.21;-0.06;-7.13;-9.21 -Land purchase surface (quantity):;50.0;9.91;-0.09;-10.27;-13.27 -Land purchase surface (cost):;693.5;3196.1;-30.2;-3312.67;-4281.3 -Land purchase surface (cost incl surtax):;979.22;4512.9;-42.64;-5449.34;-0.0 -Construction length (quantity):;0;0;9.7;15.0;15.5 -Construction length (cost):;0;500;1510.67;5653.24;10477.52 -Construction length (cost incl surtax):;0;1456.0;4399.07;16462.23;34523.43 +Cost per km (Euro/km);2371887.15;1610467.19;6585518.21;5503221.38;9534919.73 +Cost per km incl surtax (Euro/km);5189741.51;3889524.21;12327147.23;15937422.1;31130007.76 +New grass volume (quantity):;14.8;6.75;3.95;0;0.03 +New grass volume (cost):;184.17;83.93;49.17;0.0;0.38 +New grass volume (cost incl surtax):;462.08;210.57;123.36;0.0;1.06 +New clay volume (quantity):;40.88;24.45;24.25;16.75;18.02 +New clay volume (cost):;737.89;441.29;437.77;302.33;325.33 +New clay volume (cost incl surtax):;1851.36;1107.21;1098.38;839.58;903.44 +New core volume (quantity):;38.68;0.23;39.65;0;0 +New core volume (cost):;424.66;2.55;435.34;0.0;0.0 +New core volume (cost incl surtax):;1065.47;6.4;1092.26;0.0;0.0 +Reused grass volume (quantity):;10.45;10.45;10.45;10.37;10.45 +Reused grass volume (cost):;63.12;63.12;63.12;62.64;63.12 +Reused grass volume (cost incl surtax):;158.37;158.37;158.37;173.96;175.29 +Reused core volume (quantity):;17.46;17.46;17.46;5.68;14.2 +Reused core volume (cost):;81.56;81.56;81.56;26.53;66.32 +Reused core volume (cost incl surtax):;204.63;204.63;204.63;73.66;184.17 +Removed material volume (quantity):;0;0;0;11.86;3.26 +Removed material volume (cost):;0.0;0.0;0.0;83.87;23.07 +Removed material volume (cost incl surtax):;0.0;0.0;0.0;232.92;64.06 +New grass layer surface (quantity):;86.7;59.84;50.64;36.94;37.72 +New grass layer surface (cost):;76.29;52.66;44.56;32.51;33.2 +New grass layer surface (cost incl surtax):;191.42;132.12;111.81;90.27;92.18 +New clay layer surface (quantity):;83.75;56.89;49.01;34.75;36.29 +New clay layer surface (cost):;54.43;36.98;31.86;22.58;23.59 +New clay layer surface (cost incl surtax):;136.58;92.77;79.93;62.72;65.5 +New core layer surface (quantity):;72.08;35.22;45.98;18.09;33.53 +New core layer surface (cost):;43.25;21.13;27.59;10.85;20.12 +New core layer surface (cost incl surtax):;108.51;53.02;69.22;30.14;55.87 +New ground level surface (quantity):;50.04;23.18;13.18;0.04;0.0 +New ground level surface (cost):;12.51;5.79;3.29;0.01;0.0 +New ground level surface (cost incl surtax):;31.39;14.54;8.26;0.03;0.0 +Land purchase surface (quantity):;50.04;23.18;13.18;0.04;0.0 +Land purchase surface (cost):;694.0;321.46;4251.1;11.74;0.0 +Land purchase surface (cost incl surtax):;979.93;453.9;6002.56;19.32;0.0 +Construction length (quantity):;0;0;7.5;13.3;13.3 +Construction length (cost):;0;500;1160.15;4950.15;8979.8 +Construction length (cost incl surtax):;0;1456.0;3378.36;14414.84;29588.44 Total measure meters;0;0;0;0;0 Total measure cost;0.0;0.0;0.0;0.0;0.0;0.0 Total measure cost incl surtax;0.0;0.0;0.0;0.0;0.0;0.0