From 731b57bb2008d518a7e75fdfaaa627010c226f9e Mon Sep 17 00:00:00 2001 From: Ardt Klapwijk <59741981+ArdtK@users.noreply.github.com> Date: Tue, 5 Nov 2024 15:17:16 +0100 Subject: [PATCH] feat: 213 extend summary report with reinforcement order (#215) --- .gitignore | 1 + .../summary_costs_csv_fom_builder.py | 24 +++++++-- koswat/cost_report/summary/koswat_summary.py | 7 +++ .../summary/koswat_summary_builder.py | 11 ++-- .../infra_priority_strategy.py | 12 +++-- .../order_strategy/order_strategy.py | 10 ++-- koswat/strategies/strategy_input.py | 16 ++++-- koswat/strategies/strategy_output.py | 22 ++++++++ koswat/strategies/strategy_protocol.py | 9 ++-- .../test_summary_costs_csv_exporter.py | 3 +- .../summary/test_koswat_summary_exporter.py | 9 +++- .../test_infra_priority_strategy.py | 50 +++++++++++-------- .../order_strategy/test_order_strategy.py | 25 ++++++---- .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + .../summary_costs.csv | 1 + 55 files changed, 180 insertions(+), 61 deletions(-) create mode 100644 koswat/strategies/strategy_output.py diff --git a/.gitignore b/.gitignore index b49df73d..ecb87f85 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ coverage.xml # Koswat ignore tests/test_results/ site/ +*.log # Local configurations files covered in pyproject.toml pytest.ini \ No newline at end of file diff --git a/koswat/cost_report/io/summary/summary_costs/summary_costs_csv_fom_builder.py b/koswat/cost_report/io/summary/summary_costs/summary_costs_csv_fom_builder.py index 2829fcaa..c3d16fa4 100644 --- a/koswat/cost_report/io/summary/summary_costs/summary_costs_csv_fom_builder.py +++ b/koswat/cost_report/io/summary/summary_costs/summary_costs_csv_fom_builder.py @@ -1,5 +1,4 @@ import logging -import math from collections import defaultdict from dataclasses import dataclass from itertools import groupby @@ -31,7 +30,11 @@ def dict_to_csv_row(csv_to_convert: dict) -> list[list[str]]: ] def build(self) -> KoswatCsvFom: + def get_index(items: list, item): + return list(items).index(item) if item in items else -1 + _profile_type_key = "Profile type" + _reinforcement_order_key = "Strategy reinforcement order" _cost_per_km_key = "Cost per km (Euro/km)" _cost_per_km_incl_surtax_key = "Cost per km incl surtax (Euro/km)" @@ -40,11 +43,19 @@ def build(self) -> KoswatCsvFom: _dict_of_entries[_profile_type_key].append( _loc_prof_report.profile_type_name ) + _dict_of_entries[_reinforcement_order_key].append( + str( + get_index( + self.koswat_summary.reinforcement_order, + type(_loc_prof_report.profile_cost_report.reinforced_profile), + ) + ) + ) _dict_of_entries[_cost_per_km_key].append( - round(_loc_prof_report.cost_per_km, self._decimals) + str(round(_loc_prof_report.cost_per_km, self._decimals)) ) _dict_of_entries[_cost_per_km_incl_surtax_key].append( - round(_loc_prof_report.cost_per_km_with_surtax, self._decimals) + str(round(_loc_prof_report.cost_per_km_with_surtax, self._decimals)) ) self._get_quantity_cost_parameters( _loc_prof_report.profile_cost_report.quantity_cost_parameters.__dict__, @@ -55,6 +66,10 @@ def build(self) -> KoswatCsvFom: logging.error("No entries generated for the CSV Matrix.") return KoswatCsvFom() + _reinforcement_order_row = [ + [_reinforcement_order_key] + _dict_of_entries[_reinforcement_order_key] + ] + _cost_per_km_rows = [ [_cost_per_km_key] + _dict_of_entries[_cost_per_km_key], [_cost_per_km_incl_surtax_key] @@ -84,7 +99,8 @@ def build(self) -> KoswatCsvFom: return KoswatCsvFom( headers=[_profile_type_key] + _dict_of_entries[_profile_type_key], entries=( - _cost_per_km_rows + _reinforcement_order_row + + _cost_per_km_rows + _quantity_costs_rows + _selected_measure_cost_rows + _infrastructure_cost_rows diff --git a/koswat/cost_report/summary/koswat_summary.py b/koswat/cost_report/summary/koswat_summary.py index db0240e0..f028dd13 100644 --- a/koswat/cost_report/summary/koswat_summary.py +++ b/koswat/cost_report/summary/koswat_summary.py @@ -14,12 +14,19 @@ @dataclass class KoswatSummary: + """ + Represents the summary of the KOSWAT analysis. + """ + locations_profile_report_list: list[MultiLocationProfileCostReport] = field( default_factory=lambda: [] ) reinforcement_per_locations: list[StrategyLocationReinforcement] = field( default_factory=lambda: [] ) + reinforcement_order: list[type[ReinforcementProfileProtocol]] = field( + default_factory=lambda: [] + ) def get_report_by_profile( self, profile_type: type[ReinforcementProfileProtocol] diff --git a/koswat/cost_report/summary/koswat_summary_builder.py b/koswat/cost_report/summary/koswat_summary_builder.py index d5caa6bb..12d174fe 100644 --- a/koswat/cost_report/summary/koswat_summary_builder.py +++ b/koswat/cost_report/summary/koswat_summary_builder.py @@ -20,9 +20,6 @@ from koswat.dike.profile.koswat_input_profile_base import KoswatInputProfileBase from koswat.dike.surroundings.point.point_surroundings import PointSurroundings from koswat.dike_reinforcements import ReinforcementProfileBuilderFactory -from koswat.dike_reinforcements.reinforcement_profile.reinforcement_profile import ( - ReinforcementProfile, -) from koswat.dike_reinforcements.reinforcement_profile.reinforcement_profile_protocol import ( ReinforcementProfileProtocol, ) @@ -30,6 +27,7 @@ InfraPriorityStrategy, ) from koswat.strategies.strategy_input import StrategyInput +from koswat.strategies.strategy_output import StrategyOutput from koswat.strategies.strategy_protocol import StrategyProtocol @@ -100,7 +98,7 @@ def _get_final_reinforcement_per_location( self, locations_profile_report_list: list[MultiLocationProfileCostReport], available_locations: list[PointSurroundings], - ) -> dict[PointSurroundings, ReinforcementProfile]: + ) -> StrategyOutput: _matrix, _reinforcements = KoswatSummaryLocationMatrixBuilder( available_locations=available_locations, locations_profile_report_list=locations_profile_report_list, @@ -129,8 +127,11 @@ def build(self) -> KoswatSummary: _mlpc_builder.reinforced_profile = _calc_profile _summary.locations_profile_report_list.append(_mlpc_builder.build()) - _summary.reinforcement_per_locations = self._get_final_reinforcement_per_location( + _strategy_output = self._get_final_reinforcement_per_location( _summary.locations_profile_report_list, self.run_scenario_settings.surroundings.obstacle_surroundings_wrapper.obstacle_locations, ) + _summary.reinforcement_per_locations = _strategy_output.location_reinforcements + _summary.reinforcement_order = _strategy_output.reinforcement_order + return _summary diff --git a/koswat/strategies/infra_priority_strategy/infra_priority_strategy.py b/koswat/strategies/infra_priority_strategy/infra_priority_strategy.py index 490b0335..90e11a34 100644 --- a/koswat/strategies/infra_priority_strategy/infra_priority_strategy.py +++ b/koswat/strategies/infra_priority_strategy/infra_priority_strategy.py @@ -18,6 +18,7 @@ from koswat.strategies.strategy_location_reinforcement import ( StrategyLocationReinforcement, ) +from koswat.strategies.strategy_output import StrategyOutput from koswat.strategies.strategy_protocol import StrategyProtocol @@ -137,9 +138,7 @@ def get_cluster_option( ), ) - def apply_strategy( - self, strategy_input: StrategyInput - ) -> list[StrategyLocationReinforcement]: + def apply_strategy(self, strategy_input: StrategyInput) -> StrategyOutput: _clustered_locations = [] # 1. Run `OrderStrategy` to generate an initial cluster formation. self._order_strategy = OrderStrategy() @@ -148,13 +147,16 @@ def apply_strategy( ): self._set_cheapest_measure_per_cluster(_infra_cluster, strategy_input) _clustered_locations.extend(_infra_cluster.cluster) - return _clustered_locations + return StrategyOutput( + location_reinforcements=_clustered_locations, + reinforcement_order=self._order_strategy.reinforcement_order, + ) def _get_initial_state( self, order_strategy: OrderStrategy, strategy_input: StrategyInput ) -> Iterator[InfraCluster]: for _grouped_by, _grouping in groupby( - order_strategy.apply_strategy(strategy_input), + order_strategy.apply_strategy(strategy_input).location_reinforcements, key=lambda x: x.current_selected_measure, ): _grouping_data = list(_grouping) diff --git a/koswat/strategies/order_strategy/order_strategy.py b/koswat/strategies/order_strategy/order_strategy.py index 6b79b2d9..1b3b267d 100644 --- a/koswat/strategies/order_strategy/order_strategy.py +++ b/koswat/strategies/order_strategy/order_strategy.py @@ -22,6 +22,7 @@ from koswat.strategies.strategy_location_reinforcement import ( StrategyLocationReinforcement, ) +from koswat.strategies.strategy_output import StrategyOutput from koswat.strategies.strategy_protocol import StrategyProtocol from koswat.strategies.strategy_reinforcement_input import StrategyReinforcementInput from koswat.strategies.strategy_step.strategy_step_enum import StrategyStepEnum @@ -154,9 +155,7 @@ def get_strategy_reinforcements( _strategy_reinforcements.append(_slr) return _strategy_reinforcements - def apply_strategy( - self, strategy_input: StrategyInput - ) -> list[StrategyLocationReinforcement]: + def apply_strategy(self, strategy_input: StrategyInput) -> StrategyOutput: self.reinforcement_order = self.get_strategy_order_for_reinforcements( strategy_input.strategy_reinforcements ) @@ -169,4 +168,7 @@ def apply_strategy( OrderStrategyClustering.with_strategy( self.reinforcement_order, strategy_input.reinforcement_min_length ).apply(_strategy_reinforcements) - return _strategy_reinforcements + return StrategyOutput( + location_reinforcements=_strategy_reinforcements, + reinforcement_order=self.reinforcement_order, + ) diff --git a/koswat/strategies/strategy_input.py b/koswat/strategies/strategy_input.py index 1ccd7c70..c27ee86a 100644 --- a/koswat/strategies/strategy_input.py +++ b/koswat/strategies/strategy_input.py @@ -1,5 +1,5 @@ import math -from dataclasses import dataclass +from dataclasses import dataclass, field from koswat.strategies.strategy_location_input import StrategyLocationInput from koswat.strategies.strategy_reinforcement_input import StrategyReinforcementInput @@ -7,10 +7,16 @@ @dataclass class StrategyInput: - strategy_locations: list[StrategyLocationInput] - strategy_reinforcements: list[StrategyReinforcementInput] - reinforcement_min_buffer: float - reinforcement_min_length: float + """ + Represents the input data structure for a strategy. + """ + + strategy_locations: list[StrategyLocationInput] = field(default_factory=lambda: []) + strategy_reinforcements: list[StrategyReinforcementInput] = field( + default_factory=lambda: [] + ) + reinforcement_min_buffer: float = 0.0 + reinforcement_min_length: float = 0.0 @property def reinforcement_min_cluster(self) -> int: diff --git a/koswat/strategies/strategy_output.py b/koswat/strategies/strategy_output.py new file mode 100644 index 00000000..d20fe4f2 --- /dev/null +++ b/koswat/strategies/strategy_output.py @@ -0,0 +1,22 @@ +from dataclasses import dataclass, field + +from koswat.dike_reinforcements.reinforcement_profile.reinforcement_profile_protocol import ( + ReinforcementProfileProtocol, +) +from koswat.strategies.strategy_location_reinforcement import ( + StrategyLocationReinforcement, +) + + +@dataclass +class StrategyOutput: + """ + Represents the output data structure for a strategy. + """ + + location_reinforcements: list[StrategyLocationReinforcement] = field( + default_factory=lambda: [] + ) + reinforcement_order: list[type[ReinforcementProfileProtocol]] = field( + default_factory=lambda: [] + ) diff --git a/koswat/strategies/strategy_protocol.py b/koswat/strategies/strategy_protocol.py index ccc25079..a1d6ed77 100644 --- a/koswat/strategies/strategy_protocol.py +++ b/koswat/strategies/strategy_protocol.py @@ -1,9 +1,7 @@ from typing import Protocol, runtime_checkable from koswat.strategies.strategy_input import StrategyInput -from koswat.strategies.strategy_location_reinforcement import ( - StrategyLocationReinforcement, -) +from koswat.strategies.strategy_output import StrategyOutput @runtime_checkable @@ -11,7 +9,7 @@ class StrategyProtocol(Protocol): def apply_strategy( self, strategy_input: StrategyInput, - ) -> list[StrategyLocationReinforcement]: + ) -> StrategyOutput: """ Applies a specific strategy by matching each location (`PointSurroundings`) to a valid reinforcement type (`ReinforcementProfileProtocol`). @@ -20,6 +18,5 @@ def apply_strategy( strategy_input (`StrategyInput`): Input data structure containing locations and available reinforcements for each of them. Returns: - list[StrategyLocationReinforcement]: List of mapped locations to applied reinforcement. + StrategyOutput: Output data structure containing the selected reinforcements for each location. """ - pass diff --git a/tests/cost_report/io/summary/summary_costs/test_summary_costs_csv_exporter.py b/tests/cost_report/io/summary/summary_costs/test_summary_costs_csv_exporter.py index b3af537b..0ac68c41 100644 --- a/tests/cost_report/io/summary/summary_costs/test_summary_costs_csv_exporter.py +++ b/tests/cost_report/io/summary/summary_costs/test_summary_costs_csv_exporter.py @@ -30,8 +30,9 @@ def test_summary_cost_csv_exporter_export( # 3. Validate results assert _export_path.exists() - _read_text = _export_path.read_text() + _read_text = _export_path.read_text(encoding="utf-8") _expected_text = """Profile type;Kistdam;Kwelscherm;Grondmaatregel profiel;Stabiliteitswand +Strategy reinforcement order;-1;-1;-1;-1 Cost per km (Euro/km);0.0;8144.4;16288.8;24433.2 Cost per km incl surtax (Euro/km);0.0;12216.6;24433.2;36649.8 New grass volume (quantity):;0.0;0.0;0.0;0.0 diff --git a/tests/cost_report/io/summary/test_koswat_summary_exporter.py b/tests/cost_report/io/summary/test_koswat_summary_exporter.py index cfd05e31..6c6cf568 100644 --- a/tests/cost_report/io/summary/test_koswat_summary_exporter.py +++ b/tests/cost_report/io/summary/test_koswat_summary_exporter.py @@ -32,6 +32,11 @@ def test_koswat_summary_exporter_export_given_valid_data( # 3. Validate results assert _expected_costs_summary.exists() - assert len(_expected_costs_summary.read_text().splitlines()) == 46 + assert ( + len(_expected_costs_summary.read_text(encoding="utf-8").splitlines()) == 47 + ) assert _expected_locations_summary.exists() - assert len(_expected_locations_summary.read_text().splitlines()) == 5 + assert ( + len(_expected_locations_summary.read_text(encoding="utf-8").splitlines()) + == 5 + ) diff --git a/tests/strategies/infra_priority_stratregy/test_infra_priority_strategy.py b/tests/strategies/infra_priority_stratregy/test_infra_priority_strategy.py index ee7b69a9..a9c036b8 100644 --- a/tests/strategies/infra_priority_stratregy/test_infra_priority_strategy.py +++ b/tests/strategies/infra_priority_stratregy/test_infra_priority_strategy.py @@ -1,8 +1,6 @@ -from cgitb import small from typing import Iterator import pytest -from mergedeep import Strategy from koswat.dike_reinforcements.reinforcement_profile.outside_slope.cofferdam_reinforcement_profile import ( CofferdamReinforcementProfile, @@ -32,11 +30,11 @@ from koswat.strategies.strategy_location_reinforcement import ( StrategyLocationReinforcement, ) +from koswat.strategies.strategy_output import StrategyOutput from koswat.strategies.strategy_protocol import StrategyProtocol from koswat.strategies.strategy_reinforcement_type_costs import ( StrategyReinforcementTypeCosts, ) -from tests.dike.surroundings import point class TestInfraPriorityStrategy: @@ -55,27 +53,33 @@ def test_given_example_when_apply_strategy_then_gets_new_ones( assert isinstance(example_strategy_input, StrategyInput) # 2. Run test. - _strategy_result = InfraPriorityStrategy().apply_strategy( + _strategy_output = InfraPriorityStrategy().apply_strategy( example_strategy_input ) # 3. Verify final expectations. - assert isinstance(_strategy_result, list) - assert len(_strategy_result) == len(example_strategy_input.strategy_locations) - assert all( - isinstance(_sr, StrategyLocationReinforcement) for _sr in _strategy_result - ) + assert isinstance(_strategy_output, StrategyOutput) + + _result = _strategy_output.location_reinforcements + assert isinstance(_result, list) + assert len(_result) == len(example_strategy_input.strategy_locations) + assert all(isinstance(_sr, StrategyLocationReinforcement) for _sr in _result) # Basically the same checks as in `test__apply_min_distance_given_example`. assert all( _sr.current_selected_measure == PipingWallReinforcementProfile - for _sr in _strategy_result[0:2] + for _sr in _result[0:2] ) assert all( _sr.current_selected_measure == CofferdamReinforcementProfile - for _sr in _strategy_result[2:] + for _sr in _result[2:] ) + _order = _strategy_output.reinforcement_order + assert isinstance(_order, list) + assert len(_order) == 5 + assert all(isinstance(_r, type) for _r in _order) + def test_given_example_for_subclusters_when_apply_strategy_then_splits_them( self, example_subclustering: StrategyInput ): @@ -83,29 +87,35 @@ def test_given_example_for_subclusters_when_apply_strategy_then_splits_them( assert isinstance(example_subclustering, StrategyInput) # 2. Run test. - _strategy_result = InfraPriorityStrategy().apply_strategy(example_subclustering) + _strategy_output = InfraPriorityStrategy().apply_strategy(example_subclustering) # 3. Verify final expectations. - assert isinstance(_strategy_result, list) - assert len(_strategy_result) == len(example_subclustering.strategy_locations) - assert all( - isinstance(_sr, StrategyLocationReinforcement) for _sr in _strategy_result - ) + assert isinstance(_strategy_output, StrategyOutput) + + _result = _strategy_output.location_reinforcements + assert isinstance(_result, list) + assert len(_result) == len(example_subclustering.strategy_locations) + assert all(isinstance(_sr, StrategyLocationReinforcement) for _sr in _result) # Basically the same checks as in `test__apply_min_distance_given_example`. assert all( _sr.current_selected_measure == PipingWallReinforcementProfile - for _sr in _strategy_result[0:2] + for _sr in _result[0:2] ) assert all( _sr.current_selected_measure == StabilityWallReinforcementProfile - for _sr in _strategy_result[2:5] + for _sr in _result[2:5] ) assert all( _sr.current_selected_measure == CofferdamReinforcementProfile - for _sr in _strategy_result[5:] + for _sr in _result[5:] ) + _order = _strategy_output.reinforcement_order + assert isinstance(_order, list) + assert len(_order) == 5 + assert all(isinstance(_r, type) for _r in _order) + @pytest.fixture(name="small_infra_cluster") def _get_small_infra_cluster_fixture(self) -> Iterator[InfraCluster]: yield InfraCluster( diff --git a/tests/strategies/order_strategy/test_order_strategy.py b/tests/strategies/order_strategy/test_order_strategy.py index adb7ffe2..52b44391 100644 --- a/tests/strategies/order_strategy/test_order_strategy.py +++ b/tests/strategies/order_strategy/test_order_strategy.py @@ -18,6 +18,7 @@ from koswat.strategies.strategy_location_reinforcement import ( StrategyLocationReinforcement, ) +from koswat.strategies.strategy_output import StrategyOutput class TestOrderStrategy: @@ -197,25 +198,31 @@ def test_apply_strategy_given_example(self, example_strategy_input: StrategyInpu assert isinstance(example_strategy_input, StrategyInput) # 2. Run test. - _strategy_result = OrderStrategy().apply_strategy(example_strategy_input) + _strategy_output = OrderStrategy().apply_strategy(example_strategy_input) # 3. Verify final expectations. - assert isinstance(_strategy_result, list) - assert len(_strategy_result) == len(example_strategy_input.strategy_locations) - assert all( - isinstance(_sr, StrategyLocationReinforcement) for _sr in _strategy_result - ) + assert isinstance(_strategy_output, StrategyOutput) + + _result = _strategy_output.location_reinforcements + assert isinstance(_result, list) + assert len(_result) == len(example_strategy_input.strategy_locations) + assert all(isinstance(_sr, StrategyLocationReinforcement) for _sr in _result) # Basically the same checks as in `test__apply_min_distance_given_example`. assert all( _sr.current_selected_measure == SoilReinforcementProfile - for _sr in _strategy_result[0:2] + for _sr in _result[0:2] ) assert all( _sr.current_selected_measure == StabilityWallReinforcementProfile - for _sr in _strategy_result[2:7] + for _sr in _result[2:7] ) assert all( _sr.current_selected_measure == CofferdamReinforcementProfile - for _sr in _strategy_result[7:] + for _sr in _result[7:] ) + + _order = _strategy_output.reinforcement_order + assert isinstance(_order, list) + assert len(_order) == len(self._default_reinforcements) + assert all(isinstance(_r, type) for _r in _order) 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 6718aae5..9274a75a 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,4 +1,5 @@ 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 New grass volume (quantity):;0.9;3.9;0.9;0.02;0.02 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 2349b39f..38ae88ec 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,4 +1,5 @@ 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 New grass volume (quantity):;1.76;4.76;1.76;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk1_1c_dp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk1_1c_dp_with_default_layers/summary_costs.csv index b69d239e..0ebe6f2f 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,4 +1,5 @@ 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 New grass volume (quantity):;6.0;3.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 2d5ea263..d0327804 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,4 +1,5 @@ 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 New grass volume (quantity):;2.8;5.81;2.8;0.02;0.02 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 3e403a04..38967c4d 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,4 +1,5 @@ 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 New grass volume (quantity):;6.9;3.9;0.9;0.02;0.02 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 bcf5b24c..832e0c0a 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,4 +1,5 @@ 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 New grass volume (quantity):;7.76;4.76;1.76;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk1_1g_dhdsdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk1_1g_dhdsdp_with_default_layers/summary_costs.csv index a3a31cb1..19ca3333 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,4 +1,5 @@ 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 New grass volume (quantity):;8.81;5.81;2.8;0.02;0.02 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 99bc892f..8770af8e 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,4 +1,5 @@ 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 New grass volume (quantity):;1.8;4.8;1.8;0.04;0.04 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 85a5fc20..413c23a1 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,4 +1,5 @@ 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 New grass volume (quantity):;2.63;5.63;2.63;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk1_2c_dp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk1_2c_dp_with_default_layers/summary_costs.csv index 56f664c1..dce4e86c 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,4 +1,5 @@ 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 New grass volume (quantity):;15.0;3.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 1a3a938a..726df96d 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,4 +1,5 @@ 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 New grass volume (quantity):;4.88;7.88;4.88;0.04;0.04 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 a96d077a..afd655a3 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,4 +1,5 @@ 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 New grass volume (quantity):;16.8;4.8;1.8;0.04;0.04 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 fae51e49..4f96e1cd 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,4 +1,5 @@ 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 New grass volume (quantity):;17.63;5.63;2.63;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk1_2g_dhdsdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk1_2g_dhdsdp_with_default_layers/summary_costs.csv index b7f5a054..c6d3d85f 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,4 +1,5 @@ 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 New grass volume (quantity):;19.88;7.88;4.88;0.04;0.04 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 6ac813b2..36e35275 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,4 +1,5 @@ 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 New grass volume (quantity):;0.9;3.9;0.9;0.02;0.02 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 2349b39f..38ae88ec 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,4 +1,5 @@ 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 New grass volume (quantity):;1.76;4.76;1.76;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk2_1c_dp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk2_1c_dp_with_default_layers/summary_costs.csv index b69d239e..0ebe6f2f 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,4 +1,5 @@ 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 New grass volume (quantity):;6.0;3.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 62be45b3..ce00e714 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,4 +1,5 @@ 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 New grass volume (quantity):;2.8;5.81;2.8;0.02;0.02 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 b2feb6d7..c905cf71 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,4 +1,5 @@ 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 New grass volume (quantity):;6.9;3.9;0.9;0.02;0.02 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 bcf5b24c..832e0c0a 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,4 +1,5 @@ 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 New grass volume (quantity):;7.76;4.76;1.76;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk2_1g_dhdsdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk2_1g_dhdsdp_with_default_layers/summary_costs.csv index c4354e64..f0a1e37f 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,4 +1,5 @@ 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 New grass volume (quantity):;8.81;5.81;2.8;0.02;0.02 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 f75a2ae1..416477a8 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,4 +1,5 @@ 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 New grass volume (quantity):;1.8;4.8;1.8;0.04;0.03 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 85a5fc20..413c23a1 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,4 +1,5 @@ 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 New grass volume (quantity):;2.63;5.63;2.63;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk2_2c_dp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk2_2c_dp_with_default_layers/summary_costs.csv index 56f664c1..dce4e86c 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,4 +1,5 @@ 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 New grass volume (quantity):;15.0;3.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 59e40942..d9563b4a 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,4 +1,5 @@ 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 New grass volume (quantity):;4.88;7.88;4.88;0.04;0.03 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 41dd9e64..b7b4173d 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,4 +1,5 @@ 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 New grass volume (quantity):;16.8;4.8;1.8;0.04;0.03 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 fae51e49..4f96e1cd 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,4 +1,5 @@ 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 New grass volume (quantity):;17.63;5.63;2.63;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk2_2g_dhdsdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk2_2g_dhdsdp_with_default_layers/summary_costs.csv index b4339421..b9fc0f4f 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,4 +1,5 @@ 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 New grass volume (quantity):;19.88;7.88;4.88;0.04;0.03 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 ee598a65..e3560fce 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,4 +1,5 @@ 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 New grass volume (quantity):;0.9;3.9;0.9;0.02;0.02 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 67a607b5..bfa11459 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,4 +1,5 @@ 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 New grass volume (quantity):;2.36;5.35;2.36;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk3_1c_dp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk3_1c_dp_with_default_layers/summary_costs.csv index 68291fdd..b77ea979 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,4 +1,5 @@ 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 New grass volume (quantity):;6.0;3.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 27ad0e0f..b53048cf 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,4 +1,5 @@ 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 New grass volume (quantity):;3.41;6.41;3.41;0.02;0.02 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 de057f67..38130e25 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,4 +1,5 @@ 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 New grass volume (quantity):;6.9;3.9;0.9;0.02;0.02 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 f85f7d8b..a35e3353 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,4 +1,5 @@ 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 New grass volume (quantity):;8.36;5.35;2.36;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk3_1g_dhdsdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk3_1g_dhdsdp_with_default_layers/summary_costs.csv index 051b830e..0ca47884 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,4 +1,5 @@ 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 New grass volume (quantity):;9.4;6.41;3.41;0.02;0.02 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 e107e87b..c8793daf 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,4 +1,5 @@ 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 New grass volume (quantity):;1.8;4.8;1.8;0.03;0.03 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 75990299..f8882ff8 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,4 +1,5 @@ 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 New grass volume (quantity):;3.53;6.53;3.53;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk3_2c_dp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk3_2c_dp_with_default_layers/summary_costs.csv index 600b5164..635de7ab 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,4 +1,5 @@ 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 New grass volume (quantity):;15.0;3.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 3016c731..a86af129 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,4 +1,5 @@ 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 New grass volume (quantity):;5.78;8.78;5.78;0.03;0.03 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 682bde59..cbff6cfa 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,4 +1,5 @@ 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 New grass volume (quantity):;16.8;4.8;1.8;0.03;0.03 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 0337632d..5ce82767 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,4 +1,5 @@ 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 New grass volume (quantity):;18.53;6.53;3.53;0.0;0.0 diff --git a/tests/test_data/acceptance_reference_data/case_dijk3_2g_dhdsdp_with_default_layers/summary_costs.csv b/tests/test_data/acceptance_reference_data/case_dijk3_2g_dhdsdp_with_default_layers/summary_costs.csv index 6e865d25..fea96273 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,4 +1,5 @@ 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 New grass volume (quantity):;20.78;8.78;5.78;0.03;0.03