Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Done fix #955

Open
wants to merge 104 commits into
base: i210_dev
Choose a base branch
from
Open

Done fix #955

wants to merge 104 commits into from

Commits on Mar 28, 2020

  1. Added QMIX but its hella slow right now

    @eugenevinitsky
    eugenevinitsky committed Mar 28, 2020
    Configuration menu
    Copy the full SHA
    2c85838 View commit details
    Browse the repository at this point in the history

  2. Speedup

    @eugenevinitsky
    eugenevinitsky committed Mar 28, 2020
    Configuration menu
    Copy the full SHA
    ea470a3 View commit details
    Browse the repository at this point in the history

  3. Replace QMIX reward w global reward

    @eugenevinitsky
    eugenevinitsky committed Mar 28, 2020
    Configuration menu
    Copy the full SHA
    58f357c View commit details
    Browse the repository at this point in the history

  4. Disable RNN

    @eugenevinitsky
    eugenevinitsky committed Mar 28, 2020
    Configuration menu
    Copy the full SHA
    99f6c09 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2020

  1. Add an option for a local reward that just computes speed of the AV a… 

    …nd its follower
    @eugenevinitsky
    eugenevinitsky committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    942fe56 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'i210_dev_fix' into i210_qmix

    @eugenevinitsky
    eugenevinitsky committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    562bb0f View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2020

  1. Make speed square of rewards

    @eugenevinitsky
    eugenevinitsky committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    5c165fe View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2020

  1. Add QMIX and MADDPG

    @eugenevinitsky
    eugenevinitsky committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    29d16bb View commit details
    Browse the repository at this point in the history

  2. Turn on RNN

    @eugenevinitsky
    eugenevinitsky committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    0edfec6 View commit details
    Browse the repository at this point in the history

  3. Increase inflow in i210 subnetwork

    @eugenevinitsky
    eugenevinitsky committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    9d6344f View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2020

  1. Add option to reroute exiting vehicles back into the network

    @eugenevinitsky
    eugenevinitsky committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    f3e7ce8 View commit details
    Browse the repository at this point in the history

  2. Change the position at which vehicles are rerouted so tall the vehicl… 

    …es are immediately put back
    @eugenevinitsky
    eugenevinitsky committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    3600357 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2020

  1. Add single agent case

    @eugenevinitsky
    eugenevinitsky committed May 3, 2020
    Configuration menu
    Copy the full SHA
    fe05dcd View commit details
    Browse the repository at this point in the history

Commits on May 8, 2020

  1. Address comments

    @eugenevinitsky
    eugenevinitsky committed May 8, 2020
    Configuration menu
    Copy the full SHA
    72f8459 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'i210_dev' of github.com:flow-project/flow into rerouting

    @eugenevinitsky
    eugenevinitsky committed May 8, 2020
    Configuration menu
    Copy the full SHA
    304fcfc View commit details
    Browse the repository at this point in the history

  3. Pydoc style

    @eugenevinitsky
    eugenevinitsky committed May 8, 2020
    Configuration menu
    Copy the full SHA
    b80d441 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2020

  1. Merge branch 'i210_qmix' into flow_maddpg

    @eugenevinitsky
    eugenevinitsky committed May 9, 2020
    Configuration menu
    Copy the full SHA
    a93bf29 View commit details
    Browse the repository at this point in the history

  2. MADDPG is running but not training

    @eugenevinitsky
    eugenevinitsky committed May 9, 2020
    Configuration menu
    Copy the full SHA
    6c1ef8a View commit details
    Browse the repository at this point in the history

