diff --git a/config/config.yaml b/config/config.yaml index 72173941..69428c46 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -98,7 +98,7 @@ direct_damages: 'road_unpaved', 'rail_railway', ] - rehab_cost_multiplier: 0.5 + rehab_cost_multiplier: 2 ############################### diff --git a/src/open_gira/io.py b/src/open_gira/io.py index 137d4d61..42d6af47 100644 --- a/src/open_gira/io.py +++ b/src/open_gira/io.py @@ -289,7 +289,7 @@ def read_rehab_costs(path: str) -> pd.DataFrame: assert costs.asset_type.dtype == object # check costs - assert costs.iloc[:, 1].dtype == float + assert pd.api.types.is_numeric_dtype(costs.iloc[:, 1].dtype) assert (costs.iloc[:, 1] >= 0).all() - return costs \ No newline at end of file + return costs diff --git a/tests/config/config.yaml b/tests/config/config.yaml index 1256fa9b..3f2d4a3d 100644 --- a/tests/config/config.yaml +++ b/tests/config/config.yaml @@ -53,6 +53,7 @@ direct_damages: 'road_unpaved', 'rail_railway', ] + rehab_cost_multiplier: 1 ############################### diff --git a/tests/integration/event_set_direct_damages/data/results/geoparquet/djibouti-latest_filter-road/processed/slice-0_edges.geoparquet b/tests/integration/event_set_direct_damages/data/results/geoparquet/djibouti-latest_filter-road/processed/slice-0_edges.geoparquet index be069fd3..0116b319 100644 Binary files a/tests/integration/event_set_direct_damages/data/results/geoparquet/djibouti-latest_filter-road/processed/slice-0_edges.geoparquet and b/tests/integration/event_set_direct_damages/data/results/geoparquet/djibouti-latest_filter-road/processed/slice-0_edges.geoparquet differ diff --git a/tests/integration/event_set_direct_damages/data/results/splits/djibouti-latest_filter-road/hazard-jba-event/slice-0.geoparquet b/tests/integration/event_set_direct_damages/data/results/splits/djibouti-latest_filter-road/hazard-jba-event/slice-0.geoparquet index 4d20ec40..5663e976 100644 Binary files a/tests/integration/event_set_direct_damages/data/results/splits/djibouti-latest_filter-road/hazard-jba-event/slice-0.geoparquet and b/tests/integration/event_set_direct_damages/data/results/splits/djibouti-latest_filter-road/hazard-jba-event/slice-0.geoparquet differ diff --git a/tests/integration/event_set_direct_damages/expected/results/direct_damages/djibouti-latest_filter-road/hazard-jba-event/cost/slice-0.gpq b/tests/integration/event_set_direct_damages/expected/results/direct_damages/djibouti-latest_filter-road/hazard-jba-event/cost/slice-0.gpq index cc969c13..bb825761 100644 Binary files a/tests/integration/event_set_direct_damages/expected/results/direct_damages/djibouti-latest_filter-road/hazard-jba-event/cost/slice-0.gpq and b/tests/integration/event_set_direct_damages/expected/results/direct_damages/djibouti-latest_filter-road/hazard-jba-event/cost/slice-0.gpq differ diff --git a/tests/integration/event_set_direct_damages/expected/results/direct_damages/djibouti-latest_filter-road/hazard-jba-event/fraction/slice-0.gpq b/tests/integration/event_set_direct_damages/expected/results/direct_damages/djibouti-latest_filter-road/hazard-jba-event/fraction/slice-0.gpq index bf3c514f..1d4cdcc4 100644 Binary files a/tests/integration/event_set_direct_damages/expected/results/direct_damages/djibouti-latest_filter-road/hazard-jba-event/fraction/slice-0.gpq and b/tests/integration/event_set_direct_damages/expected/results/direct_damages/djibouti-latest_filter-road/hazard-jba-event/fraction/slice-0.gpq differ