Skip to content

Fix/c0 storage time series review#723

Merged
MaGering merged 4 commits intofix/C0_storage_time_seriesfrom
fix/C0_storage_time_series_review
Dec 17, 2020
Merged

Fix/c0 storage time series review#723
MaGering merged 4 commits intofix/C0_storage_time_seriesfrom
fix/C0_storage_time_series_review

Conversation

@smartie2076
Copy link
Copy Markdown
Collaborator

Here are my adaptations. I did neither do a linting test with black nor executed all pytests - so please do that before you request a new review for your PR #720.

In your PR, please also add the correct number for the benchmark tests changelog entry.

- Exception needs to be tested
- Changed `energyStorage.csv`
- Added `storage_1.csv`
- Added column in `parameter_timeseries`
@smartie2076 smartie2076 requested a review from MaGering December 16, 2020 12:41
Comment on lines +37 to +38
- Changed `C0.energyStorage()` for timeseries in storage parameters (hotfix) (#720)
- Input files and benchmark test `test_benchmark_special_features.Test_Parameter_Parsing()`: Now also including timeseries in a storage component ()
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Hi @MaGering !

"In your PR, please also add the correct number for the benchmark tests changelog entry."

Refers to the lines above. I added changelog entries for what you changed, where I also put your PR as origin (#720). Line 38 is what I changed in this PR (#723). As I can not know what the PR number is when I am working on my lokal branch, I couldnt assign the number to the changelog entry. Please add the number in the brackets ;)

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

You can change this either locally, or by opening the file view of the changelog in github, making a manual change, and submitting it.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

So I will do the changes in my PR, correct?

Copy link
Copy Markdown
Collaborator

@MaGering MaGering left a comment

Choose a reason for hiding this comment

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

Looks good to me! The benchmark test ran without error as I checked it locally. Only test_benchmark_special_features.py needs to be reformatted with black and conflicts with CHANGELOG.md resolved.

@smartie2076
Copy link
Copy Markdown
Collaborator Author

Looks good to me! The benchmark test ran without error as I checked it locally. Only test_benchmark_special_features.py needs to be reformatted with black and conflicts with CHANGELOG.md resolved.

Nice! As you are merging into a PR and not into dev can solve the merge conflicts now, merge, and then run black on fix/C0_storage_time_series.

@MaGering MaGering merged commit 5a41da7 into fix/C0_storage_time_series Dec 17, 2020
@MaGering MaGering deleted the fix/C0_storage_time_series_review branch December 17, 2020 15:58
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