Commits on May 10, 2020

  1. Minor

    @eugenevinitsky
    eugenevinitsky committed May 10, 2020
    Configuration menu
    Copy the full SHA
    73fe421 View commit details
    Browse the repository at this point in the history

  2. But what if we just catch and ignore the exception

    @eugenevinitsky
    eugenevinitsky committed May 10, 2020
    Configuration menu
    Copy the full SHA
    ff2ca54 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:flow-project/flow into flow_maddpg

    @eugenevinitsky
    eugenevinitsky committed May 10, 2020
    Configuration menu
    Copy the full SHA
    7d0dafa View commit details
    Browse the repository at this point in the history

  4. Minor change to AMI to get sUMO version 1.1.0

    @eugenevinitsky
    eugenevinitsky committed May 10, 2020
    Configuration menu
    Copy the full SHA
    adfde0e View commit details
    Browse the repository at this point in the history

  5. Add MPG reward

    @eugenevinitsky
    eugenevinitsky committed May 10, 2020
    Configuration menu
    Copy the full SHA
    0556175 View commit details
    Browse the repository at this point in the history

  6. Commit for local reward tests

    @eugenevinitsky
    eugenevinitsky committed May 10, 2020
    Configuration menu
    Copy the full SHA
    1861051 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2020

  1. Add a centralized critic

    @eugenevinitsky
    eugenevinitsky committed May 11, 2020
    Configuration menu
    Copy the full SHA
    2cd6329 View commit details
    Browse the repository at this point in the history

  2. Add curricula over speed and headway

    @eugenevinitsky
    eugenevinitsky committed May 11, 2020
    Configuration menu
    Copy the full SHA
    9a2a4a6 View commit details
    Browse the repository at this point in the history

  3. add timing, remove adaptive KL from PPO

    @eugenevinitsky
    eugenevinitsky committed May 11, 2020
    Configuration menu
    Copy the full SHA
    f1abcfe View commit details
    Browse the repository at this point in the history

  4. Minor fixes to KL

    @eugenevinitsky
    eugenevinitsky committed May 11, 2020
    Configuration menu
    Copy the full SHA
    f9e573d View commit details
    Browse the repository at this point in the history

  5. switch back to old AMI for testing purposes

    @eugenevinitsky
    eugenevinitsky committed May 11, 2020
    Configuration menu
    Copy the full SHA
    5605ec2 View commit details
    Browse the repository at this point in the history

  6. Disable custom PPO for a sec

    @eugenevinitsky
    eugenevinitsky committed May 11, 2020
    Configuration menu
    Copy the full SHA
    e5437d3 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2020

  1. Minor changes to centralized PPO to upgrade it to 0.9.0

    @eugenevinitsky
    eugenevinitsky committed May 12, 2020
    Configuration menu
    Copy the full SHA
    083aaee View commit details
    Browse the repository at this point in the history

  2. Visuallizer rllib fixes for centralized PPO

    @eugenevinitsky
    eugenevinitsky committed May 12, 2020
    Configuration menu
    Copy the full SHA
    ba3210f View commit details
    Browse the repository at this point in the history

  3. Add the ability to look back in the platoon for the MPG reward

    @eugenevinitsky
    eugenevinitsky committed May 12, 2020
    Configuration menu
    Copy the full SHA
    3f4da91 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2020

  1. Minor

    @eugenevinitsky
    eugenevinitsky committed May 13, 2020
    Configuration menu
    Copy the full SHA
    ad694c5 View commit details
    Browse the repository at this point in the history

  2. Add MPG reward

    @eugenevinitsky
    eugenevinitsky committed May 13, 2020
    Configuration menu
    Copy the full SHA
    429df10 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'i210_dev' into mpg_reward2

    @eugenevinitsky
    eugenevinitsky committed May 13, 2020
    Configuration menu
    Copy the full SHA
    da5c054 View commit details
    Browse the repository at this point in the history

  4. Flake8

    @eugenevinitsky
    eugenevinitsky committed May 13, 2020
    Configuration menu
    Copy the full SHA
    76707c1 View commit details
    Browse the repository at this point in the history

  5. Minor

    @eugenevinitsky
    eugenevinitsky committed May 13, 2020
    Configuration menu
    Copy the full SHA
    4b615b4 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2020

  1. Minor

    @eugenevinitsky
    eugenevinitsky committed May 14, 2020
    Configuration menu
    Copy the full SHA
    ac8e206 View commit details
    Browse the repository at this point in the history

  2. Flake8

    @eugenevinitsky
    eugenevinitsky committed May 14, 2020
    Configuration menu
    Copy the full SHA
    2f823d8 View commit details
    Browse the repository at this point in the history

  3. Pydoc style

    @eugenevinitsky
    eugenevinitsky committed May 14, 2020
    Configuration menu
    Copy the full SHA
    91f1498 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'mpg_reward' into mpg_reward2

    @eugenevinitsky
    eugenevinitsky committed May 14, 2020
    Configuration menu
    Copy the full SHA
    c783b09 View commit details
    Browse the repository at this point in the history

  5. Minor

    @eugenevinitsky
    eugenevinitsky committed May 14, 2020
    Configuration menu
    Copy the full SHA
    44d682c View commit details
    Browse the repository at this point in the history

  6. Fix none condition handling

    @eugenevinitsky
    eugenevinitsky committed May 14, 2020
    Configuration menu
    Copy the full SHA
    1b3172e View commit details
    Browse the repository at this point in the history

  7. Merge branch 'mpg_reward' into mpg_reward2

    @eugenevinitsky
    eugenevinitsky committed May 14, 2020
    Configuration menu
    Copy the full SHA
    01cf922 View commit details
    Browse the repository at this point in the history

  8. Minor

    @eugenevinitsky
    eugenevinitsky committed May 14, 2020
    Configuration menu
    Copy the full SHA
    6d37f15 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2020

  1. Downgrade to 0.8.0

    @eugenevinitsky
    eugenevinitsky committed May 15, 2020
    Configuration menu
    Copy the full SHA
    12c0f36 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'mpg_reward2' into flow_maddpg

    @eugenevinitsky
    eugenevinitsky committed May 15, 2020
    Configuration menu
    Copy the full SHA
    d3e45b0 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2020

  1. removed sweep

    @AboudyKreidieh
    AboudyKreidieh committed May 16, 2020
    Configuration menu
    Copy the full SHA
    de4b21d View commit details
    Browse the repository at this point in the history

  2. added updated single lane highway network config

    @AboudyKreidieh
    AboudyKreidieh committed May 16, 2020
    Configuration menu
    Copy the full SHA
    62afe9c View commit details
    Browse the repository at this point in the history

  3. added i210 xml files with downstream edge

    @AboudyKreidieh
    AboudyKreidieh committed May 16, 2020
    Configuration menu
    Copy the full SHA
    b52d90a View commit details
    Browse the repository at this point in the history

  4. added I210Router

    @AboudyKreidieh
    AboudyKreidieh committed May 16, 2020
    Configuration menu
    Copy the full SHA
    c370460 View commit details
    Browse the repository at this point in the history

  5. added updated i210 features

    @AboudyKreidieh
    AboudyKreidieh committed May 16, 2020
    Configuration menu
    Copy the full SHA
    4525a7a View commit details
    Browse the repository at this point in the history

  6. minor cleanup

    @AboudyKreidieh
    AboudyKreidieh committed May 16, 2020
    Configuration menu
    Copy the full SHA
    ed8506a View commit details
    Browse the repository at this point in the history

