Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
573 commits
Select commit Hold shift + click to select a range
77ea67e
updates to figure 8 scenario
AboudyKreidieh May 22, 2017
2e09d18
modified observation space in lane_changing
AboudyKreidieh May 22, 2017
483def5
Merge pull request #82 from cathywu/docker
eugenevinitsky May 22, 2017
8d5bc35
Merge pull request #98 from cathywu/idm_simulations
eugenevinitsky May 22, 2017
b777df4
added fully positive reward function to mixed-human-rl.py
May 22, 2017
e65481a
Pulled in changes to state for lc environment
May 22, 2017
51db8e1
increased max length of run in gen.py, added positive only reward to …
May 23, 2017
27abf26
changed dockerfile to pull nightly SUMO build
May 23, 2017
91892f9
created docker file that downloads from svn instead of stable build
May 23, 2017
92811e6
added experiment for platooning
AboudyKreidieh May 25, 2017
748d836
vehicles at figure8 generator can pass through junctions
AboudyKreidieh May 25, 2017
152f186
added condition to ensure rollout ends after crash
AboudyKreidieh May 25, 2017
4f442ca
updated experiments to be compatible with latest version of cistar
AboudyKreidieh May 25, 2017
5ed2908
modified reward function in sheparding class
AboudyKreidieh May 25, 2017
34b64e4
made end time larger for bigger experiments
AboudyKreidieh May 25, 2017
43cb692
fixed bug in lanechanging.py that caused it to be unable to be used b…
May 25, 2017
c941352
fixed bug in IDM where a factor of 2 was replaced by headway
May 28, 2017
9b421a3
changed visualizer_CISTAR to have a loop_length input argument that l…
May 29, 2017
6e86c3e
fixed minor bug in instantaneous failsafe where we were occasionally …
May 29, 2017
c44f594
changed based_env to color cars differently for each car type, added …
May 31, 2017
de993dd
dockerfile for pulling stable sumo is in dockerfile, svn dockerfile i…
May 31, 2017
5fbfaaf
Merge pull request #99 from cathywu/dockerSVN
eugenevinitsky May 31, 2017
6aac1b4
added intersection fail-safe
AboudyKreidieh May 31, 2017
f231d3c
script to train vehicles to not crash at intersections
AboudyKreidieh May 31, 2017
2607eda
added intersection crash, absolute position
AboudyKreidieh May 31, 2017
d7e039c
fixed unit tests to use an arbitrary port
May 31, 2017
2fe232c
added absolute position and fail variable to compute_reward
AboudyKreidieh May 31, 2017
77a560c
modified intersection representation and edge names in figure8 scenario
AboudyKreidieh May 31, 2017
e9b6f6c
fixed typo in IDM model
AboudyKreidieh May 31, 2017
0441b9f
added function to compute distance to intersection
AboudyKreidieh May 31, 2017
847aac6
unit tests fixed now?
May 31, 2017
86f856e
modified reward function and states to be compatible with newest appr…
AboudyKreidieh May 31, 2017
761597f
Merge branch 'master' into idm_simulations
eugenevinitsky May 31, 2017
8e45f88
Merge pull request #102 from cathywu/idm_simulations
eugenevinitsky Jun 1, 2017
0cba6f8
changed compute reward to take kwargs for additional arguments
Jun 1, 2017
7fc287d
Instructions corresponding with commit f40f033cb3986c657de39c34f253f0…
cathywu Jun 1, 2017
3a82515
added some docker files to the svn folder
Jun 2, 2017
0542eaa
Update Docker_Tutorial.md
eugenevinitsky Jun 2, 2017
a93016c
Update Docker_Tutorial.md
eugenevinitsky Jun 2, 2017
99a6e9b
Update AWS_tutorial.md
eugenevinitsky Jun 5, 2017
78960b8
changed docker file t onot use the patch anymore
kanaadp Jun 5, 2017
02b80b3
mixed-human-rl: switch GaussianMLPPolicy to AutoMLPPolicy, switch The…
cathywu Jun 6, 2017
91168c0
Merge
cathywu Jun 6, 2017
af08c53
Merge pull request #105 from cathywu/laneChangeChChChChanges
AboudyKreidieh Jun 6, 2017
e673c30
reorganizing location of sumo commands
AboudyKreidieh Jun 6, 2017
d6e190e
fixed merge
AboudyKreidieh Jun 6, 2017
fb29ad1
base lane changing controller
AboudyKreidieh Jun 6, 2017
7ddd57c
Create AWS_tutorial.md
eugenevinitsky Jun 8, 2017
a819756
Merge pull request #107 from cathywu/prepare_automlp
eugenevinitsky Jun 8, 2017
4cac225
all sumo functions in base_env, method to set lc_mode and speed_mode …
AboudyKreidieh Jun 8, 2017
4e2a5cb
made base-env changes, changed lane-changing to use discrete version
Jun 9, 2017
8004e3d
added all car rl lc example
Jun 9, 2017
7d94f96
fixed lane changing to use mixed and discrete policy
Jun 10, 2017
293a8ac
cases to mixed-rl
AboudyKreidieh Jun 10, 2017
a0250ca
Merge branch 'master' of https://github.com/cathywu/learning-traffic …
AboudyKreidieh Jun 10, 2017
40f3187
fixed sheparding aggressive drivers to work with automlp
Jun 10, 2017
482d52c
method to penalize non-compliance with rl requests
AboudyKreidieh Jun 10, 2017
c171d10
added method to implement sumo IDM controller
AboudyKreidieh Jun 10, 2017
2a2600d
changed base_env to handle the fact there isnt a safe_target_lane for…
Jun 10, 2017
b801c3b
fixed merge conflicts
AboudyKreidieh Jun 10, 2017
cff2408
created new file for visualizing policies created through tensorflow
Jun 10, 2017
93a7f51
fixed bugs with lane changing cars running sumo commands
AboudyKreidieh Jun 11, 2017
fc025a6
get_headway by default looks in current headway
AboudyKreidieh Jun 11, 2017
2a141ba
added in aboudys changes so that a lane change command is applied eve…
Jun 11, 2017
1483815
added method for shuffling vehicles in between runs
AboudyKreidieh Jun 12, 2017
e4cada9
added method for shuffling vehicles in between runs
AboudyKreidieh Jun 12, 2017
8c560cb
added method for shuffling vehicles in between runs
AboudyKreidieh Jun 12, 2017
80ea9a7
made iterations faster
AboudyKreidieh Jun 12, 2017
dba8d28
updates to parameters in experiments
AboudyKreidieh Jun 12, 2017
cc748db
fixed lane changing bug where command was not issued at every step
Jun 13, 2017
38a9beb
stopped traci get calls when unnecessary
AboudyKreidieh Jun 13, 2017
6a1dc31
fixed bug in getting lane index
AboudyKreidieh Jun 13, 2017
db26c45
removed unneccesary lane change commands
AboudyKreidieh Jun 13, 2017
2e58550
preparing branch for merge
AboudyKreidieh Jun 13, 2017
9b0f8da
preparing for merge
AboudyKreidieh Jun 13, 2017
72fe3d8
removed extraneous lane changing applied at each step
Jun 14, 2017
531ecd8
merged in aboudys changes to speed up the experiments
Jun 14, 2017
80dad99
added drunk driver class that gets perturbed every number of time ste…
Jun 15, 2017
d7906b4
changes to instantaneous failsafe and observation space method for mu…
AboudyKreidieh Jun 15, 2017
f21b5c7
added drunk drivers
Jun 16, 2017
18069f5
resolved the bug that was causing excessive lane changes
Jun 16, 2017
0fb5036
fixed bug wherein time of lane change was updated whether the fail sa…
Jun 16, 2017
4fa8e8f
fixed simple accel to account for the fact that applying a reward of …
Jun 16, 2017
b85c67b
switched mixed_human to use a state space that depends on headway and…
Jun 16, 2017
9535ee0
fixed rlonly to use both in lane and adj lane headway
Jun 16, 2017
92f823c
changes made for paper, some temporary
AboudyKreidieh Jun 23, 2017
eb4ebea
merged changes and placed each emergent behavior experiment is a sepa…
AboudyKreidieh Jun 29, 2017
071b27b
cleaned up various asepcts of cistar, added option of noise to observ…
AboudyKreidieh Jul 5, 2017
24a345f
adding methods for performing simulations of intersections (work in p…
AboudyKreidieh Jul 5, 2017
c8d597f
added intersection scenario (still needs work)
AboudyKreidieh Jul 7, 2017
6fd5e12
Makefile template instead of Makefile, to support custom paths for th…
cathywu Jul 8, 2017
157c6d5
changes to get_x_by_id(), collecting headways, and collecting observa…
AboudyKreidieh Jul 10, 2017
a4ab96b
Merge pull request #121 from cathywu/Makefile
eugenevinitsky Jul 10, 2017
32b94d4
cleaned up and commented example folder
Jul 10, 2017
e356547
removed unnecessary environments
Jul 10, 2017
d0d09e7
cleaned up car-following models
AboudyKreidieh Jul 10, 2017
c9160d4
recreated rewards file as a series of rewards functions
AboudyKreidieh Jul 10, 2017
b996887
made changes to shuffling process in between rollouts
AboudyKreidieh Jul 10, 2017
c4de341
fixed merge conflicts
AboudyKreidieh Jul 10, 2017
c2878b7
started adding partial observability to getState()
AboudyKreidieh Jul 10, 2017
8a3eff5
added functional rl tests
Jul 11, 2017
3a51289
Merge in changes from remote
Jul 11, 2017
1d8fae7
merged in master branch
Jul 11, 2017
4c3a5b5
merged in master
Jul 11, 2017
0554520
Merge branch 'master' into cleanup
eugenevinitsky Jul 11, 2017
c47e816
Merge pull request #125 from cathywu/cleanup
eugenevinitsky Jul 11, 2017
762812c
added start position generator that pushes all cars to the far left a…
Jul 11, 2017
7b2ff2d
fixed getting headway to use traci calls
Jul 11, 2017
e01964b
fixed bug where I had labelled start edge as right instead of bottom
Jul 11, 2017
088bb58
remove vehicle ids dynamically whenever a car exits to prevent the sy…
AboudyKreidieh Jul 11, 2017
a2928c8
changed start positions of two lane intersection
Jul 11, 2017
42d8472
Merge branch 'intersectionControl' of https://github.com/cathywu/lear…
Jul 11, 2017
b5f83bb
vehicles in the intersection scenario can now change positions and sh…
AboudyKreidieh Jul 11, 2017
40af3d7
two way intersection is working. The max path length needs to be adju…
Jul 12, 2017
2e26fca
Delete misc.xml
cathywu Jul 14, 2017
24cfcd7
Delete learning-traffic.iml
cathywu Jul 14, 2017
d6c9826
Delete modules.xml
cathywu Jul 14, 2017
778f4d8
Delete vcs.xml
cathywu Jul 14, 2017
7d300af
Delete workspace.xml
cathywu Jul 14, 2017
35162db
gitignore .idea files
cathywu Jul 14, 2017
ea56bf9
merge
cathywu Jul 14, 2017
3744b51
working two intersection experiment without shuffling of initial posi…
Jul 14, 2017
2aa5be5
Create commit-practices.md
eugenevinitsky Jul 15, 2017
52be68b
Update Docker_Tutorial.md
eugenevinitsky Jul 17, 2017
7b14da9
Update Docker_Tutorial.md
eugenevinitsky Jul 17, 2017
434a7d6
changes made to allow for vehicles to be placed in multiple lanes for…
AboudyKreidieh Jul 17, 2017
8b3398e
updated docker-svn file to properly pull nightly build
kanaadp Jul 17, 2017
da7e732
Merge branch 'master' of https://github.com/cathywu/learning-traffic …
kanaadp Jul 17, 2017
0206b23
registered things as gym environments
Jul 18, 2017
794d506
changed all intersection classes to use Gym classes as superclass
Jul 19, 2017
173765c
added appropriate cistar_dev files back in
Jul 19, 2017
bd6f8a1
added missing __init__ file
Jul 19, 2017
4f2e824
added everything moving-bottleneck related, including changes to lane…
AboudyKreidieh Jul 21, 2017
232f1b3
Stabilizing multilane ring (tensorflow version of moving bottleneck)
cathywu Jul 21, 2017
dac56ce
Refactored multilane ring exp so that params.pkl are saved per iteration
cathywu Jul 21, 2017
f5553ee
created braess paradox generator, scenario, and environment, as well …
AboudyKreidieh Jul 21, 2017
98c8bc5
file to contain several observation functions
AboudyKreidieh Jul 21, 2017
b965d5f
created environment and experiment for lane-change only control
AboudyKreidieh Jul 26, 2017
7057ff3
created scenario and environment for braess paradox, and setup a netw…
AboudyKreidieh Jul 26, 2017
0d1ce49
all emergent behaviors are currently working as gym environments. Par…
Jul 27, 2017
3b2653e
minor changes to lane-change only environment
AboudyKreidieh Jul 27, 2017
385933a
created network and environment for loops with merges
AboudyKreidieh Jul 27, 2017
64a15e3
network for loops with merges
AboudyKreidieh Jul 27, 2017
03a509b
everything working in multiagent parallel form except for possibly mu…
Jul 28, 2017
225b8d5
added option of having only merge ins (no merge out)
AboudyKreidieh Jul 28, 2017
e6d3578
misc fixes
AboudyKreidieh Jul 28, 2017
349297d
added method for traci subscribing headways (already on another branch)
AboudyKreidieh Jul 28, 2017
e754360
additional options for getState and sorted_by_position which may spee…
AboudyKreidieh Jul 28, 2017
50de241
changes to allow even distribution of vehicles across lanes in figure…
AboudyKreidieh Jul 28, 2017
93bbb59
several different states to allow for partial observability and impli…
AboudyKreidieh Jul 28, 2017
d4f722a
misc fixes
AboudyKreidieh Jul 28, 2017
139b0da
fixed up merge conflict in dockerfile svn
Jul 28, 2017
5caa4d8
added option of running braess and loop_merge scenarios on visualizer…
AboudyKreidieh Jul 28, 2017
c497896
created lane changing only scenario
Jul 31, 2017
a082ea0
fixed the visualizer to use gymenv
Aug 1, 2017
6460a91
fixed bug in IDMController and DrunkDriver when there are no leading …
AboudyKreidieh Aug 1, 2017
eb54268
fixed bug in IDMController and DrunkDriver when there are no leading …
AboudyKreidieh Aug 1, 2017
8deb6ba
updated multi-agent environments to have the correct observation spac…
Aug 1, 2017
6675ef7
modified braess paradox env and scenario to accept car following mode…
AboudyKreidieh Aug 3, 2017
8601b2b
the function sort_by_position() added an extra output that can be use…
AboudyKreidieh Aug 3, 2017
5ea78e5
added functionality to perform dynamic route changes (used in braess …
AboudyKreidieh Aug 3, 2017
18c0943
updated getState and sort_by_id
AboudyKreidieh Aug 3, 2017
04ffdae
locked down a method of acquiring robust policies
AboudyKreidieh Aug 3, 2017
5533d5e
misc changes
AboudyKreidieh Aug 3, 2017
a8f8cce
misc changes
AboudyKreidieh Aug 3, 2017
8bd167c
Merge branch 'braessParadox' of https://github.com/cathywu/learning-t…
AboudyKreidieh Aug 3, 2017
00536cb
minor fixes to how experiments are run
Aug 6, 2017
07e548b
merged with multi-agent updates
Aug 6, 2017
5f6bfb9
added subscribe for headways into get_headway_dict()
AboudyKreidieh Aug 11, 2017
b82e5c7
added subclass for partial observability
AboudyKreidieh Aug 11, 2017
c25c529
bug fixes and documentation
AboudyKreidieh Aug 11, 2017
363373d
merged changes
AboudyKreidieh Aug 15, 2017
5ed0861
some cleanup to examples
AboudyKreidieh Aug 17, 2017
f66f9ca
some code cleanup and continued fixing merge
AboudyKreidieh Aug 17, 2017
e8f621d
restrcuturing of scenario class in order to make more abstract
AboudyKreidieh Aug 17, 2017
58937b6
replaced type_params with lists instead of dicts
AboudyKreidieh Aug 20, 2017
cddb116
made generator class more abstract, and modified subclasses
AboudyKreidieh Aug 23, 2017
679f28f
code cleanup
AboudyKreidieh Aug 24, 2017
d723348
Merge pull request #131 from cathywu/braessParadox
eugenevinitsky Aug 25, 2017
7d5d563
cleaned up emergent behaviors folder
Aug 25, 2017
4079ea5
changed the inputs to a few functions
AboudyKreidieh Aug 27, 2017
bb64419
Merge pull request #132 from cathywu/braessParadox
AboudyKreidieh Aug 28, 2017
ff0b13d
minor fixes in emergent behavior experiments to make them compatible …
Aug 28, 2017
a359340
Merge pull request #135 from cathywu/multi_agent_vist
eugenevinitsky Aug 29, 2017
cdf4dd7
branch is working
Aug 29, 2017
33cce53
Merge branch 'master' of https://github.com/cathywu/learning-traffic
Aug 29, 2017
7f04d3a
added vehicles and routing classes
AboudyKreidieh Aug 31, 2017
9080116
fixing the merge
AboudyKreidieh Aug 31, 2017
b4c7627
added InitialConfig class
AboudyKreidieh Aug 31, 2017
011b080
merge
kanaadp Aug 31, 2017
4378fab
merge
kanaadp Aug 31, 2017
463d202
made comments obey pydoc
kanaadp Aug 30, 2017
1c07111
removed old cistar code
kanaadp Aug 31, 2017
e2f1fcb
added mulitagent rewards
kanaadp Aug 31, 2017
0ab10d4
added NetParams and InitialConfig classes, merged sumo_binary into su…
AboudyKreidieh Aug 31, 2017
aa08885
removed braess
kanaadp Aug 31, 2017
70484db
Merge branch 'cistar_release' of https://github.com/cathywu/learning-…
AboudyKreidieh Sep 1, 2017
cf0db8d
code clean up and correct set up of example experiments
kanaadp Sep 7, 2017
159733d
merge net params and cistar dev
kanaadp Sep 7, 2017
28c3d49
fixing missed merge issue
kanaadp Sep 7, 2017
10ba4ce
Merge branch 'aboudy_cistar_release_2' into cistar_release
kanaadp Sep 7, 2017
ccedd52
adding docs to cistar_release (#140)
nskh Sep 7, 2017
2c9a41d
make config file into a template, since everyone will have their own
cathywu Sep 13, 2017
49c1b1c
instructions for config
cathywu Sep 13, 2017
ae58112
removing xml files + minor changes
kanaadp Sep 14, 2017
d18598b
Merge branch 'cistar_release' of https://github.com/cathywu/learning-…
kanaadp Sep 14, 2017
30366eb
added tests, cleaned code, removed print statements
kanaadp Sep 14, 2017
5f4cd8d
changed naming of unit tests (to support nose2 discovery) and made th…
cathywu Sep 14, 2017
c50cc01
more deletes + code cleanup
kanaadp Sep 14, 2017
c539e9b
deleted deviations from params
kanaadp Sep 14, 2017
378b94d
modified documentation
AboudyKreidieh Sep 18, 2017
a75e337
updated documentation
AboudyKreidieh Sep 19, 2017
3587fdc
Fix unit tests, shorten tests, update requirements, remove a bunch of…
cathywu Sep 20, 2017
0e310b5
Update AWS_tutorial.md
nskh Sep 20, 2017
d325bb7
modified documentation
AboudyKreidieh Sep 21, 2017
6cbf760
removed sumo binary
kanaadp Sep 21, 2017
ea55a57
moved all files to cistar_dev and combined README.md's
kanaadp Sep 21, 2017
e0d15b3
removed cistar_dev folder, and moved everything the top level
kanaadp Sep 21, 2017
57e7091
removing old rl experiements
kanaadp Sep 21, 2017
a33ce28
removed init.py from base dir
kanaadp Sep 21, 2017
3159ce4
removed ngsim folder, added changes to intersection dist that views p…
Sep 21, 2017
0e2ab19
Merge branch 'cistar_release' of https://github.com/cathywu/learning-…
Sep 21, 2017
342c986
removed missing environments from envs/__init__
Sep 22, 2017
3fa2120
removed missing environments
Sep 22, 2017
3a5c97f
Revert "removed missing environments"
Sep 22, 2017
083a4b8
Merge branch 'cistar_release' of https://github.com/cathywu/learning-…
Sep 22, 2017
1227cae
system now accelerates vehicles with max accel when they pass the int…
Sep 23, 2017
f0da857
Revert "system now accelerates vehicles with max accel when they pass…
Sep 23, 2017
cfc8dc9
updated documentation
AboudyKreidieh Sep 25, 2017
9f69c29
added working rl intersection example to cistar_release
Sep 25, 2017
fcfafff
fixed visualizer to output plots correctly and work with new cistar v…
Sep 26, 2017
c413b79
fixed get_state bug
nskh Sep 28, 2017
bda1395
modified documentation and added option of noise to acceleration cont…
AboudyKreidieh Sep 29, 2017
a47fb34
modified inputs to gen functions
AboudyKreidieh Sep 30, 2017
c0e0aba
easier setup scripts
cathywu Oct 1, 2017
0870e8a
Merge branch 'cistar_release' of github.com:cathywu/learning-traffic …
cathywu Oct 1, 2017
bc2af67
Update Docker_Tutorial.md
eugenevinitsky Oct 3, 2017
b62c6ac
Update Docker_Tutorial.md
eugenevinitsky Oct 3, 2017
493d71c
Update Docker_Tutorial.md
eugenevinitsky Oct 3, 2017
21871f9
update base_env function for div by zero bug (#150)
albeaik Oct 4, 2017
566a0de
rename cistar to flow
kanaadp Oct 4, 2017
8c278c7
removed all traces of cistar, replaced with flow
kanaadp Oct 5, 2017
e38d22c
Merge branch 'cistar_release' of https://github.com/cathywu/learning-…
kanaadp Oct 5, 2017
43d6490
modified gitignore to ignore data and debug directories
nskh Oct 11, 2017
5834d57
a lottt of documentation
nskh Oct 11, 2017
e492275
merged a very small change from master (in Docker_Tutorial.md)
nskh Oct 11, 2017
8d8b8c0
Create CODEOWNERS
cathywu Oct 12, 2017
2782c30
updated tutorial to work with new flow changes
nskh Oct 12, 2017
9c774a2
Merge branch 'flow_release' of github.com:cathywu/learning-traffic in…
nskh Oct 12, 2017
66037ce
Merge branch 'master' of github.com:cathywu/flow into updating_tutorial
nskh Oct 13, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,5 @@ ENV/
# Custom for learning-traffic
.idea/**
Makefile
data/
debug/
13 changes: 13 additions & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Lines starting with '#' are comments.
# Each line is a file pattern followed by one or more owners.

# These owners will be the default owners for everything in the repo.
* @cathywu @eugenevinitsky @AboudyKreidieh @kanaadp

# Order is important. The last matching pattern has the most precedence.
# So if a pull request only touches javascript files, only these owners
# will be requested to review.
# *.js @octocat @github/js

# You can also use email addresses if you prefer.
docs/* @nskh
35 changes: 28 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
# flow_dev Documentation
[![Docs](https://readthedocs.org/projects/berkeleyflow/badge)](http://berkeleyflow.readthedocs.org/en/latest/)
[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/cathywu/flow/blob/master/LICENSE.md)

## Getting Started
# Flow

Flow is a a computational framework for deep RL and control experiments for traffic microsimulation.


# Documentation

Documentation is available online: [https://berkeleyflow.readthedocs.org/en/latest/](https://berkeleyflow.readthedocs.org/en/latest/).

# Citing Flow

If you use Flow for academic research, you are highly encouraged to cite our upcoming journal paper:

<!-- - Yan Duan, Xi Chen, Rein Houthooft, John Schulman, Pieter Abbeel. "[Benchmarking Deep Reinforcement Learning for Continuous Control](http://arxiv.org/abs/1604.06778)". _Proceedings of the 33rd International Conference on Machine Learning (ICML), 2016._ -->

# Credits

Flow was originally developed by members of [Professor Alexandre Bayen](http://bayen.eecs.berkeley.edu/)'s lab at UC Berkeley: Cathy Wu, Eugene Vinitsky, Kanaad Parvate, Aboudy Kreidieh, Nishant Kheterpal, Leah Dickstein, Nathan Mandi, Kathy Jang, and Ananth Kuchibhotla. Development on the framework continues by people at UC Berkeley.


<!-- ## Getting Started

- TODO: Tutorial for visualization / plot generating scripts

Expand Down Expand Up @@ -89,10 +110,10 @@ Development
from the project root directory:

ln -s ../../pre-commit.sh .git/hooks/pre-commit

Warnings:
====
All car controllers come equipped with a fail-safe rule wherein cars are not allowed to
move at a speed that would cause them to crash if the car in front of them suddenly started
breaking with max acceleration. If they attempt to do so, they will be reset to move at $$v_safe$$
where $$v_safe$$ is the speed such that the cars will come to rest at the same point.
All car controllers come equipped with a fail-safe rule wherein cars are not allowed to
move at a speed that would cause them to crash if the car in front of them suddenly started
breaking with max acceleration. If they attempt to do so, they will be reset to move at $$v_safe$$
where $$v_safe$$ is the speed such that the cars will come to rest at the same point. -->
14 changes: 9 additions & 5 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#
# import os
# import sys
# sys.path.insert(0, os.path.abspath('.'))
import os
import sys
sys.path.insert(0, os.path.abspath('../flow'))


# -- General configuration ------------------------------------------------
Expand All @@ -31,7 +31,11 @@
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.imgmath']
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.imgmath',
'sphinx.ext.viewcode', 'sphinx.ext.napoleon']
napoleon_google_docstring = False
napoleon_use_param = False
napoleon_use_ivar = True

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
Expand All @@ -46,7 +50,7 @@
master_doc = 'index'

# General information about the project.
project = 'flow'
project = 'Flow'
copyright = '2017, Cathy Wu'
author = 'Cathy Wu'

Expand Down
70 changes: 70 additions & 0 deletions docs/source/flow.controllers.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
flow\.controllers package
=========================

Submodules
----------

flow\.controllers\.base\_controller module
------------------------------------------

.. automodule:: flow.controllers.base_controller
:members:
:undoc-members:
:show-inheritance:

flow\.controllers\.base\_lane\_changing\_controller module
----------------------------------------------------------

.. automodule:: flow.controllers.base_lane_changing_controller
:members:
:undoc-members:
:show-inheritance:

flow\.controllers\.base\_routing\_controller module
---------------------------------------------------

.. automodule:: flow.controllers.base_routing_controller
:members:
:undoc-members:
:show-inheritance:

flow\.controllers\.car\_following\_models module
------------------------------------------------

.. automodule:: flow.controllers.car_following_models
:members:
:undoc-members:
:show-inheritance:

flow\.controllers\.lane\_change\_controllers module
---------------------------------------------------

.. automodule:: flow.controllers.lane_change_controllers
:members:
:undoc-members:
:show-inheritance:

flow\.controllers\.rlcontroller module
--------------------------------------

.. automodule:: flow.controllers.rlcontroller
:members:
:undoc-members:
:show-inheritance:

flow\.controllers\.routing\_controllers module
----------------------------------------------

.. automodule:: flow.controllers.routing_controllers
:members:
:undoc-members:
:show-inheritance:


Module contents
---------------

.. automodule:: flow.controllers
:members:
:undoc-members:
:show-inheritance:
86 changes: 86 additions & 0 deletions docs/source/flow.core.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
flow\.core package
==================

Submodules
----------

flow\.core\.config module
-------------------------

.. automodule:: flow.core.config
:members:
:undoc-members:
:show-inheritance:

flow\.core\.config\.template module
-----------------------------------

.. automodule:: flow.core.config.template
:members:
:undoc-members:
:show-inheritance:

flow\.core\.experiment module
-----------------------------

.. automodule:: flow.core.experiment
:members:
:undoc-members:
:show-inheritance:

flow\.core\.generator module
----------------------------

.. automodule:: flow.core.generator
:members:
:undoc-members:
:show-inheritance:

flow\.core\.multi\_agent\_rewards module
----------------------------------------

.. automodule:: flow.core.multi_agent_rewards
:members:
:undoc-members:
:show-inheritance:

flow\.core\.params module
-------------------------

.. automodule:: flow.core.params
:members:
:undoc-members:
:show-inheritance:

flow\.core\.rewards module
--------------------------

.. automodule:: flow.core.rewards
:members:
:undoc-members:
:show-inheritance:

flow\.core\.util module
-----------------------

.. automodule:: flow.core.util
:members:
:undoc-members:
:show-inheritance:

flow\.core\.vehicles module
---------------------------

.. automodule:: flow.core.vehicles
:members:
:undoc-members:
:show-inheritance:


Module contents
---------------

.. automodule:: flow.core
:members:
:undoc-members:
:show-inheritance:
78 changes: 78 additions & 0 deletions docs/source/flow.envs.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
flow\.envs package
==================

Submodules
----------

flow\.envs\.base\_env module
----------------------------

.. automodule:: flow.envs.base_env
:members:
:undoc-members:
:show-inheritance:

flow\.envs\.intersection\_env module
------------------------------------

.. automodule:: flow.envs.intersection_env
:members:
:undoc-members:
:show-inheritance:

flow\.envs\.lane\_changing module
---------------------------------

.. automodule:: flow.envs.lane_changing
:members:
:undoc-members:
:show-inheritance:

flow\.envs\.loop\_accel module
------------------------------

.. automodule:: flow.envs.loop_accel
:members:
:undoc-members:
:show-inheritance:

flow\.envs\.loop\_merges module
-------------------------------

.. automodule:: flow.envs.loop_merges
:members:
:undoc-members:
:show-inheritance:

flow\.envs\.loop\_with\_perturbation module
-------------------------------------------

.. automodule:: flow.envs.loop_with_perturbation
:members:
:undoc-members:
:show-inheritance:

flow\.envs\.two\_intersection module
------------------------------------

.. automodule:: flow.envs.two_intersection
:members:
:undoc-members:
:show-inheritance:

flow\.envs\.two\_loops\_one\_merging module
-------------------------------------------

.. automodule:: flow.envs.two_loops_one_merging
:members:
:undoc-members:
:show-inheritance:


Module contents
---------------

.. automodule:: flow.envs
:members:
:undoc-members:
:show-inheritance:
48 changes: 48 additions & 0 deletions docs/source/flow.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
Flow package
============

Subpackages
-----------

.. toctree::

flow.controllers
flow.core
flow.envs
flow.scenarios

Submodules
----------

flow\.visualizer\_CISTAR module
-------------------------------

.. automodule:: flow.visualizer_CISTAR
:members:
:undoc-members:
:show-inheritance:

flow\.visualizer\_CISTAR\_multiagent module
-------------------------------------------

.. automodule:: flow.visualizer_CISTAR_multiagent
:members:
:undoc-members:
:show-inheritance:

flow\.visualizer\_CISTAR\_tf module
-----------------------------------

.. automodule:: flow.visualizer_CISTAR_tf
:members:
:undoc-members:
:show-inheritance:


Module contents
---------------

.. automodule:: flow
:members:
:undoc-members:
:show-inheritance:
Loading