Skip to content

Minor updates to rWHALE result aggregation functionality #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fmckenna merged 2 commits into from
Aug 13, 2025
Merged

Minor updates to rWHALE result aggregation functionality #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dc806a
Extend rWHALE to only look for requested results.
zsarnoczay Aug 12, 2025
a624b6d
Bugfix in rWHALE's aggregate loss output
zsarnoczay Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion modules/Workflow/rWHALE.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,14 +266,28 @@ def main( # noqa: C901, D103
comm.Barrier()

# aggregate results
if inputs.get('outputs', False):
requested_outputs = []
for output_type in ['AIM', 'EDP', 'DM', 'DV']:
if inputs['outputs'].get(output_type, False):
if inputs['outputs'][output_type]:
requested_outputs.append(output_type)
else:
requested_outputs = ['AIM', 'EDP', 'DM', 'DV']
requested_outputs.append('every_realization')

if (
asset_type == 'Buildings' # noqa: PLR1714
or asset_type == 'TransportationNetwork'
or asset_type == 'WaterDistributionNetwork'
or asset_type == 'PowerNetwork'
):
if procID == 0:
WF.aggregate_results(asst_data=asst_data, asset_type=asset_type)
WF.aggregate_results(
asst_data=asst_data,
asset_type=asset_type,
out_types = requested_outputs
)

elif asset_type == 'WaterNetworkPipelines':
# Provide the headers and out types
Expand Down
98 changes: 53 additions & 45 deletions modules/Workflow/whale/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2944,8 +2944,7 @@ def aggregate_results( # noqa: C901, PLR0912, PLR0915
self,
asst_data,
asset_type='',
# out_types = ['IM', 'BIM', 'EDP', 'DM', 'DV', 'every_realization'],
out_types=['AIM', 'EDP', 'DMG', 'DV', 'every_realization'], # noqa: B006
out_types=['AIM', 'EDP', 'DM', 'DV', 'every_realization'], # noqa: B006
headers=None,
):
"""Short description
Expand Down Expand Up @@ -3127,7 +3126,7 @@ def aggregate_results( # noqa: C901, PLR0912, PLR0915
# deter_pointer[asset_id].update({
# "R2Dres":r2d_res_i
# })
if 'DMG' in out_types:
if 'DM' in out_types:
dmg_out_file_i = 'DMG_grp.json'

if dmg_out_file_i not in os.listdir(asset_dir):
Expand Down Expand Up @@ -3189,16 +3188,25 @@ def aggregate_results( # noqa: C901, PLR0912, PLR0915

if 'DV' in out_types:
dv_out_file_i = 'DV_repair_grp.json'
dl_summary_file = 'DL_summary_stats.json'

if dv_out_file_i not in os.listdir(asset_dir):
show_warning(
f"Couldn't find DV file for {assetTypeHierarchy[-1]} {asset_id}"
)

elif dl_summary_file not in os.listdir(asset_dir):
show_warning(
f"Couldn't find DL summary file for {assetTypeHierarchy[-1]} {asset_id}"
)

else:
with open(asset_dir / dv_out_file_i, encoding='utf-8') as f: # noqa: PTH123
dv_data_i = json.load(f)

with open(asset_dir / dl_summary_file, encoding='utf-8') as f: # noqa: PTH123
dl_summary = json.load(f)

# extract DV unit info
dv_units = dv_data_i['Units']
del dv_data_i['Units']
Expand Down Expand Up @@ -3244,48 +3252,48 @@ def aggregate_results( # noqa: C901, PLR0912, PLR0915

if 'DV' in R2D_res_out_types:
r2d_res_dv = dict() # noqa: C408
cost_columns = [
col
for col in dv_data_i.columns
if col.startswith('Cost')
]
if len(cost_columns) != 0:
cost_data = dv_data_i[cost_columns].mean()
cost_data_std = dv_data_i[cost_columns].std()
cost_key = cost_data.idxmax()
meanKey = ( # noqa: N806
f'R2Dres_mean_RepairCost_{dv_units[cost_key]}'
)
stdKey = ( # noqa: N806
f'R2Dres_std_RepairCost_{dv_units[cost_key]}'
)
r2d_res_dv.update(
{
meanKey: cost_data[cost_key],
stdKey: cost_data_std[cost_key],
}
)
time_columns = [
col
for col in dv_data_i.columns
if col.startswith('Time')
]
if len(time_columns) != 0:
time_data = dv_data_i[time_columns].mean()
time_data_std = dv_data_i[time_columns].std()
time_key = time_data.idxmax()
meanKey = ( # noqa: N806
f'R2Dres_mean_RepairTime_{dv_units[time_key]}'
)
stdKey = ( # noqa: N806
f'R2Dres_std_RepairTime_{dv_units[time_key]}'
)
r2d_res_dv.update(
{
meanKey: time_data[time_key],
stdKey: time_data_std[time_key],
}
)

if 'repair_cost' in dl_summary:
repair_cost_data = dl_summary['repair_cost']

elif 'repair_cost-' in dl_summary:
repair_cost_data = dl_summary['repair_cost-']

else:
repair_cost_data = None

if repair_cost_data:

cost_unit = [unit for dv_output, unit in dv_units.items() if dv_output.startswith('Cost')][0]

r2d_res_dv.update({
f'R2Dres_mean_RepairCost_{cost_unit}': repair_cost_data['mean'],
f'R2Dres_std_RepairCost_{cost_unit}': repair_cost_data['std']
})

if cost_unit == 'loss_ratio' and np.abs(replacement_cost-1.0)>1e-5:
r2d_res_dv.update({
f'R2Dres_mean_RepairCost': repair_cost_data['mean'] * replacement_cost,
f'R2Dres_std_RepairCost': repair_cost_data['std'] * replacement_cost
})

if 'repair_time' in dl_summary:
repair_time_data = dl_summary['repair_time']

elif 'repair_time-sequential' in dl_summary:
repair_time_data = dl_summary['repair_time-sequential']

else:
repair_time_data = None

if repair_time_data:

time_unit = [unit for dv_output, unit in dv_units.items() if dv_output.startswith('Time')][0]

r2d_res_dv.update({
f'R2Dres_mean_RepairTime_{time_unit}': repair_time_data['mean'],
f'R2Dres_std_RepairTime_{time_unit}': repair_time_data['std']
})

r2d_res_i = deter_pointer[asset_id].get('R2Dres', {})
r2d_res_i.update(r2d_res_dv)
Expand Down
Loading