Commits on May 18, 2020

  1. better parameters based on when congestion propagates

    @AboudyKreidieh
    AboudyKreidieh committed May 18, 2020
    Configuration menu
    Copy the full SHA
    6c90517 View commit details
    Browse the repository at this point in the history

  2. bug fixes

    @AboudyKreidieh
    AboudyKreidieh committed May 18, 2020
    Configuration menu
    Copy the full SHA
    be0eb25 View commit details
    Browse the repository at this point in the history

  3. bug fixes

    @AboudyKreidieh
    AboudyKreidieh committed May 18, 2020
    Configuration menu
    Copy the full SHA
    bdcfb96 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'i210-highway-updated' of https://github.com/flow-projec… 

    …t/flow into i210-highway-updated
    @AboudyKreidieh
    AboudyKreidieh committed May 18, 2020
    Configuration menu
    Copy the full SHA
    34acd0b View commit details
    Browse the repository at this point in the history

  5. more bug fixes

    @AboudyKreidieh
    AboudyKreidieh committed May 18, 2020
    Configuration menu
    Copy the full SHA
    2892a80 View commit details
    Browse the repository at this point in the history

  6. Fix gain on MPG

    @eugenevinitsky
    eugenevinitsky committed May 18, 2020
    Configuration menu
    Copy the full SHA
    c7567b6 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2020

  1. Merge straight road changes to multiagent straight road

    @eugenevinitsky
    eugenevinitsky committed May 19, 2020
    Configuration menu
    Copy the full SHA
    ba892f3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'i210_dev' of github.com:flow-project/flow into ev_i210_… 

    …highway_updated
    @eugenevinitsky
    eugenevinitsky committed May 19, 2020
    Configuration menu
    Copy the full SHA
    20c24ed View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ev_i210_highway_updated' into flow_maddpg

    @eugenevinitsky
    eugenevinitsky committed May 19, 2020
    Configuration menu
    Copy the full SHA
    c331817 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2020

  1. Add ability to control which lengths the control is applied on

    @eugenevinitsky
    eugenevinitsky committed May 20, 2020
    Configuration menu
    Copy the full SHA
    00f114c View commit details
    Browse the repository at this point in the history

