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.

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

Rip out lots of time-adjustment functionality #507

Merged
merged 40 commits into from
Oct 31, 2023

Conversation

brynpickering
Copy link
Member

@brynpickering brynpickering commented Oct 26, 2023

Partly fixes issue #356

Summary of changes in this pull request:

  • No more time masking
  • resampling and clustering config options moved to flat key:val pairs
  • clustering only possible with representative days (no taking the mean of all days to produce an average)

Reviewer checklist:

  • Test(s) added to cover contribution
  • Documentation updated
  • Changelog updated
  • Coverage maintained or improved

Copy link
Member

@sjpfenninger sjpfenninger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With regards to timeseries_data_pathtime_data_path I am a bit unsure if it doesn't remove too much of the meaning, but I suppose that is likely to go away anyway with #92 to be folded into the general data_sources config

doc/user/advanced_features.rst Outdated Show resolved Hide resolved
@@ -78,8 +78,8 @@ We will discuss each of these in turn, starting with ``config``:
config:
init:
name: 'My energy model'
timeseries_data_path: 'timeseries_data'
subset_time: ['2005-01-01', '2005-01-05']
time_data_path: 'timeseries_data'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we'll want to remove this entirely in favour of the generic load-from-file feature

doc/user/building.rst Outdated Show resolved Hide resolved
doc/user/ref_05_to_06.rst Outdated Show resolved Hide resolved
src/calliope/preprocess/time.py Outdated Show resolved Hide resolved
Base automatically changed from clean-parsers to main October 30, 2023 13:03
@codecov
Copy link

codecov bot commented Oct 30, 2023

Codecov Report

Merging #507 (90941b4) into main (ea55acc) will increase coverage by 0.49%.
The diff coverage is 93.82%.

@@            Coverage Diff             @@
##             main     #507      +/-   ##
==========================================
+ Coverage   92.72%   93.21%   +0.49%     
==========================================
  Files          32       28       -4     
  Lines        4204     3817     -387     
  Branches      965      877      -88     
==========================================
- Hits         3898     3558     -340     
+ Misses        194      168      -26     
+ Partials      112       91      -21     
Files Coverage Δ
src/calliope/core/attrdict.py 96.44% <100.00%> (-3.06%) ⬇️
src/calliope/core/model.py 93.71% <100.00%> (ø)
src/calliope/examples.py 100.00% <ø> (ø)
src/calliope/preprocess/model_data.py 99.15% <100.00%> (+0.01%) ⬆️
src/calliope/core/util/tools.py 92.68% <87.50%> (+0.79%) ⬆️
src/calliope/preprocess/model_run.py 91.82% <85.71%> (-0.35%) ⬇️
src/calliope/preprocess/time.py 76.74% <94.73%> (+3.88%) ⬆️

... and 2 files with indirect coverage changes

@brynpickering brynpickering merged commit 3779e0d into main Oct 31, 2023
9 checks passed
@brynpickering brynpickering deleted the purge-masking-clustering branch October 31, 2023 08:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants