Ak/i210 master merge #994
Merged
Ak/i210 master merge #994
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
* implement HighwayNetwork for Time-Space Diagrams * fix flake8 * PR fixes * update docstrings Co-authored-by: AboudyKreidieh <[email protected]>
* fixed h-baselines bug * potential bug fix
* Replicated changes in 867. Changes only made to traci * Aimsun changes minus reset
* 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 <[email protected]> Co-authored-by: Kathy Jang <[email protected]> Co-authored-by: Nathan Lichtlé <[email protected]>
* fixed h-baselines bug * potential bug fix * add 210 edgestarts for backwards compatibility * add 210 edgestarts for backwards compatibility * add 210 edgestarts for backwards compatibility * add 210 edgestarts for backwards compatibility * fastforward PR 989 * fix typo Co-authored-by: AboudyKreidieh <[email protected]>
* updated requirements.txt and environment.yml * Visualizer tests fixes * remove .func Co-authored-by: akashvelu <[email protected]>
AboudyKreidieh
requested review from
cathywu,
eugenevinitsky and
kanaadp
as code owners
…ak/i210-master-merge
| emission_output = pd.read_csv(emission_files[i]) | ||
| emission_output['source_id'] = source_id | ||
| emission_output['run_id'] = "run_{}".format(i) | ||
| emission_output.to_csv(trajectory_table_path, mode='a+', index=False, header=(i == 0)) |
There was a problem hiding this comment.
these conditions have some magic numbers and therefore need a comment
…ak/i210-master-merge
…ak/i210-master-merge
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.
Pull request information
Description
? (general description)