Add network function #781

jessLryan · 2023-11-09T19:53:37Z

Closes #506

Changes proposed in this Pull Request

Checklist

[yes] Code changes are sufficiently documented; i.e. new functions contain docstrings and further explanations may be given in doc.
[yes] Unit tests for new features were added (if applicable).
[N/A] Newly introduced dependencies are added to environment.yaml, environment_docs.yaml and setup.py (if applicable).
[yes] A note for the release notes doc/release_notes.rst of the upcoming release is included.
[yes] I consent to the release of this PR's code under the MIT license.

function to add the components of one network to another

for more information, see https://pre-commit.ci

Bug fixes and added unit test for adding a network with only bus components to another network. More tests needed.

added description of new method to release file

for more information, see https://pre-commit.ci

updated test functionality to take base network as input

for more information, see https://pre-commit.ci

codecov · 2023-11-11T09:06:52Z

Codecov Report

Attention: Patch coverage is 71.42857% with 10 lines in your changes are missing coverage. Please review.

Project coverage is 78.78%. Comparing base (4298c23) to head (a1513f9).

❗ Current head a1513f9 differs from pull request most recent head 8fdf880. Consider uploading reports for the commit 8fdf880 to get more accurate results

Files	Patch %	Lines
pypsa/components.py	71.42%	5 Missing and 5 partials ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           master     #781       +/-   ##
===========================================
+ Coverage   66.26%   78.78%   +12.51%     
===========================================
  Files          26       26               
  Lines        7066     7116       +50     
  Branches     1418     1567      +149     
