Lab 1226 Refine Road Pricing #84
Merged
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
mfitz
approved these changes
Aug 2, 2021
There was a problem hiding this comment.
Looks good.
I ran the coverage report and got:
675 passed, 1 xfailed, 442 warnings in 570.16s (0:09:30)
In separate branches, we should:
- clean up all of those warnings
- see if we can speed those tests up
Update: I will quickly see if using PyPy in the build pipeline makes things quicker, as per https://arupdigital.atlassian.net/browse/LAB-1179
| @@ -1,3 +1,3 @@ | |||
| osm_ids,osm_refs,osm_names | |||
| osm_id,osm_ref,osm_name | |||
There was a problem hiding this comment.
Ah yes, the databasists would be proud of your column naming :-)
genet/use/road_pricing.py
Outdated
| :param network: a genet.Network object with attribute_name tags | ||
| :param attribute_name: a string corresponding to the name of the link attribute of interest | ||
| :param osm_csv_path: path to a .csv config file where OSM way ids are stored in column `osm_ids` | ||
| :param outpath: path to a folder |
There was a problem hiding this comment.
Path to a directory for what? Writing output, I guess?
genet/use/road_pricing.py
Outdated
| class Cordon: | ||
| def __init__(self, df_tolls: pd.DataFrame = None): | ||
| if df_tolls is None: | ||
| self.tolls_df = pd.DataFrame( |
There was a problem hiding this comment.
Are we deliberately varying the member name here (df_tolls v tolls_df on the other side of the if clause at line 28)? I can see from the coverage report that line 15 is not tested, so it makes me think maybe this is a typo?
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.
Adds a
Cordonclass to hold information about tolling on network links.All previous road pricing methods are retained and wraps added to have them work with this new class.
It's all pretty basic but it introduces a way to represent cordon tolls in memory that isn't dependent on OSM ids and a mapping between them and a network object.