Add a duplicates_strategy argument to read_df… #10130
Merged
Conversation
This file contains 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
…es we can keep the first occurrence, the last one or calculate the average values
micheles
reviewed
Nov 13, 2024
| - 'error': raise an error (default) | ||
| - 'keep_first': keep the first occurrence | ||
| - 'keep_last': keep the last occurrence | ||
| - 'avg': calculate the average numeric values | ||
| """ |
There was a problem hiding this comment.
I would add a line
assert duplicates_strategy in ('error', 'keep_first', 'keep_last', 'avg'), duplicates_strategyjust to be protected against mispellings.
micheles
reviewed
Nov 13, 2024
| def concat_if_different(values): | ||
| unique_values = values.dropna().unique().astype(str) | ||
| # If all values are identical, return the single unique value, | ||
| # otherwise join with "|" |
There was a problem hiding this comment.
return '|'.join(unique_values) is shorter and does exactly the same thing.
micheles
reviewed
Nov 13, 2024
openquake/calculators/base.py
Outdated
| @@ -982,7 +982,8 @@ def _read_risk3(self): | |||
| # NB: get_station_data is extending the complete sitecol | |||
| # which then is associated to the site parameters below | |||
| self.station_data, self.observed_imts = \ | |||
| readinput.get_station_data(oq, self.sitecol) | |||
| readinput.get_station_data(oq, self.sitecol, | |||
| duplicates_strategy='error') | |||
There was a problem hiding this comment.
I would set duplicates_strategy='avg' so that the aristotle tests will get green.
|
LGTM, but please also update the changelog. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
…so in case of duplicates we can: