Skip to content

Conversation

kjang96
Copy link
Member

@kjang96 kjang96 commented Jun 19, 2020

Pull request information

  • Status: ready to merge (ready to merge / in development)
  • Kind of changes: ? (bug fix / new feature / documentation...)
  • Related PR or issue: ? (optional)

Description

Changes only made to traci

@kjang96
Copy link
Member Author

kjang96 commented Jun 22, 2020

Build still failing for reasons outside this code. Dependent on some other PR being merged in.

@coveralls
Copy link

coveralls commented Jun 22, 2020

Pull Request Test Coverage Report for Build 6641

  • 6 of 6 (100.0%) changed or added relevant lines in 2 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.003%) to 88.747%

Totals Coverage Status
Change from base Build 6631: 0.003%
Covered Lines: 9424
Relevant Lines: 10619

💛 - Coveralls

@kjang96
Copy link
Member Author

kjang96 commented Jun 22, 2020

Added changes to include Aimsun EXCEPT FOR reset. Not sure what's going on in the code

Copy link
Member

@eugenevinitsky eugenevinitsky left a comment

Choose a reason for hiding this comment

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

LGTM

@eugenevinitsky eugenevinitsky merged commit af0b4f6 into master Jun 22, 2020
AboudyKreidieh added a commit that referenced this pull request Jul 8, 2020
* merge custom output and failsafes to master

* add write_to_csv() function to master

* include pipeline README.md

* add data pipeline __init__

* add experiment.py changes

* Update simulate.py

* Update simulate.py

* Update simulate.py

* Update experiment.py

* Update experiment.py

* fix flake8 issues

* fix flake8 issues

* fixed h-baselines bug

* Update experiment.py

* potential bug fix

* merge custom output and failsafes to master

* add write_to_csv() function to master

* include pipeline README.md

* add data pipeline __init__

* add experiment.py changes

* Update simulate.py

* Update simulate.py

* Update simulate.py

* Update experiment.py

* Update experiment.py

* fix flake8 issues

* fix flake8 issues

* Update experiment.py

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

* Replicated changes in 867. Changes only made to traci

* Aimsun changes minus reset

* address aboudy comments

* revert change

* change warning print to ValueError message

* update to new update_accel methods

* address brent comments

* fix import typo

* address comments

* 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

* include pipeline README.md

* add data pipeline __init__

* add experiment.py changes

* Update simulate.py

* Update simulate.py

* Update simulate.py

* Update experiment.py

* Update experiment.py

* fix flake8 issues

* fix flake8 issues

* Update experiment.py

* add experiment.py changes

* Update simulate.py

* Update simulate.py

* Update simulate.py

* Update experiment.py

* Update experiment.py

* fix flake8 issues

* address aboudy comments

* revert change

* change warning print to ValueError message

* update to new update_accel methods

* address brent comments

* fix import typo

* address comments

* add display_warnings boolean

* add get_next_speed() function to base vehicle class

* revert addition of get_next_speed

* remove duped line from rebase

* Update base_controller.py

* fix some bugs

* revert change to get_feasible_action call signature

* change print syntax to be python3.5 compliant

* add tests for new failsafe features

* fix failsafe unit tests

* fix failsafe unit tests

* fix unittest syntax

* fix typo

* smooth default to True

* rearrange raise exception for test coverage

* some minor fixes

* cleanup

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

* moved simulation logging to the simulation kernel

* pydocstyle

* PR fixes

* bug fix

Co-authored-by: AboudyKreidieh <akreidieh@gmail.com>
Co-authored-by: Kathy Jang <kathyjang@gmail.com>
Co-authored-by: Nathan Lichtlé <nathanlct@icloud.com>
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.

3 participants