IAMconsortium / pyam

88%

master: 100%

LAST BUILD ON BRANCH feature/region_aggregation

branch: feature/region_aggregation

CHANGE BRANCH

x

Reset

• feature/region_aggregation
• conn-auth
• dependabot/submodules/units-1149a0a
• dependabot/submodules/units-1ef176e
• dependabot/submodules/units-888b1af
• dependabot/submodules/units-9471509
• dependabot/submodules/units-a255acf
• dependabot/submodules/units-ae2b169
• df-ops
• docs-requirements-makefile
• docs-test-rtd
• docs/clean-up_v0.5
• docs/clean-up_v0.5_iteration2
• docs/cleanup
• docs/connection
• docs/datamodel
• docs/deps
• docs/formatting_alert
• docs/iamc-logo
• docs/minor-fixes
• docs/openpyxl
• feature/aggregate_time
• feature/engage-aggregation
• feature/engage-aggregation-2
• feature/fix-parent-match
• feature/iiasa-apps-aliases
• feature/iiasa-apps-aliases-license
• feature/pandas-compat
• feature/query-region-synonyms
• feature/read-iiasa-creds
• feature/unit_pint
• feature/update-ixmp-api-calls
• fix-readme-header
• master
• quickfix/adjust-logger-level
• require_variable-behaviour
• rtd
• rtd-pip
• rtd-xarray
• tutorial/io
• v0.2.0
• v0.3.0
• v0.4.0
• v0.4.1
• v0.5.0
• v0.6.0
• znicholls-hotfix
• znicholls-patch-1

Build # 991

Build Type

push

travis-ci

Committed by zikolach

Commit Message

Region aggregation

- adding min/max/avg aggregator function
- add: w.avg aggregator (aggregate_region/_aggregate)
- use `method` in `aggregate()`, remove it from `aggregate_region()`
- cleanup of docstrings
- rename aggregateregions_by_weigth to weighted_average_region
- add a couple of tests (for now in test_agrregation_region_aggrfuncs.py, to be moved into test_feature_aggregate)
- reduced TEST2_DF size (a bit)
- added 2 stage (sum) aggregation test. All := sum( sum(north), sum(other) ) and eqauls sum(all regions)
- removed single regions aggregation test with method='sum' (fails because sum(None) yields 0)
- use np.mean (instead of. np.average) for 'avg' method
- do components aggregation ONLY in case of method in ['sum', np.sum]
- add line to RELEASE_NOTES.md

Run Details

1734 of 1968 relevant lines covered (88.11%)

0.88 hits per line