Skip to content
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

Jump to bottom

Add a function to aggregate a variable to a region from subregions #207

Merged
merged 24 commits into from
Apr 29, 2019
Merged

Add a function to aggregate a variable to a region from subregions #207

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b57d02f
clean-up of `aggregate()` function
danielhuppmann Mar 4, 2019
dee9395
auxiliary function `_variable_components()`
danielhuppmann Mar 4, 2019
972cdf5
move `_variable_components()` below aggregate function block
danielhuppmann Mar 4, 2019
e8209fc
make `_apply_filters()` take kwargs instead of `dict`
danielhuppmann Mar 5, 2019
769e34c
make `_apply_filter(col=None)` behave as if no filter applied
danielhuppmann Mar 5, 2019
7e9942b
refactor all aggregate-functions to `unit` as kwarg
danielhuppmann Mar 5, 2019
e08da79
replace `_aggregate_by_variables()` by more generic function
danielhuppmann Mar 5, 2019
9604d74
refactor internal pd.Series variables to be not called `df_*`
danielhuppmann Mar 5, 2019
65661dc
shorten name of auxiliary function `_aggregate`, allow `by` as list
danielhuppmann Mar 5, 2019
6418c51
add function `aggregate_region()`
danielhuppmann Mar 5, 2019
5a5f7e1
refactor `check_aggregate_region()` function to use `aggregate_region()`
danielhuppmann Mar 5, 2019
a7356f1
remove deprecated auxiliary function and index lists
danielhuppmann Mar 5, 2019
96302c1
check for subregions only where variable exists
danielhuppmann Mar 5, 2019
b64d3e7
use `df.timeseries()` as return of check_aggregate[_region]()`
danielhuppmann Mar 7, 2019
026bd8c
update order of index in tests (using `timeseries()` in `check*()`)
danielhuppmann Mar 7, 2019
c09a317
implement refactoring of function name and args in tests
danielhuppmann Mar 7, 2019
ad75447
update inline comments and logger messages
danielhuppmann Mar 7, 2019
ad6ec76
add to release notes
danielhuppmann Mar 7, 2019
52bd4b2
update `check_internal_consistency()`
danielhuppmann Mar 7, 2019
9e7f1db
Merge branch 'master' into aggregate_region
danielhuppmann Apr 24, 2019
c2a5c52
add docstring for `_variable_components()` as requested by @gidden
danielhuppmann Apr 28, 2019
585fe41
remove `unit` arg from `(check_)aggregate(_region)` functions as requ…
danielhuppmann Apr 28, 2019
787c9a5
appease stickler
danielhuppmann Apr 28, 2019
e38afc5
restrict `geopandas<0.5.0`to make region-plot tests pass
danielhuppmann Apr 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@

# Next Release

- [#207](https://github.com/IAMconsortium/pyam/pull/207) Add a `aggregate_region()` function to sum a variable from subregions and add components that are only defined at the region level
- [#202](https://github.com/IAMconsortium/pyam/pull/202) Extend the `df.rename()` function with a `check_duplicates (default True)` validation option
- [#199](https://github.com/IAMconsortium/pyam/pull/199) Initializing an `IamDataFrame` accepts kwargs to fill or create from the data any missing required columns
- [#197](https://github.com/IAMconsortium/pyam/pull/197) Added a `normalize` function that normalizes all data in a data frame to a specific time period.
- [#199](https://github.com/IAMconsortium/pyam/pull/199) Initializing an `IamDataFrame` accepts kwargs to fill or create from the data for any missing required columns
- [#197](https://github.com/IAMconsortium/pyam/pull/197) Add a `normalize` function that normalizes all data in a data frame to a specific time period.
- [#195](https://github.com/IAMconsortium/pyam/pull/195) Fix filtering for `time`, `day` and `hour` to use generic `pattern_match()` (if such a column exists) in 'year'-formmatted IamDataFrames
- [#192](https://github.com/IAMconsortium/pyam/pull/192) Extend `utils.find_depth()` to optionally return depth (as list of ints) rather than assert level tests
- [#190](https://github.com/IAMconsortium/pyam/pull/190) Add `concat()` function
Expand Down