Fix oq export "aggrisk-stats" to work also for scenario_damage calculations - #11675
Merged
Conversation
…th proper attributes when aggregation tags are missing
… corresponding expected file)
micheles
reviewed
Jul 31, 2026
| acc = general.AccumDict(accum=[]) | ||
| for agg_id, loss_id, loss in zip( | ||
| adf.agg_id, adf.loss_id, adf.loss): | ||
| for row in adf.itertuples(index=False): |
Contributor
There was a problem hiding this comment.
Notice the zip is excepted to be faster than itertuples. That could be a non-issue, but it would be interesting to measure the performance of the extractor in large calculations. I don't expect serious differences, though.
Member
Author
There was a problem hiding this comment.
The point of using itertuples here instead of zip is that the zip approach assumes there are exactly three specific columns (agg_id, loss_id, loss), but for scenario_damage we have a variable number of columns (e.g. dmg0...dmg4), depending on the number of damage states.
micheles
approved these changes
Jul 31, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #11666