Commits on May 21, 2020

  1. Move training iterations

    @eugenevinitsky
    eugenevinitsky committed May 21, 2020
    Configuration menu
    Copy the full SHA
    231f04f View commit details
    Browse the repository at this point in the history

  2. Turn off mpj reward

    @eugenevinitsky
    eugenevinitsky committed May 21, 2020
    Configuration menu
    Copy the full SHA
    c5a251e View commit details
    Browse the repository at this point in the history

  3. Minorg

    @eugenevinitsky
    eugenevinitsky committed May 21, 2020
    Configuration menu
    Copy the full SHA
    5fb28b8 View commit details
    Browse the repository at this point in the history

  4. MPG w/ curriculum test

    @eugenevinitsky
    eugenevinitsky committed May 21, 2020
    Configuration menu
    Copy the full SHA
    1895c4f View commit details
    Browse the repository at this point in the history

Commits on May 22, 2020

  1. Add stop penalty

    @eugenevinitsky
    eugenevinitsky committed May 22, 2020
    Configuration menu
    Copy the full SHA
    7772dfe View commit details
    Browse the repository at this point in the history

  2. Add accel_penalty

    @eugenevinitsky
    eugenevinitsky committed May 22, 2020
    Configuration menu
    Copy the full SHA
    5c79a8a View commit details
    Browse the repository at this point in the history

Commits on May 24, 2020

  1. Fix to space time diagram to update to new highway network

    @eugenevinitsky
    eugenevinitsky committed May 24, 2020
    Configuration menu
    Copy the full SHA
    45a8e0a View commit details
    Browse the repository at this point in the history

  2. Import georges I210 fixes

    @eugenevinitsky
    eugenevinitsky committed May 24, 2020
    Configuration menu
    Copy the full SHA
    cf579bf View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ev/george_fixes' into flow_maddpg

    @eugenevinitsky
    eugenevinitsky committed May 24, 2020
    Configuration menu
    Copy the full SHA
    a43bf81 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2020

  1. Add ghost cell template with correct priorities

    @eugenevinitsky
    eugenevinitsky committed May 26, 2020
    Configuration menu
    Copy the full SHA
    9a5b532 View commit details
    Browse the repository at this point in the history

  2. Update I210 to new model

    @eugenevinitsky
    eugenevinitsky committed May 26, 2020
    Configuration menu
    Copy the full SHA
    e6f7ef8 View commit details
    Browse the repository at this point in the history

  3. Add missing file

    @eugenevinitsky
    eugenevinitsky committed May 26, 2020
    Configuration menu
    Copy the full SHA
    2dfffc6 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2020

  1. Merge branch 'master' of github.com:flow-project/flow into flow_maddpg

    @eugenevinitsky
    eugenevinitsky committed May 27, 2020
    Configuration menu
    Copy the full SHA
    ce5710f View commit details
    Browse the repository at this point in the history

  2. Add handling of too many vehicles trying to reroute at once

    @eugenevinitsky
    eugenevinitsky committed May 27, 2020
    Configuration menu
    Copy the full SHA
    e400a38 View commit details
    Browse the repository at this point in the history

  3. Minor

    @eugenevinitsky
    eugenevinitsky committed May 27, 2020
    Configuration menu
    Copy the full SHA
    3d95f2d View commit details
    Browse the repository at this point in the history

  4. Shorten curriculum iters

    @eugenevinitsky
    eugenevinitsky committed May 27, 2020
    Configuration menu
    Copy the full SHA
    d4b76b1 View commit details
    Browse the repository at this point in the history

  5. Put back long curriculum

    @eugenevinitsky
    eugenevinitsky committed May 27, 2020
    Configuration menu
    Copy the full SHA
    72eda14 View commit details
    Browse the repository at this point in the history

  6. Remove MADDPG, QMIX

    @eugenevinitsky
    eugenevinitsky committed May 27, 2020
    Configuration menu
    Copy the full SHA
    ca6a567 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'i210_dev' into network_update

    @eugenevinitsky
    eugenevinitsky authored May 27, 2020
    Configuration menu
    Copy the full SHA
    82a29fc View commit details
    Browse the repository at this point in the history

  8. Switch V_DES to 5.0

    @eugenevinitsky
    eugenevinitsky committed May 27, 2020
    Configuration menu
    Copy the full SHA
    9d468d8 View commit details
    Browse the repository at this point in the history

  9. Bug fix for lead_obs false

    @eugenevinitsky
    eugenevinitsky committed May 27, 2020
    Configuration menu
    Copy the full SHA
    f678286 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2020

  1. Address comments

    @eugenevinitsky
    eugenevinitsky committed May 28, 2020
    Configuration menu
    Copy the full SHA
    bbb16ff View commit details
    Browse the repository at this point in the history

  2. Merge branch 'network_update' of github.com:flow-project/flow into ne… 

    …twork_update
    @eugenevinitsky
    eugenevinitsky committed May 28, 2020
    Configuration menu
    Copy the full SHA
    c311bf5 View commit details
    Browse the repository at this point in the history

  3. Add logging of number of cars

    @eugenevinitsky
    eugenevinitsky committed May 28, 2020
    Configuration menu
    Copy the full SHA
    c69b763 View commit details
    Browse the repository at this point in the history

  4. Remove clipping so failsafes can be applied

    @eugenevinitsky
    eugenevinitsky committed May 28, 2020
    Configuration menu
    Copy the full SHA
    bb37992 View commit details
    Browse the repository at this point in the history

  5. add logging of accel variation

    @eugenevinitsky
    eugenevinitsky committed May 28, 2020
    Configuration menu
    Copy the full SHA
    36e3619 View commit details
    Browse the repository at this point in the history

  6. Fix imports

    @eugenevinitsky
    eugenevinitsky committed May 28, 2020
    Configuration menu
    Copy the full SHA
    c6949bc View commit details
    Browse the repository at this point in the history

  7. Fix on-ramp code

    @eugenevinitsky
    eugenevinitsky committed May 28, 2020
    Configuration menu
    Copy the full SHA
    3dd87d0 View commit details
    Browse the repository at this point in the history

  8. Add scaling for stop and accel penalties, turn off reroute on exit

    @eugenevinitsky
    eugenevinitsky committed May 28, 2020
    Configuration menu
    Copy the full SHA
    620ddd3 View commit details
    Browse the repository at this point in the history

  9. Increase lookback length to 10

    @eugenevinitsky
    eugenevinitsky committed May 28, 2020
    Configuration menu
    Copy the full SHA
    89e8ae2 View commit details
    Browse the repository at this point in the history

  10. Exp 11 with lookback length of 5

    @eugenevinitsky
    eugenevinitsky committed May 28, 2020
    Configuration menu
    Copy the full SHA
    6333099 View commit details
    Browse the repository at this point in the history

  11. Set lb length to 10

    @eugenevinitsky
    eugenevinitsky committed May 28, 2020
    Configuration menu
    Copy the full SHA
    71e175f View commit details
    Browse the repository at this point in the history

  12. Add done conditions so vehicles that exit are done if reroute on exit… 

    … is false
    @eugenevinitsky
    eugenevinitsky committed May 28, 2020
    Configuration menu
    Copy the full SHA
    659b55c View commit details
    Browse the repository at this point in the history