===========================================
+ Hits         4682     5606      +924     
+ Misses       2102     1185      -917     
- Partials      282      325       +43

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Updated method to include additional inputs suggested by Fabian and error thrown if snapshots/snapshot weightings in the networks do not agree. Also added warning if components with IDs matching component in existing network are added - this warning does not apply to components of type LineType or TransformerType but duplicate components will still not be added in this case. Updated static test to reflect these changes and added new tests for the case where the method returns a new network (inplace=false), and the case where time-varying data is added (with_time=True_

for more information, see https://pre-commit.ci

error from running locally

FabianHofmann

before reviewing, I was thinking about a better naming. Perhaps import_from_network would be better aligning with the other import function names?

jessLryan · 2023-11-30T08:16:45Z

before reviewing, I was thinking about a better naming. Perhaps import_from_network would be better aligning with the other import function names?

how about "add_components_from_network"? Could also change the current add function in components.py to "add_component" so that the distinction is clear?

FabianHofmann · 2023-11-30T08:49:19Z

before reviewing, I was thinking about a better naming. Perhaps import_from_network would be better aligning with the other import function names?

how about "add_components_from_network"?

sounds good

Could also change the current add function in components.py to "add_component" so that the distinction is clear?

which function do you mean exactly? I would not touch existing ones though...

jessLryan · 2023-11-30T08:51:57Z

before reviewing, I was thinking about a better naming. Perhaps import_from_network would be better aligning with the other import function names?

how about "add_components_from_network"?

sounds good

okay great I'll do that :-)

Could also change the current add function in components.py to "add_component" so that the distinction is clear?

which function do you mean exactly? I would not touch existing ones though...

fair point

renamed add_network function to add_components_from_network also moved function to follow existing add function (for adding single components) updated tests to match function rename

for more information, see https://pre-commit.ci

jessLryan · 2023-11-30T09:35:59Z

@FabianHofmann what's the reason for the failing tests? I can't work it out from the output

FabianHofmann · 2023-11-30T10:11:26Z

I have no clue, I retriggered them

jessLryan · 2023-11-30T17:36:50Z

@FabianHofmann can this now be merged?

FabianHofmann · 2023-12-01T08:37:11Z

Hey @jessLryan, I will review as soon as I have time. This will likely take some time.

jessLryan · 2023-12-02T17:32:18Z

@FabianHofmann I've come across a bug: we need to change the method so that buses are added first (otherwise new components e.g. lines, which are attached to the new buses will fail to be added due to a check at Line 914 of io.py). I'll update and commit

need to add buses before other components due to existing check in import_components_from_dataframe method when adding components with "bus" in component dataframe columns (components must not be associated with a bus which is not already present in the network)

for more information, see https://pre-commit.ci

jessLryan · 2024-03-31T11:58:10Z

@FabianHofmann I've come across a bug: we need to change the method so that buses are added first (otherwise new components e.g. lines, which are attached to the new buses will fail to be added due to a check at Line 914 of io.py). I'll update and commit

now fixed

jessLryan and others added 7 commits November 3, 2023 21:13

addNetwork function in components.py

58288b4

function to add the components of one network to another

[pre-commit.ci] auto fixes from pre-commit.com hooks

2487a72

for more information, see https://pre-commit.ci

Merge branch 'master' into addNetworksFunction

5754c5b

small fixes and new unit test

1b288ab

Bug fixes and added unit test for adding a network with only bus components to another network. More tests needed.

merge resolutions

25459e8

updated release.rst

9b5c0a6

added description of new method to release file

Update components.py

b96d7ac

jessLryan force-pushed the addNetworksFunction branch from b1f38c3 to b96d7ac Compare November 10, 2023 21:44

pre-commit-ci bot and others added 3 commits November 10, 2023 21:44

[pre-commit.ci] auto fixes from pre-commit.com hooks

c9cdfb7

for more information, see https://pre-commit.ci

Update test_components.py

55075af

Update test_components.py

2d7c749

updated test functionality to take base network as input

jessLryan force-pushed the addNetworksFunction branch from 0d4d69f to 2d7c749 Compare November 10, 2023 21:59

pre-commit-ci bot and others added 3 commits November 10, 2023 21:59

[pre-commit.ci] auto fixes from pre-commit.com hooks

25c2fe8

for more information, see https://pre-commit.ci

bug fixes

aac2c14

[pre-commit.ci] auto fixes from pre-commit.com hooks

c7f83fa

for more information, see https://pre-commit.ci

Merge branch 'master' into addNetworksFunction

18360da

fneum added a commit that referenced this pull request Nov 12, 2023

suggestions for network merge function PR #781

eafb7e7

fneum mentioned this pull request Nov 12, 2023

suggestions: add network function #783

Merged

jessLryan and others added 4 commits November 29, 2023 18:30

Merge branch 'master' into addNetworksFunction

544a1e7

[pre-commit.ci] auto fixes from pre-commit.com hooks

8815e24

for more information, see https://pre-commit.ci

bug fix

142f024

error from running locally

FabianHofmann reviewed Nov 30, 2023

View reviewed changes

jessLryan and others added 2 commits November 30, 2023 08:56

renamed function

1f595a5

renamed add_network function to add_components_from_network also moved function to follow existing add function (for adding single components) updated tests to match function rename

[pre-commit.ci] auto fixes from pre-commit.com hooks

a500f77

for more information, see https://pre-commit.ci

jessLryan and others added 4 commits December 3, 2023 19:14

add buses first

35af274

need to add buses before other components due to existing check in import_components_from_dataframe method when adding components with "bus" in component dataframe columns (components must not be associated with a bus which is not already present in the network)

[pre-commit.ci] auto fixes from pre-commit.com hooks

a1513f9

for more information, see https://pre-commit.ci

Merge branch 'master' into addNetworksFunction

0e62a57

Merge branch 'master' into addNetworksFunction

b83ef70

jessLryan requested a review from FabianHofmann December 12, 2023 09:15

jessLryan added 9 commits December 12, 2023 09:15

Merge branch 'master' into addNetworksFunction

354505f

Merge branch 'master' into addNetworksFunction

d22f713

Merge branch 'master' into addNetworksFunction

62488c5

Merge branch 'master' into addNetworksFunction

7266011

Merge branch 'master' into addNetworksFunction

56ef7b1

Merge branch 'master' into addNetworksFunction

85f4347

Merge branch 'master' into addNetworksFunction

308adb6

Merge branch 'master' into addNetworksFunction

0527de8

Merge branch 'master' into addNetworksFunction

8fdf880

FabianHofmann closed this in #783 Apr 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add network function #781

Add network function #781

jessLryan commented Nov 9, 2023

codecov bot commented Nov 11, 2023 •

edited

FabianHofmann left a comment

jessLryan commented Nov 30, 2023

FabianHofmann commented Nov 30, 2023

jessLryan commented Nov 30, 2023

jessLryan commented Nov 30, 2023

FabianHofmann commented Nov 30, 2023

jessLryan commented Nov 30, 2023

FabianHofmann commented Dec 1, 2023

jessLryan commented Dec 2, 2023

jessLryan commented Mar 31, 2024

Add network function #781

Add network function #781

Conversation

jessLryan commented Nov 9, 2023

Changes proposed in this Pull Request

Checklist

codecov bot commented Nov 11, 2023 • edited

Codecov Report

FabianHofmann left a comment

Choose a reason for hiding this comment

jessLryan commented Nov 30, 2023

FabianHofmann commented Nov 30, 2023

jessLryan commented Nov 30, 2023

jessLryan commented Nov 30, 2023

FabianHofmann commented Nov 30, 2023

jessLryan commented Nov 30, 2023

FabianHofmann commented Dec 1, 2023

jessLryan commented Dec 2, 2023

jessLryan commented Mar 31, 2024

codecov bot commented Nov 11, 2023 •

edited