-
Notifications
You must be signed in to change notification settings - Fork 4
Harmonize reduce etas generalize df fit #476
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.
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
Open
C1587S
wants to merge
24
commits into
main
Choose a base branch
from
harmonize-reduce-etas-generalize-df-fit
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
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
… into reduce_etas
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #476 +/- ##
==========================================
+ Coverage 68.94% 69.07% +0.12%
==========================================
Files 15 15
Lines 1755 1814 +59
==========================================
+ Hits 1210 1253 +43
- Misses 545 561 +16 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
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.
This PR adds geography-level aggregation support to
MainRecipe, enabling damage calculations at different regional levels while maintaining backward compatibilityChanges
New parameters in
MainRecipe.__init__:geography: One of "ir" (impact region), "country", or "globe" (default)country_mapping_path: Path to CSV mapping regions to countries (required for country aggregation)individual_region: Optional filter for single-region calculationsNew methods:
_aggregate_by_geography(): Internal helper for geography aggregation_aggregate_to_country(): Helper for country-level aggregationdamages_dataset(): Returns damages asxr.Datasetwith geography support_filter_illegal_combinations_xr(): Xarray version of illegal combination filtering_damage_function_points_pandas(): Original pandas-based implementation_damage_function_points_xarray(): New xarray-based implementationDual-path execution:
geography="globe"(default): uses original pandas pathgeographyis "ir" or "country": uses new xarray pathpd.DataFrameat the API boundaryBackward compatibility
geography="globe"preserves existing behaviorglobal_damages_calculation()returnspd.DataFrame(unchanged)damage_function_pointsreturnspd.DataFrame(unchanged)Related PRs
Current status