Merge pull request #517 from flow-project/time_space_diagram

Time space diagram

- added a method for plotting time-space diagrams
- using the time-space diagrams to modify the vehicle parameters in the simulations to match expected behaviors in new sumo (more on this to come)
- tests for the new time-space diagram plotter

examples/rllab/figure_eight.py

@@ -27,6 +27,7 @@ def run_task(*_):
         routing_controller=(ContinuousRouter, {}),
         car_following_params=SumoCarFollowingParams(
             speed_mode="obey_safe_speed",
+            decel=1.5,
         ),
         num_vehicles=1)
     vehicles.add(
@@ -37,6 +38,7 @@ def run_task(*_):
         routing_controller=(ContinuousRouter, {}),
         car_following_params=SumoCarFollowingParams(
             speed_mode="obey_safe_speed",
+            decel=1.5,
         ),
         num_vehicles=13)
 

examples/rllib/figure_eight.py

@@ -35,6 +35,7 @@
     routing_controller=(ContinuousRouter, {}),
     car_following_params=SumoCarFollowingParams(
         speed_mode="obey_safe_speed",
+        decel=1.5,
     ),
     num_vehicles=13)
 vehicles.add(
@@ -43,6 +44,7 @@
     routing_controller=(ContinuousRouter, {}),
     car_following_params=SumoCarFollowingParams(
         speed_mode="obey_safe_speed",
+        decel=1.5,
     ),
     num_vehicles=1)
 

examples/sumo/figure_eight.py

@@ -41,6 +41,7 @@ def figure_eight_example(render=None):
         routing_controller=(ContinuousRouter, {}),
         car_following_params=SumoCarFollowingParams(
             speed_mode="obey_safe_speed",
+            decel=1.5,
         ),
         initial_speed=0,
         num_vehicles=14)

flow/benchmarks/figureeight0.py

@@ -29,6 +29,7 @@
     routing_controller=(ContinuousRouter, {}),
     car_following_params=SumoCarFollowingParams(
         speed_mode="obey_safe_speed",
+        decel=1.5,
     ),
     num_vehicles=13)
 vehicles.add(

flow/benchmarks/figureeight1.py

@@ -30,6 +30,7 @@
         routing_controller=(ContinuousRouter, {}),
         car_following_params=SumoCarFollowingParams(
             speed_mode="obey_safe_speed",
+            decel=1.5,
         ),
         num_vehicles=1)
     vehicles.add(

flow/scenarios/merge.py

@@ -99,7 +99,8 @@ def specify_nodes(self, net_params):
             {
                 "id": "center",
                 "y": 0,
-                "x": premerge
+                "x": premerge,
+                "radius": 10
             },
             {
                 "id": "right",
@@ -196,11 +197,11 @@ def specify_edge_starts(self):
         postmerge = self.net_params.additional_params["post_merge_length"]
 
         edgestarts = [("inflow_highway", 0), ("left", INFLOW_EDGE_LEN + 0.1),
-                      ("center", INFLOW_EDGE_LEN + premerge + 8.1),
+                      ("center", INFLOW_EDGE_LEN + premerge + 22.6),
                       ("inflow_merge",
-                       INFLOW_EDGE_LEN + premerge + postmerge + 8.1),
+                       INFLOW_EDGE_LEN + premerge + postmerge + 22.6),
                       ("bottom",
-                       2 * INFLOW_EDGE_LEN + premerge + postmerge + 8.2)]
+                       2 * INFLOW_EDGE_LEN + premerge + postmerge + 22.7)]
 
         return edgestarts
 
@@ -212,7 +213,7 @@ def specify_internal_edge_starts(self):
         internal_edgestarts = [
             (":left", INFLOW_EDGE_LEN), (":center",
                                          INFLOW_EDGE_LEN + premerge + 0.1),
-            (":bottom", 2 * INFLOW_EDGE_LEN + premerge + postmerge + 8.1)
+            (":bottom", 2 * INFLOW_EDGE_LEN + premerge + postmerge + 22.6)
         ]
 
         return internal_edgestarts

flow/utils/registry.py

@@ -32,6 +32,7 @@ def make_create_env(params, version=0, render=None):
          - exp_tag: name of the experiment
          - env_name: name of the flow environment the experiment is running on
          - scenario: name of the scenario class the experiment uses
+         - simulator: simulator that is used by the experiment (e.g. aimsun)
          - sim: simulation-related parameters (see flow.core.params.SimParams)
          - env: environment related parameters (see flow.core.params.EnvParams)
          - net: network-related parameters (see flow.core.params.NetParams and

flow/utils/rllib.py

@@ -57,17 +57,37 @@ def get_flow_params(config):
 
     Parameters
     ----------
-    config : dict
-        stored RLlib configuration dict
+    config : dict < dict > or str
+        May be one of two things:
+
+        * If it is a dict, then it is the stored RLlib configuration dict.
+        * If it is a string, then it is the path to a flow_params json file.
 
     Returns
     -------
     dict
-        Dict of flow parameters, like net_params, env_params, vehicle
-        characteristics, etc
+        flow-related parameters, consisting of the following keys:
+
+         * exp_tag: name of the experiment
+         * env_name: name of the flow environment the experiment is running on
+         * scenario: name of the scenario class the experiment uses
+         * simulator: simulator that is used by the experiment (e.g. aimsun)
+         * sim: simulation-related parameters (see flow.core.params.SimParams)
+         * env: environment related parameters (see flow.core.params.EnvParams)
+         * net: network-related parameters (see flow.core.params.NetParams and
+           the scenario's documentation or ADDITIONAL_NET_PARAMS component)
+         * veh: vehicles to be placed in the network at the start of a rollout
+           (see flow.core.params.VehicleParams)
+         * initial: parameters affecting the positioning of vehicles upon
+           initialization/reset (see flow.core.params.InitialConfig)
+         * tls: traffic lights to be introduced to specific nodes (see
+           flow.core.params.TrafficLightParams)
     """
     # collect all data from the json file
-    flow_params = json.loads(config['env_config']['flow_params'])
+    if type(config) == dict:
+        flow_params = json.loads(config['env_config']['flow_params'])
+    else:
+        flow_params = json.load(open(config, 'r'))
 
     # reinitialize the vehicles class from stored data
     veh = VehicleParams()

flow/version.py

@@ -1,3 +1,3 @@
 """Specifies the current version number of Flow."""
 
-__version__ = "0.3.0"
+__version__ = "0.3.1"