added power calculation in rewards.py #2
Conversation
This file contains hidden or 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
* Fix bugs in utils/aimsun/load.py 1. Updated the path to data.json 2. Added a check before querying centroid_config.origin_centroids and centroid_config.destination_centroids to prevent erroring out when the model doesn't have origin or destination centroids set. * Fixed bug * Renamed in more places
* Fix bugs in utils/aimsun/load.py 1. Updated the path to data.json 2. Added a check before querying centroid_config.origin_centroids and centroid_config.destination_centroids to prevent erroring out when the model doesn't have origin or destination centroids set. * Fixed bug * bug fixed * deleted the json files * PR fixes
* modify flow/config for aimsum * fixed tutorial 11 typos and updated import modules * Fix tutorial 11 inflow depart_speed speedLimit param * Fixed tutorial 11, replaced speedLimit with max and set one departure speed as a constant * Revert "Fixed tutorial 11, replaced speedLimit with max and set one departure speed as a constant" This reverts commit 77ebb92. * replace speedLimit with max and used a constant for a departure speed
* get rid of save prompt in aimsun * bug: getLanesLength2D sums all lane lengths * was using wrong key for speed limit * add flow directory to PYTHONPATH * length2D is the proper way to get edge length
* start rewriting tuto5 * new visualization tutorial * Add example to visualization tutorial * Print path where emission file is generated * Add trained ring policy for visualization tutorial * Display path of CSV emission file generated by --gen-emission * Rename section * removed rllab, added updated trained policy
* Updated versions for lxml and cloudpickle * Updated lxml for environment.yml
* Use port to generate unique auxiliary files * open multiple copies of ang file to avoid conflict * flake
* added troubleshooting for Aimsun 8.4 installation * fixed bug - aimsun sitepackage installation guide * minor edits
* added the Gipps car folowing model- first order model * added the Gipps car folowing model- first order model_ * tests for GippsController
* changed visualizer rllib to not open SUMO unnecessarily
* render to video using sumo-gui * flake * allow usage of sumo_gui in render * cleanup
update tutorial 00 to reflect the new folder of multiagent env
* better file names for environments
* change base_scenario.py to base.py for consistency
* change WaveAttenuationMergePOEnv to MergePOEnv for consistency
* initial pass at modifying examples page
* changed "loop" to "ring" in envs
* Renamed "loop" to "ring" in scenarios
* More rename "loop" to "ring"
* Final commit for "loop" to "merge"
* merge multiagent_envs into envs
* changed all apperance of green wave to traffic light grid
* Fixed names for scenarios so that they match the environments. Everything is uniform now
* moved scenario files to network and renamed Scenario->Network
* removed all non-aimsun mentioned of scenario
* added pending deprecation warning for scenario use
* Removing cooperative_merge (later we called it "TwoRingsOneMerge"
* pep8
* added deprecation warning for scenario to env input
* Refactoring new files that are added after pulling from master
* Change 'grid' to 'traffic_light_grid' across all files
* addressed flake8 issues
* PR fixes
* PR fix
* Fixed test_visualiszer.py errors
* working version of simulate.py
* bug fixes
* fixed tests for simulate
* cleanup
* added script for running single agent rllib experiments
* added multiagent rllib support to examples
* Remove data.json
* pydocstyle fixes
* pep8
* modified some examples
* added stable baselines support
* bug fix
* added aimsun template to exp_configs
* added missing files
* Update README.md
* Update readme to reflect how to run examples, and to add all the examples
* Renamed several files so the new naming matches our new naming convention
* Update readme, flow_setup, change example paths in files
* Update tutorial 00 for the new structure of examples
* Rename density_exp and also update the ray_auoscale.yaml
* fix train_rllib
* fix pep8 issues
* fix test for highway
* check multiagent file name, remove HTTPS
* properly update config dictionary
* Fix the follwoing multiagent examples:{figure_eight, highway, ring}
* Resolve flake8 issues
* Fix errors in test_experiment_base_class
* Fixing class TestCollisions with the new way of running experiments
* pep8
* Fix errors in test_contollers
* Fix the tests with ring_road_exp_setup
* flake8
* Revert "flake8"
This reverts commit 52d1a09.
* Revert "Fix the tests with ring_road_exp_setup"
This reverts commit 1659fb3.
* Fix all tests that use setup_scripts
* pep8
* Fix benchmark tests
* (Thanks Kanaad) Fix the error that was causing many benchmarks and examples fail
* Resolve merge conflict
* Fix test_experiment_base_class errors
* Fix test_collisions errors
* Trying isolating bug
* Testing to see if TestVisualizerRLlib is the issue
* Testing if test_benchmarks is the problem
* Revert "Testing if test_benchmarks is the problem"
This reverts commit 050f5db.
* Revert "Testing to see if TestVisualizerRLlib is the issue"
This reverts commit 42978c4.
* Revert "Trying isolating bug"
This reverts commit c359d8f.
* trying to see if the error is in slow tests
* Trying to see if test_examples or test_visualizers is the issue
* Trying to see where the error occurs in fast_tests
* See if example rename is the issue
* typo
* some minor cleanup
* fixed some tests
* resolved multiple registery calls bug
* Fixing the random start of vehicles on ring
* Fixing the bug that comes up randomly
* Trying to remove randomness
* flake8 issues
* Remove unnecessary debugging code
* update the hierarchy of exp_config to be more logical
* Update examples/README.md
Co-Authored-By: Aboudy Kreidieh <[email protected]>
* Update examples/README.md
Co-Authored-By: Aboudy Kreidieh <[email protected]>
* Address aboudy's comments
Co-authored-by: Nathan Lichtlé <[email protected]>
Co-authored-by: Ashkan Y. <[email protected]>
Co-authored-by: Kanaad Parvate <[email protected]>
Modified "founded" to "found".
* unused parameter * Update tutorials according to the new example folder * Adding final changes to the tutorials * Correct the env_name and network in flow_params * bug fix Co-authored-by: Aboudy Kreidieh <[email protected]>
* Update tutorials * Update all tutorials * Apply suggestions from code review Co-authored-by: Aboudy Kreidieh <[email protected]>
…803) * Update evaluate.py to match with new way of runnign experiments * flake8 issues * bug fix * bug fix Co-authored-by: Aboudy Kreidieh <[email protected]>
Added code to output json. Added code to resolve macOS matplotlib imp…
* deleting unworking params from SumoChangeLaneParams * deleted unworking params, sublane working in highway : * moved imports inside functions * Apply suggestions from code review * bug fixes * bug fix Co-authored-by: Aboudy Kreidieh <[email protected]>
* added bando model * added ghost edge to the highway network * added highway-single example * bug fixes * more tests
* Add the appropriate reward to the grid benchmark back * Put the bottleneck in a congested regime * Bump bottleneck inflows to put it in the congested regime
* added function to kernel/vehicle to get number of not departed vehiles * fixed over indentation of the docstring * indentation edit * pep8 Co-authored-by: AboudyKreidieh <[email protected]>
* changed _departed_ids, and _arrived_ids in the update function * fixed bug in get_departed_ids and get_arrived_ids
Add an MPG reward
Updated ray_autoscale and requirements.txt
* added aimsunparams * fixed aimsun default template * fixed bug in network close function * fixed bug in simulate.py * minor * minor * bug fix * minor tests Co-authored-by: AboudyKreidieh <[email protected]>
* convert base classes into abstract base classes and add abstractmethod decorators * fix typo * revert changes on this file * NotImplementedError no longer needed * allow gen_custom_start_pos() to be not abstract method * implement dummy get_accel() method for rl controller * add docstring * add docstring * add docstring * revert changes to base Network class * add dummy implementations of abstract methods * fix abstract base class tests * import new TestEnvs * fix import statement * change TestEnv instantiation assertion checks * fix typos * change base vehicle class to abc * resolve conflict and raise NotImplementedError in traci and aimsun class methods * fix styling * fix styling * fix merge duplication and excess whitespace * newline at end of file * added ignore to abstract methods * moved testing envs to the tests folder Co-authored-by: AboudyKreidieh <[email protected]>
* added new lane change modes * replaced 'no_lat_collide' with 'no_lc_safe' which is the new default lane change mode * bug fixes and PR reviews Co-authored-by: AboudyKreidieh <[email protected]>
* use pandas for data reshaping * fix flow params assertion * modify plotting for all i210 lanes * generalize plotting to all networks, update tests
* removed sweep * added updated single lane highway network config * added i210 xml files with downstream edge * added I210Router * added updated i210 features * minor cleanup * better parameters based on when congestion propagates * bug fixes * bug fixes * more bug fixes * bug fixes * minor * broader tests for scenario * added tests for specify_routes * PR fixes
* updated i210 simulation * increased the time horizon * added edge starts
* 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]>
* Added doc for libsumo installation on Mac * Added code shell
Update question Github issue template to refer people to Slack channel, and not StackOverflow
Update question Github issue template
* moved temporary files to default (os dependent) temp dir, added removal of temp files at termination when using .net.xml file path * flake8 fix
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
23 participants
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)