Commits on May 29, 2020

  1. Merge branch 'network_update' into flow_maddpg

    @eugenevinitsky
    eugenevinitsky committed May 29, 2020
    Configuration menu
    Copy the full SHA
    7ce4f07 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2020

  1. Update lane change mode (#948) 

    * 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]>
    @Yasharzf @AboudyKreidieh
    Yasharzf and AboudyKreidieh authored Jun 11, 2020
    Configuration menu
    Copy the full SHA
    67dc121 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'i210_dev' of github.com:flow-project/flow into done_fix

    @eugenevinitsky
    eugenevinitsky committed Jun 11, 2020
    Configuration menu
    Copy the full SHA
    9e3e719 View commit details
    Browse the repository at this point in the history

  3. Flake8

    @eugenevinitsky
    eugenevinitsky committed Jun 11, 2020
    Configuration menu
    Copy the full SHA
    eb4b485 View commit details
    Browse the repository at this point in the history

  4. Pydoc fixes

    @eugenevinitsky
    eugenevinitsky committed Jun 11, 2020
    Configuration menu
    Copy the full SHA
    8950d69 View commit details
    Browse the repository at this point in the history

  5. Visualizer tests fixes

    @akashvelu
    akashvelu committed Jun 11, 2020
    Configuration menu
    Copy the full SHA
    7ce615e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'akash-visualize-test-bug' of github.com:flow-project/fl… 

    …ow into done_fix
    @eugenevinitsky
    eugenevinitsky committed Jun 11, 2020
    Configuration menu
    Copy the full SHA
    6b9bea9 View commit details
    Browse the repository at this point in the history