Skip to content

merge custom output and failsafes to master#981

Merged
AboudyKreidieh merged 88 commits into
masterfrom
jl-merge-getaccels
Jul 8, 2020
Merged

merge custom output and failsafes to master#981
AboudyKreidieh merged 88 commits into
masterfrom
jl-merge-getaccels

Conversation

@liljonnystyle

@liljonnystyle liljonnystyle commented Jun 19, 2020

Copy link
Copy Markdown
Collaborator

Pull request information

  • Status: ready to merge
  • Kind of changes: new feature

Description

Merge in Brent's custom csv output and Yashar's failsafes updates

Comment thread flow/controllers/base_controller.py
Comment thread flow/controllers/base_controller.py
* moved simulation logging to the simulation kernel

* pydocstyle

* PR fixes

* bug fix
@AboudyKreidieh AboudyKreidieh self-requested a review July 7, 2020 20:14

@AboudyKreidieh AboudyKreidieh left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM (will merge when tests pass)

@AboudyKreidieh AboudyKreidieh merged commit c319a6c into master Jul 8, 2020
@AboudyKreidieh AboudyKreidieh deleted the jl-merge-getaccels branch July 8, 2020 18:13
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 <akreidieh@gmail.com>
Co-authored-by: liljonnystyle <jonny5@berkeley.edu>
Co-authored-by: Kathy Jang <kathyjang@gmail.com>
Co-authored-by: Nathan Lichtlé <nathanlct@icloud.com>
Co-authored-by: akashvelu <akashvelu@berkeley.edu>
Co-authored-by: Brent Zhao <brentgryffindor@outlook.com>
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.

7 participants