Fix ring timespace

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,22 +1,10 @@
-<!--
-Thank you for contributing to Flow! 
+<!-- Thank you for contributing to Flow! -->
 
-Please make sure you keep the title of your pull request short and informative,
-and that you fill in the following template accurately (don't forget to remove
-the fields that you do not use and the example texts!). You can also add relevant labels in the right
-sidebar.
+## Status
+<!-- Ready to merge / Do not merge -->
 
--->
+Ready to merge
 
-## Pull request information
+## Description 
+<!-- Describe the changes introduced in this PR; keep it short and informative. -->
 
-- **Status**: ? (ready to merge / in development)
-- **Kind of changes**: ? (bug fix / new feature / documentation...)
-- **Related PR or issue**: ? (optional)
-
-## Description
-
-<!-- Describe all the changes introduced in this PR; keep it short and informative -->
-<!-- If it is a bug fix, describe what the bug was and how you fixed it -->
-
-? (general description)

.gitignore

@@ -111,3 +111,8 @@ flow.ang
 *.ang.old
 *.sang
 
+# local configuration file for data pipeline
+**/data_pipeline_config
+
+temp.pkl
+

.travis.yml

@@ -38,16 +38,16 @@ before_install:
 
   # Set up requirements for flow
   - conda env create -f environment.yml
-  - source activate flow
+  - source activate circles
 
   # [sumo] dependencies and binaries
-  - pushd $HOME/build/flow-project
+  - pushd $HOME/build/CIRCLES-consortium
   -     ./flow/scripts/setup_sumo_ubuntu1604.sh
   - popd
   - source ~/.bashrc
 
   # [aimsun] install the conda env and update the path to the env
-  - pushd $HOME/build/flow-project
+  - pushd $HOME/build/CIRCLES-consortium
   -     ./flow/scripts/setup_aimsun.sh
   - popd
   - source ~/.bashrc

environment.yml

@@ -1,4 +1,4 @@
-name: flow
+name: circles
 
 dependencies:
     - python==3.7.3
@@ -18,6 +18,7 @@ dependencies:
         - cached_property
         - joblib==0.10.3
         - matplotlib==3.0.0
+        - pandas==1.1.2
         - dill
         - lz4
         - ray==0.8.0
@@ -26,3 +27,5 @@ dependencies:
         - opencv-python
         - boto3==1.10.45
         - redis~=2.10.6
+        - tabulate
+        - pytz

examples/README.md

@@ -53,11 +53,11 @@ trained through RL algorithms provided by *RLlib*.
 To execute these examples, run
 
 ```shell script
-python train.py EXP_CONFIG --rl_trainer "rllib"
+python train.py EXP_CONFIG --rl_trainer "rllib" --algorithm <ALGORITHM NAME>
 ```
 where `EXP_CONFIG` is the name of the experiment configuration file, as located
-in `exp_configs/rl/singleagent` or  `exp_configs/rl/multiagent.`
-
+in `exp_configs/rl/singleagent` or  `exp_configs/rl/multiagent.` Here `<ALGORITHM NAME>`
+should be the name of your desired algorithm. Currently we support PPO and TD3.
 
 ### stable-baselines
 

examples/checkpoints/multiagent_i210/params.json

