base_demand, demand_pattern and demand_category at junctions go to/from gis #447
Conversation
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
|
Tests have not passed but I think they will once #445 is merged. |
|
@angusmcb thanks for the PR. I got the tests to run properly by merging in the main branch, but now it looks like the doctests are failing. Since the GIS dataframes have new column names the outputs don't match the expected values in the docs. |
kbonney
approved these changes
Oct 21, 2024
wntr/network/elements.py
Outdated
| """ | ||
| if len(self.demand_timeseries_list) > 0: | ||
| return self.demand_timeseries_list[0].category | ||
| return 0.0 |
There was a problem hiding this comment.
I am wondering what makes the most sense for the default return values. I need to check what the simulators default to when the demand_timeseries_list is empty.
There was a problem hiding this comment.
The add_junction function uses None as the default for demand_pattern and demand_category, so we should follow that here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Would be very happy to have your feedback on this :-)
Summary
As described in issue #434
Tests and documentation
Added a new test.
Acknowledgement
By contributing to this software project, I acknowledge that I have reviewed the software quality assurance guidelines and that my contributions are submitted under the Revised BSD License.