Utils compare #43
Utils compare #43
Conversation
Codecov Report
@@ Coverage Diff @@
## master #43 +/- ##
==========================================
+ Coverage 99.04% 99.15% +0.11%
==========================================
Files 14 14
Lines 522 594 +72
Branches 93 111 +18
==========================================
+ Hits 517 589 +72
Misses 2 2
Partials 3 3 Continue to review full report at Codecov.
|
|
To explain this pull request - this is a selection of useful functions that were either used to investigate the data or will be used in future pull requests. They don't have an obvious application within the existing codebase but notebooks demonstrating their use will come in the next few PRs. |
CHANGELOG.rst
Outdated
| @@ -3,6 +3,7 @@ Changelog | |||
|
|
|||
| master | |||
| ------ | |||
| - (`#44 <https://github.com/znicholls/silicone/pull/44>`_) Implemented new util functions for downloading data, unit conversion and data checking. | |||
There was a problem hiding this comment.
Should this not be #43 ?
src/silicone/utils.py
Outdated
| df: :obj:`pyam.IamDataFrame` | ||
| The input dataframe. | ||
|
|
||
| to_split : str |
There was a problem hiding this comment.
if the other argument is called 'components', perhaps this could be called 'aggregate' (as in 'basket').
Now the naming is a bit inconsistent/not intuitive.
| def _adjust_time_style_to_match(self, in_df, target_df): | ||
| if in_df.time_col != target_df.time_col: | ||
| in_df = in_df.timeseries() | ||
| if target_df.time_col == "time": | ||
| target_df_year_map = {v.year: v for v in target_df.timeseries().columns} | ||
| in_df.columns = in_df.columns.map( | ||
| lambda x: target_df_year_map[x] | ||
| if x in target_df_year_map | ||
| else dt.datetime(x, 1, 1) | ||
| ) | ||
| else: | ||
| in_df.columns = in_df.columns.map(lambda x: x.year) | ||
| return IamDataFrame(in_df) | ||
|
|
||
| return in_df | ||
| return _adjust_time_style_to_match(in_df, target_df) |
There was a problem hiding this comment.
this implementation is a bit confusing to me.
There was a problem hiding this comment.
Basically I wanted to use this function outside of test/crunchers, so I made it general and then put a version here so I don't have to import it everywhere
Pull request
Please confirm that this pull request has done the following:
CHANGELOG.rstadded