-
Notifications
You must be signed in to change notification settings - Fork 187
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
Add functionality to merge each isolated bus to the backbone network #903
Merged
ekatef
merged 76 commits into
pypsa-meets-earth:main
from
ekatef:fetch_isolated_to_network
Apr 23, 2024
Merged
Changes from all commits
Commits
Show all changes
76 commits
Select commit
Hold shift + click to select a range
b992acd
Add a function to fetch isolated nodes to network
ekatef f389d02
Apply fetch-isolated
ekatef ea0eb88
Add import
ekatef a399ae1
Add import
ekatef e8262b8
Generalize sub-setting of an array
ekatef 52eb9a9
Improve a message
ekatef 1af3d41
Remove comments
ekatef 4aabc91
Merge remote-tracking branch 'origin/fetch_isolated_to_network' into …
ekatef 6391b21
Add a return on condition in case there is no isolated nodes
ekatef bc8b755
Merge branch 'main' into fetch_isolated_to_network
ekatef a92a8fc
Clarify a comment
ekatef 2ad6fa6
Merge remote-tracking branch 'origin/fetch_isolated_to_network' into …
ekatef 4d46fe5
Add a TODO comment
ekatef e641447
Add filtering by carrier for the network to merge into
ekatef febe2a7
Remove a not-necessary comment
ekatef dc9be87
Improve implementation of buses merging
ekatef 06349a9
Merge branch 'main' into fetch_isolated_to_network
ekatef dd3a039
Wrap-up into a function transformation of a buses dataframe into geop…
ekatef 831182b
Fix selection of the buses to be merged with
ekatef 813ce0a
Read CRS from the network
ekatef aa0f079
Re-implement the spatial transformation function
ekatef 6743186
Improve naming
ekatef b79b364
Add bus_id column
ekatef 4af66f0
Add a function to identify isolated networks
ekatef b8d127e
Handle isolated networks
ekatef 2460f02
Fix threshold
ekatef dc75850
Remove lines corresponding to the isolated buses
ekatef 1f7cc78
Exclude population raster from demand distribution
ekatef 1430c66
Account for the carriers
ekatef 1031926
Hardcode CRS
ekatef 085ee0c
Revert "Exclude population raster from demand distribution"
ekatef 3c9b651
Fix a typo in a comment
ekatef 4e45ecb
Add a fetch threshold to the config
ekatef c103064
Improve docstrings
ekatef 16ff175
Fix a fetch threshold
ekatef bd71663
Fix CRS input
ekatef fef6935
Switch-on filtering by load
ekatef db139ad
Improve naming
ekatef 2bf9704
Revise finding isolated networks to respect national partition
ekatef 453583c
Add a country column to the buses dataframe
ekatef 7ad0853
Move filtering to the find-isolated function
ekatef 9efcdc6
Re-factor filtering of backbone buses
ekatef 92f9d69
Account for geography when finding the closest buses
ekatef 222ab30
Revise threshold configuration parameters
ekatef d1ef441
Code clean-up
ekatef d4a212b
Avoid global variables
ekatef a0e9c87
Fix mapping
ekatef 71c398d
Avoid merging into multi-country networks
ekatef b167bf0
Use an absolute power threshold
ekatef 9e3466c
Merge branch 'main' into fetch_isolated_to_network
ekatef 3656788
Remove a redundant column
ekatef fd6354e
Improve comments
ekatef 4046495
Merge branch 'pypsa-meets-earth:main' into fetch_isolated_to_network
ekatef f8cb01f
Add load data to the geo-transform function
ekatef b1697a0
Update definitions of the geo-dataframes
ekatef fc97649
Update configuration files
ekatef 4ee2604
Merge remote-tracking branch 'origin/fetch_isolated_to_network' into …
ekatef 60ae7cd
Remove an outdated function
ekatef b7f50c5
Fix formatting
ekatef f2a7840
Keep the backbone block together
ekatef f00c04b
Add a comment
ekatef 1702c3a
Fix code structure
ekatef 9b725cb
Fix filtering for floats
ekatef f1ec53b
Revise naming
ekatef 6cf958b
Keep id column
ekatef 3953b70
Add a safety filtering
ekatef a3086f7
Revise config defaults
ekatef 10cad77
Add an entry to the configtables
ekatef 171bd00
Add a release note
ekatef 6f20a31
Revise naming
ekatef 75019ac
Merge branch 'main' into fetch_isolated_to_network
ekatef ad8d083
Remove not needed imports
ekatef 278bc80
Implement Davide's suggestion
ekatef cc97b02
Use a safer filtering
ekatef f92638e
Add a release note
ekatef a9b6f59
Merge branch 'main' into fetch_isolated_to_network
ekatef File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This remove should not be needed and performed by the clustering no?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Normally yes, but our use case is not well captured by
get_clustering_from_busmap( )
, as it seems to expect that the lines in a cluster belong to the same sub-network. When I try to remove the linen.mremove("Line", i_lines_islands)
leads toAssertionError In Bus cluster sub_network the values of attribute sub_network do not agree
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok :)