Skip to content

Commit 3fcd150

Browse files
committed
change capital shocks analysis to output missing guid sectors too
1 parent bf3bec6 commit 3fcd150

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1818
- Descriptions of the analyses, inputs and parameters. [#646](https://github.com/IN-CORE/pyincore/issues/646)
1919
- Descriptions of the analyses to be more verbose. [#647](https://github.com/IN-CORE/pyincore/issues/647)
2020
- Hazard service earthquake post method to allow user to specify soil type dataset [#654](https://github.com/IN-CORE/pyincore/issues/654)
21+
- Capital Shocks analysis to also output Sectors in building to sector mappings with no guids as unit shocks. [#671](https://github.com/IN-CORE/pyincore/issues/671)
2122

2223
### Fixed
2324
- Building retrofit fails with local building dataset. [#617](https://github.com/IN-CORE/pyincore/issues/617)

pyincore/analyses/capitalshocks/capitalshocks.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,15 @@ def run(self):
109109
sector_values = inventory_failure.loc[
110110
(inventory_failure["sector"] == sector)
111111
]
112-
sector_cap = sector_values["cap_rem"].sum()
113-
sector_total = sector_values["appr_bldg"].sum()
114-
if sector_total == 0:
115-
continue
116-
sector_shock = np.divide(sector_cap, sector_total)
117-
sector_shocks[sector] = sector_shock
118-
112+
if sector_values.empty:
113+
sector_shocks[sector] = 1.0
114+
else:
115+
sector_cap = sector_values["cap_rem"].sum()
116+
sector_total = sector_values["appr_bldg"].sum()
117+
if sector_total == 0:
118+
continue
119+
sector_shock = np.divide(sector_cap, sector_total)
120+
sector_shocks[sector] = sector_shock
119121
sector_shocks = pd.DataFrame(sector_shocks.items(), columns=["sector", "shock"])
120122
result_name = self.get_parameter("result_name")
121123
self.set_result_csv_data(

0 commit comments

Comments
 (0)