@@ -0,0 +1,139 @@
+{
+  "batch_mode": "truncate_episodes",
+  "callbacks": {
+    "on_episode_end": "<function setup_exps_rllib.<locals>.on_episode_end at 0x7f3b000ef0d0>",
+    "on_episode_start": "<function setup_exps_rllib.<locals>.on_episode_start at 0x7f3b004ed620>",
+    "on_episode_step": "<function setup_exps_rllib.<locals>.on_episode_step at 0x7f3b000ef048>",
+    "on_train_result": "<function setup_exps_rllib.<locals>.on_train_result at 0x7f3b000ef158>"
+  },
+  "clip_actions": true,
+  "clip_param": 0.3,
+  "clip_rewards": null,
+  "collect_metrics_timeout": 180,
+  "compress_observations": false,
+  "custom_resources_per_worker": {},
+  "eager": false,
+  "eager_tracing": false,
+  "entropy_coeff": 0.0,
+  "entropy_coeff_schedule": null,
+  "env": "I210MultiEnv-v2",
+  "env_config": {
+    "flow_params": "{\n    \"env\": {\n        \"additional_params\": {\n            \"accel_penalty\": 0.0025,\n            \"accumulated_reward\": true,\n            \"accumulated_reward_bonus\": 20,\n            \"accumulated_reward_interval_dist\": 50,\n            \"headway_curriculum\": false,\n            \"headway_curriculum_iters\": 100,\n            \"headway_reward_gain\": 2.0,\n            \"late_penalty\": false,\n            \"late_penalty_add_state\": true,\n            \"late_penalty_steps\": 500,\n            \"late_penalty_value\": -1.0,\n            \"lead_obs\": true,\n            \"local_reward\": true,\n            \"look_back_length\": 8,\n            \"max_accel\": 2.6,\n            \"max_decel\": 4.5,\n            \"max_downstream_speed\": 5.0,\n            \"max_num_agents\": 10,\n            \"min_downstream_speed\": 5.0,\n            \"min_time_headway\": 2.0,\n            \"mpg_reward\": false,\n            \"mpj_reward\": false,\n            \"no_control_edges\": [\n                \"ghost0\",\n                \"119257908#3\"\n            ],\n            \"penalize_accel\": false,\n            \"penalize_headway\": false,\n            \"penalize_headway_threshold\": 150,\n            \"penalize_headway_value\": -1.0,\n            \"penalize_stops\": false,\n            \"randomize_downstream_speed\": true,\n            \"reroute_on_exit\": false,\n            \"speed_curriculum\": true,\n            \"speed_curriculum_iters\": 20,\n            \"speed_reward_gain\": 5.0,\n            \"stop_penalty\": 0.01,\n            \"target_velocity\": 5.0,\n            \"warm_down\": false,\n            \"warm_down_steps\": 500\n        },\n        \"clip_actions\": true,\n        \"done_at_exit\": true,\n        \"evaluate\": false,\n        \"horizon\": 1000,\n        \"sims_per_step\": 3,\n        \"warmup_steps\": 600\n    },\n    \"env_name\": \"flow.envs.multiagent.i210.I210MultiEnv\",\n    \"exp_tag\": \"I_210_subnetwork\",\n    \"initial\": {\n        \"additional_params\": {},\n        \"bunching\": 0,\n        \"edges_distribution\": [\n            \"ghost0\",\n            \"119257914\",\n            \"119257908#0\",\n            \"119257908#1-AddedOnRampEdge\",\n            \"119257908#1\",\n            \"119257908#1-AddedOffRampEdge\",\n            \"119257908#2\",\n            \"119257908#3\",\n            \"27414345\",\n            \"27414342#0\",\n            \"27414342#1-AddedOnRampEdge\",\n            \"173381935\"\n        ],\n        \"lanes_distribution\": Infinity,\n        \"min_gap\": 0,\n        \"perturbation\": 0.0,\n        \"shuffle\": false,\n        \"spacing\": \"uniform\",\n        \"x0\": 0\n    },\n    \"net\": {\n        \"additional_params\": {\n            \"ghost_edge\": true,\n            \"on_ramp\": false\n        },\n        \"inflows\": {\n            \"_InFlows__flows\": [\n                {\n                    \"begin\": 1,\n                    \"departLane\": 0,\n                    \"departSpeed\": 25.5,\n                    \"edge\": \"ghost0\",\n                    \"end\": 86400,\n                    \"name\": \"flow_0\",\n                    \"vehsPerHour\": 1845,\n                    \"vtype\": \"human\"\n                },\n                {\n                    \"begin\": 1,\n                    \"departLane\": 0,\n                    \"departSpeed\": 25.5,\n                    \"edge\": \"ghost0\",\n                    \"end\": 86400,\n                    \"name\": \"flow_1\",\n                    \"vehsPerHour\": 205,\n                    \"vtype\": \"rl\"\n                },\n                {\n                    \"begin\": 1,\n                    \"departLane\": 1,\n                    \"departSpeed\": 25.5,\n                    \"edge\": \"ghost0\",\n                    \"end\": 86400,\n                    \"name\": \"flow_2\",\n                    \"vehsPerHour\": 1845,\n                    \"vtype\": \"human\"\n                },\n                {\n                    \"begin\": 1,\n                    \"departLane\": 1,\n                    \"departSpeed\": 25.5,\n                    \"edge\": \"ghost0\",\n                    \"end\": 86400,\n                    \"name\": \"flow_3\",\n                    \"vehsPerHour\": 205,\n                    \"vtype\": \"rl\"\n                },\n                {\n                    \"begin\": 1,\n                    \"departLane\": 2,\n                    \"departSpeed\": 25.5,\n                    \"edge\": \"ghost0\",\n                    \"end\": 86400,\n                    \"name\": \"flow_4\",\n                    \"vehsPerHour\": 1845,\n                    \"vtype\": \"human\"\n                },\n                {\n                    \"begin\": 1,\n                    \"departLane\": 2,\n                    \"departSpeed\": 25.5,\n                    \"edge\": \"ghost0\",\n                    \"end\": 86400,\n                    \"name\": \"flow_5\",\n                    \"vehsPerHour\": 205,\n                    \"vtype\": \"rl\"\n                },\n                {\n                    \"begin\": 1,\n                    \"departLane\": 3,\n                    \"departSpeed\": 25.5,\n                    \"edge\": \"ghost0\",\n                    \"end\": 86400,\n                    \"name\": \"flow_6\",\n                    \"vehsPerHour\": 1845,\n                    \"vtype\": \"human\"\n                },\n                {\n                    \"begin\": 1,\n                    \"departLane\": 3,\n                    \"departSpeed\": 25.5,\n                    \"edge\": \"ghost0\",\n                    \"end\": 86400,\n                    \"name\": \"flow_7\",\n                    \"vehsPerHour\": 205,\n                    \"vtype\": \"rl\"\n                },\n                {\n                    \"begin\": 1,\n                    \"departLane\": 4,\n                    \"departSpeed\": 25.5,\n                    \"edge\": \"ghost0\",\n                    \"end\": 86400,\n                    \"name\": \"flow_8\",\n                    \"vehsPerHour\": 1845,\n                    \"vtype\": \"human\"\n                },\n                {\n                    \"begin\": 1,\n                    \"departLane\": 4,\n                    \"departSpeed\": 25.5,\n                    \"edge\": \"ghost0\",\n                    \"end\": 86400,\n                    \"name\": \"flow_9\",\n                    \"vehsPerHour\": 205,\n                    \"vtype\": \"rl\"\n                }\n            ]\n        },\n        \"osm_path\": null,\n        \"template\": \"/home/ubuntu/flow/examples/exp_configs/templates/sumo/i210_with_ghost_cell_with_downstream.xml\"\n    },\n    \"network\": \"flow.networks.i210_subnetwork.I210SubNetwork\",\n    \"sim\": {\n        \"color_by_speed\": false,\n        \"disable_collisions\": true,\n        \"emission_path\": null,\n        \"force_color_update\": false,\n        \"lateral_resolution\": null,\n        \"load_state\": null,\n        \"no_step_log\": true,\n        \"num_clients\": 1,\n        \"overtake_right\": true,\n        \"port\": null,\n        \"print_warnings\": true,\n        \"pxpm\": 2,\n        \"render\": false,\n        \"restart_instance\": true,\n        \"save_render\": false,\n        \"save_state_file\": \"initial_state.xml\",\n        \"save_state_time\": null,\n        \"seed\": null,\n        \"show_radius\": false,\n        \"sight_radius\": 25,\n        \"sim_step\": 0.4,\n        \"teleport_time\": -1,\n        \"use_ballistic\": true\n    },\n    \"simulator\": \"traci\",\n    \"veh\": [\n        {\n            \"acceleration_controller\": [\n                \"IDMController\",\n                {\n                    \"a\": 1.3,\n                    \"b\": 2.0,\n                    \"display_warnings\": false,\n                    \"fail_safe\": [\n                        \"obey_speed_limit\",\n                        \"safe_velocity\",\n                        \"feasible_accel\"\n                    ],\n                    \"noise\": 0.3\n                }\n            ],\n            \"car_following_params\": {\n                \"controller_params\": {\n                    \"accel\": 2.6,\n                    \"carFollowModel\": \"IDM\",\n                    \"decel\": 4.5,\n                    \"impatience\": 0.5,\n                    \"maxSpeed\": 30,\n                    \"minGap\": 0.5,\n                    \"sigma\": 0.5,\n                    \"speedDev\": 0.1,\n                    \"speedFactor\": 1.0,\n                    \"tau\": 1.0\n                },\n                \"speed_mode\": 12\n            },\n            \"energy_model\": \"PDMCombustionEngine\",\n            \"initial_speed\": 0,\n            \"lane_change_controller\": [\n                \"SimLaneChangeController\",\n                {}\n            ],\n            \"lane_change_params\": {\n                \"controller_params\": {\n                    \"laneChangeModel\": \"LC2013\",\n                    \"lcCooperative\": \"1.0\",\n                    \"lcKeepRight\": \"1.0\",\n                    \"lcSpeedGain\": \"1.0\",\n                    \"lcStrategic\": \"1.0\"\n                },\n                \"lane_change_mode\": 1621\n            },\n            \"num_vehicles\": 0,\n            \"routing_controller\": null,\n            \"veh_id\": \"human\"\n        },\n        {\n            \"acceleration_controller\": [\n                \"RLController\",\n                {\n                    \"display_warnings\": false,\n                    \"fail_safe\": [\n                        \"obey_speed_limit\",\n                        \"safe_velocity\",\n                        \"feasible_accel\"\n                    ]\n                }\n            ],\n            \"car_following_params\": {\n                \"controller_params\": {\n                    \"accel\": 2.6,\n                    \"carFollowModel\": \"IDM\",\n                    \"decel\": 4.5,\n                    \"impatience\": 0.5,\n                    \"maxSpeed\": 30,\n                    \"minGap\": 0.5,\n                    \"sigma\": 0.5,\n                    \"speedDev\": 0.1,\n                    \"speedFactor\": 1.0,\n                    \"tau\": 1.0\n                },\n                \"speed_mode\": 12\n            },\n            \"energy_model\": \"PDMCombustionEngine\",\n            \"initial_speed\": 0,\n            \"lane_change_controller\": [\n                \"SimLaneChangeController\",\n                {}\n            ],\n            \"lane_change_params\": {\n                \"controller_params\": {\n                    \"laneChangeModel\": \"LC2013\",\n                    \"lcCooperative\": \"1.0\",\n                    \"lcKeepRight\": \"1.0\",\n                    \"lcSpeedGain\": \"1.0\",\n                    \"lcStrategic\": \"1.0\"\n                },\n                \"lane_change_mode\": 512\n            },\n            \"num_vehicles\": 0,\n            \"routing_controller\": null,\n            \"veh_id\": \"rl\"\n        }\n    ]\n}",
+    "run": "<class 'ray.rllib.agents.trainer_template.CustomPPOTrainer'>"
+  },
+  "evaluation_config": {},
+  "evaluation_interval": null,
+  "evaluation_num_episodes": 10,
+  "gamma": 0.995,
+  "grad_clip": null,
+  "horizon": 1000,
+  "ignore_worker_failures": false,
+  "input": "sampler",
+  "input_evaluation": [
+    "is",
+    "wis"
+  ],
+  "kl_coeff": 0.2,
+  "kl_target": 0.02,
+  "lambda": 0.97,
+  "local_tf_session_args": {
+    "inter_op_parallelism_threads": 8,
+    "intra_op_parallelism_threads": 8
+  },
+  "log_level": "WARN",
+  "log_sys_usage": true,
+  "lr": 0.0005,
+  "lr_schedule": null,
+  "memory": 0,
+  "memory_per_worker": 0,
+  "metrics_smoothing_episodes": 100,
+  "min_iter_time_s": 0,
+  "model": {
+    "conv_activation": "relu",
+    "conv_filters": null,
+    "custom_action_dist": null,
+    "custom_model": null,
+    "custom_options": {},
+    "custom_preprocessor": null,
+    "dim": 84,
+    "fcnet_activation": "tanh",
+    "fcnet_hiddens": [
+      32,
+      32
+    ],
+    "framestack": true,
+    "free_log_std": false,
+    "grayscale": false,
+    "lstm_cell_size": 256,
+    "lstm_use_prev_action_reward": false,
+    "max_seq_len": 20,
+    "no_final_linear": false,
+    "state_shape": null,
+    "use_lstm": false,
+    "vf_share_layers": true,
+    "zero_mean": true
+  },
+  "monitor": false,
+  "multiagent": {
+    "policies": {
+      "av": [
+        null,
+        "Box(5,)",
+        "Box(1,)",
+        {}
+      ]
+    },
+    "policies_to_train": null,
+    "policy_mapping_fn": "<function policy_mapping_fn at 0x7f3b004ed598>"
+  },
+  "no_done_at_end": true,
+  "no_eager_on_workers": false,
+  "num_cpus_for_driver": 1,
+  "num_cpus_per_worker": 1,
+  "num_envs_per_worker": 1,
+  "num_gpus": 0,
+  "num_gpus_per_worker": 0,
+  "num_sgd_iter": 10,
+  "num_workers": 17,
+  "object_store_memory": 0,
+  "object_store_memory_per_worker": 0,
+  "observation_filter": "NoFilter",
+  "optimizer": {},
+  "output": null,
+  "output_compress_columns": [
+    "obs",
+    "new_obs"
+  ],
+  "output_max_file_size": 67108864,
+  "postprocess_inputs": false,
+  "preprocessor_pref": "deepmind",
+  "remote_env_batch_wait_ms": 0,
+  "remote_worker_envs": false,
+  "sample_async": false,
+  "sample_batch_size": 200,
+  "seed": null,
+  "sgd_minibatch_size": 128,
+  "shuffle_buffer_size": 0,
+  "shuffle_sequences": true,
+  "simple_optimizer": false,
+  "soft_horizon": false,
+  "synchronize_filters": true,
+  "tf_session_args": {
+    "allow_soft_placement": true,
+    "device_count": {
+      "CPU": 1
+    },
+    "gpu_options": {
+      "allow_growth": true
+    },
+    "inter_op_parallelism_threads": 2,
+    "intra_op_parallelism_threads": 2,
+    "log_device_placement": false
+  },
+  "timesteps_per_iteration": 0,
+  "train_batch_size": 17000,
+  "use_gae": true,
+  "vf_clip_param": 10.0,
+  "vf_loss_coeff": 1.0,
+  "vf_share_layers": false
+}