Skip to content
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 210 edgestarts for backwards compatibility #985

Merged
merged 12 commits into from
Jul 8, 2020

Conversation

liljonnystyle
Copy link
Collaborator

@liljonnystyle liljonnystyle commented Jun 22, 2020

Pull request information

  • Status: ready to merge
  • Kind of changes: bug fix / new feature

Description

New edgestarts dict is supplied for I-210 subnetwork in case people try to generate the time-space diagram using the emissions csv.

Fast-forwarded PR 989 changes on top, which add greyed regions for warmup period and ghost cells (if applicable). E.g.,
flow_858bc7a51d9f4169872cdc41d20a5cba

Copy link
Collaborator

@nathanlct nathanlct left a comment

Choose a reason for hiding this comment

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

Most changes are already merged into master from #982, not sure why it still appears as differences in the files changed.

As for edge starts, not sure why it starts at -5.1 and not 0 but anyway offsets are good.

@liljonnystyle
Copy link
Collaborator Author

@nathanlct Yeah I'm not sure why either. I have rebased master twice and it only seems to have gotten worse.

Also not clear on the -5.1 either, but it seems to be a result of the ghost edge location.

Copy link
Member

@AboudyKreidieh AboudyKreidieh left a comment

Choose a reason for hiding this comment

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

LGTM

@coveralls
Copy link

Pull Request Test Coverage Report for Build 6863

  • 3 of 22 (13.64%) changed or added relevant lines in 1 file are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.1%) to 88.806%

Changes Missing Coverage Covered Lines Changed/Added Lines %
flow/visualize/time_space_diagram.py 3 22 13.64%
Totals Coverage Status
Change from base Build 6861: -0.1%
Covered Lines: 9591
Relevant Lines: 10800

💛 - Coveralls

@AboudyKreidieh AboudyKreidieh merged commit d36da2e into master Jul 8, 2020
@AboudyKreidieh AboudyKreidieh deleted the jl-210_edgestarts branch July 8, 2020 18:40
liljonnystyle added a commit that referenced this pull request Jul 11, 2020
* implement HighwayNetwork for Time-Space Diagrams (#979)

* fixed h-baselines bug (#982)

* Replicated changes in 867. Done bug (#980)

* Aimsun changes minus reset

* removed crash attribute

* tensorflow 1.15.2

* merge custom output and failsafes to master (#981)

* add write_to_csv() function to master

* include pipeline README.md

* add data pipeline __init__

* add experiment.py changes

* add write_to_csv() function to master

* change warning print to ValueError message

* update to new update_accel methods

* add display_warnings boolean

* add get_next_speed() function to base vehicle class

* revert addition of get_next_speed

* merge custom output and failsafes to master

* add write_to_csv() function to master

* add display_warnings boolean

* add get_next_speed() function to base vehicle class

* revert addition of get_next_speed

* revert change to get_feasible_action call signature

* change print syntax to be python3.5 compliant

* add tests for new failsafe features

* smooth default to True

* rearrange raise exception for test coverage

* moved simulation logging to the simulation kernel (#991)

* add 210 edgestarts for backwards compatibility (#985)

* fastforward PR 989

* fix typo

* Requirements update (#963)

* updated requirements.txt and environment.yml

* Visualizer tests fixes

* remove .func

* move all miles_per_* rewards to instantaneous_mpg

* update reward fns to new get_accel() method

* made tests faster

* some fixes to utils

* change the column order, modify the pipeline to use SUMO emission file

* write metadata to csv

* change apply_acceleration smoothness setting

* make save_csv return the file paths

Co-authored-by: AboudyKreidieh <[email protected]>
Co-authored-by: liljonnystyle <[email protected]>
Co-authored-by: Kathy Jang <[email protected]>
Co-authored-by: Nathan Lichtlé <[email protected]>
Co-authored-by: akashvelu <[email protected]>
Co-authored-by: Brent Zhao <[email protected]>
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.

4 participants