6934

pending completion

Build # 6934

Build Type

Pull #994

travis-ci-com

Committed by

web-flow

Commit Message

<a href="https://github.com/flow-project/flow/commit/<a class=hub.com/flow-project/flow/commit/<a class="double-link" href="https://git"><a class=hub.com/flow-project/flow/commit/<a class="double-link" href="https://git"><a class=hub.com/flow-project/flow/commit/<a class="double-link" href="https://git"><a class=hub.com/flow-project/flow/commit/<a class="double-link" href="https://git"><a class=hub.com/flow-project/flow/commit/027c6e09315c4abc5a03926881097c1742d362b6">027c6e093">&lt;a href=&quot;https://github.com/flow-project/flow/commit/</a><a class="double-link" href="https://github.com/flow-project/flow/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/flow-project/flow/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/flow-project/flow/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/flow-project/flow/commit/027c6e09315c4abc5a03926881097c1742d362b6">027c6e093</a><a href="https://github.com/flow-project/flow/commit/027c6e09315c4abc5a03926881097c1742d362b6">&lt;a href=&quot;https://github.com/flow-project/flow/commit/027c6e09315c4abc5a03926881097c1742d362b6&quot;&gt;&amp;quot;&amp;gt;&amp;amp;lt;a href=&amp;amp;quot;https://github.com/flow-project/flow/commit/&amp;lt;/a&amp;gt;&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://github.com/flow-project/flow/commit/&amp;amp;lt;a class=&amp;amp;quot;double-link&amp;amp;quot; href=&amp;amp;quot;https://git&amp;quot;&amp;gt;&amp;amp;lt;a class=&amp;lt;/a&amp;gt;hub.com/flow-project/flow/commit/027c6e09315c4abc5a03926881097c1742d362b6&amp;quot;&amp;gt;027c6e093&amp;lt;/a&amp;gt;&amp;lt;a href=&amp;quot;https://github.com/flow-project/flow/commit/027c6e09315c4abc5a03926881097c1742d362b6&amp;quot;&amp;gt;&amp;amp;lt;a href=&amp;amp;quot;https://github.com/flow-project/flow/commit/027c6e09315c4abc5a03926881097c17&amp;lt;/a&amp;gt;42d36</a>2b6&quot;&gt;&amp;quot;&amp;gt;Merge &amp;lt;/a&amp;gt;&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://github.com/flow-project/flow/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://github.com/flow-project/flow/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/flow-project/flow/commit/b5c2b21ab&quot;&gt;b5c2b21... (continued)

Pull Request Pull Request #994: Ak/i210 master merge

Run Details

259 of 259 new or added lines in 19 files covered. (100.0%)

9975 of 11912 relevant lines covered (83.74%)

0.84 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

90.16

/flow/utils/rllib.py

"""
Utility functions for Flow compatibility with RLlib.

This includes: environment generation, serialization, and visualization.
"""
import json
from copy import deepcopy
import os
import sys

import flow.envs
from flow.core.params import SumoLaneChangeParams, SumoCarFollowingParams, \
    SumoParams, InitialConfig, EnvParams, NetParams, InFlows
from flow.core.params import TrafficLightParams
from flow.core.params import VehicleParams
from flow.envs import Env
from flow.networks import Network
from ray.cloudpickle import cloudpickle
import inspect


class FlowParamsEncoder(json.JSONEncoder):
    """
    Custom encoder used to generate ``flow_params.json``.

    Extends ``json.JSONEncoder``.
    """

    def default(self, obj):
        """See parent class.

        Extended to support the VehicleParams object in flow/core/params.py.
        """
        allowed_types = [dict, list, tuple, str, int, float, bool, type(None)]

        if obj not in allowed_types:
            if isinstance(obj, VehicleParams):
                res = deepcopy(obj.initial)
                for res_i in res:
                    res_i["acceleration_controller"] = \
                        (res_i["acceleration_controller"][0].__name__,
                         res_i["acceleration_controller"][1])
                    res_i["lane_change_controller"] = \
                        (res_i["lane_change_controller"][0].__name__,
                         res_i["lane_change_controller"][1])
                    if res_i["routing_controller"] is not None:
                        res_i["routing_controller"] = \
                            (res_i["routing_controller"][0].__name__,
                             res_i["routing_controller"][1])
                return res
            if inspect.isclass(obj):
                if issubclass(obj, Env) or issubclass(obj, Network):
                    return "{}.{}".format(obj.__module__, obj.__name__)
            if hasattr(obj, '__name__'):
                return obj.__name__
            else:
                return obj.__dict__

        return json.JSONEncoder.default(self, obj)


def get_flow_params(config):
    """Return Flow experiment parameters, given an experiment result folder.

    Parameters
    ----------
    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
        flow-related parameters, consisting of the following keys:

         * exp_tag: name of the experiment
         * env_name: environment class of the flow environment the experiment
           is running on. (note: must be in an importable module.)
         * network: network 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 network'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
    if type(config) == dict:
        flow_params = json.loads(config['env_config']['flow_params'])
    else:
        flow_params = json.load(open(config, 'r'))
        if 'env_config' in flow_params:
            flow_params = json.loads(flow_params['env_config']['flow_params'])

    # reinitialize the vehicles class from stored data
    veh = VehicleParams()
    for veh_params in flow_params["veh"]:
        module = __import__(
            "flow.controllers",
            fromlist=[veh_params['acceleration_controller'][0]])
        acc_class = getattr(module, veh_params['acceleration_controller'][0])
        lc_class = getattr(module, veh_params['lane_change_controller'][0])

        acc_controller = (acc_class, veh_params['acceleration_controller'][1])
        lc_controller = (lc_class, veh_params['lane_change_controller'][1])

        rt_controller = None
        if veh_params['routing_controller'] is not None:
            rt_class = getattr(module, veh_params['routing_controller'][0])
            rt_controller = (rt_class, veh_params['routing_controller'][1])

        # TODO: make ambiguous
        car_following_params = SumoCarFollowingParams()
        car_following_params.__dict__ = veh_params["car_following_params"]

        # TODO: make ambiguous
        lane_change_params = SumoLaneChangeParams()
        lane_change_params.__dict__ = veh_params["lane_change_params"]

        del veh_params["car_following_params"], \
            veh_params["lane_change_params"], \
            veh_params["acceleration_controller"], \
            veh_params["lane_change_controller"], \
            veh_params["routing_controller"]

        veh.add(
            acceleration_controller=acc_controller,
            lane_change_controller=lc_controller,
            routing_controller=rt_controller,
            car_following_params=car_following_params,
            lane_change_params=lane_change_params,
            **veh_params)

    # convert all parameters from dict to their object form
    sim = SumoParams()  # TODO: add check for simulation type
    sim.__dict__ = flow_params["sim"].copy()

    net = NetParams()
    net.__dict__ = flow_params["net"].copy()
    net.inflows = InFlows()
    if flow_params["net"]["inflows"]:
        net.inflows.__dict__ = flow_params["net"]["inflows"].copy()

    if net.template is not None and len(net.template) > 0:
        dirname = os.getcwd()
        filename = os.path.join(dirname, '../../examples')
        split = net.template.split('examples')[1][1:]
        path = os.path.abspath(os.path.join(filename, split))
        net.template = path

    env = EnvParams()
    env.__dict__ = flow_params["env"].copy()

    initial = InitialConfig()
    if "initial" in flow_params:
        initial.__dict__ = flow_params["initial"].copy()

    tls = TrafficLightParams()
    if "tls" in flow_params:
        tls.__dict__ = flow_params["tls"].copy()

    env_name = flow_params['env_name']
    if "." not in env_name:  # coming from old flow_params
        single_agent_envs = [env for env in dir(flow.envs)
                             if not env.startswith('__')]
        if env_name in single_agent_envs:
            env_loc = 'flow.envs'
        else:
            env_loc = 'flow.envs.multiagent'
    else:
        env_loc = ".".join(env_name.split(".")[:-1])
        env_name = env_name.split(".")[-1]
    env_module = __import__(env_loc, fromlist=[env_name])
    env_instance = getattr(env_module, env_name)

    network = flow_params['network']
    if "." not in network:  # coming from old flow_params
        net_loc = 'flow.networks'
    else:
        net_loc = ".".join(network.split(".")[:-1])
        network = network.split(".")[-1]
    net_module = __import__(net_loc, fromlist=[network])
    net_instance = getattr(net_module, network)

    flow_params['env_name'] = env_instance
    flow_params['network'] = net_instance
    flow_params["sim"] = sim
    flow_params["env"] = env
    flow_params["initial"] = initial
    flow_params["net"] = net
    flow_params["veh"] = veh
    flow_params["tls"] = tls

    return flow_params


def get_rllib_config(path):
    """Return the data from the specified rllib configuration file."""
    config_path = os.path.join(path, "params.json")
    if not os.path.exists(config_path):
        config_path = os.path.join(path, "../params.json")
    if not os.path.exists(config_path):
        raise ValueError(
            "Could not find params.json in either the checkpoint dir or "
            "its parent directory.")
    with open(config_path) as f:
        config = json.load(f)
    return config


def get_rllib_pkl(path):
    """Return the data from the specified rllib configuration file."""
    dirname = os.path.dirname(__file__)
    filename = os.path.join(dirname, '../../examples/')
    sys.path.append(filename)
    config_path = os.path.join(path, "params.pkl")
    if not os.path.exists(config_path):
        config_path = os.path.join(path, "../params.pkl")
    if not os.path.exists(config_path):
        raise ValueError(
            "Could not find params.pkl in either the checkpoint dir or "
            "its parent directory.")
    with open(config_path, 'rb') as f:
        config = cloudpickle.load(f)
    return config

1	"""
2	Utility functions for Flow compatibility with RLlib.
3
4	This includes: environment generation, serialization, and visualization.
5	"""
6	import json	1✔
7	from copy import deepcopy	1✔
8	import os	1✔
9	import sys	1✔
10
11	import flow.envs	1✔
12	from flow.core.params import SumoLaneChangeParams, SumoCarFollowingParams, \	1✔
13	SumoParams, InitialConfig, EnvParams, NetParams, InFlows
14	from flow.core.params import TrafficLightParams	1✔
15	from flow.core.params import VehicleParams	1✔
16	from flow.envs import Env	1✔
17	from flow.networks import Network	1✔
18	from ray.cloudpickle import cloudpickle	1✔
19	import inspect	1✔
20
21
22	class FlowParamsEncoder(json.JSONEncoder):	1✔
23	"""
24	Custom encoder used to generate ``flow_params.json``.
25
26	Extends ``json.JSONEncoder``.
27	"""
28
29	def default(self, obj):	1✔
30	"""See parent class.
31
32	Extended to support the VehicleParams object in flow/core/params.py.
33	"""
34	allowed_types = [dict, list, tuple, str, int, float, bool, type(None)]	1✔
35
36	if obj not in allowed_types:	1✔
37	if isinstance(obj, VehicleParams):	1✔
38	res = deepcopy(obj.initial)	1✔
39	for res_i in res:	1✔
40	res_i["acceleration_controller"] = \	1✔
41	(res_i["acceleration_controller"][0].__name__,
42	res_i["acceleration_controller"][1])
43	res_i["lane_change_controller"] = \	1✔
44	(res_i["lane_change_controller"][0].__name__,
45	res_i["lane_change_controller"][1])
46	if res_i["routing_controller"] is not None:	1✔
47	res_i["routing_controller"] = \	1✔
48	(res_i["routing_controller"][0].__name__,
49	res_i["routing_controller"][1])
50	return res	1✔
51	if inspect.isclass(obj):	1✔
52	if issubclass(obj, Env) or issubclass(obj, Network):	1✔
53	return "{}.{}".format(obj.__module__, obj.__name__)	1✔
54	if hasattr(obj, '__name__'):	1✔
55	return obj.__name__	1✔
56	else:
57	return obj.__dict__	1✔
58
59	return json.JSONEncoder.default(self, obj)	×
60
61
62	def get_flow_params(config):	1✔
63	"""Return Flow experiment parameters, given an experiment result folder.
64
65	Parameters
66	----------
67	config : dict < dict > or str
68	May be one of two things:
69
70	* If it is a dict, then it is the stored RLlib configuration dict.
71	* If it is a string, then it is the path to a flow_params json file.
72
73	Returns
74	-------
75	dict
76	flow-related parameters, consisting of the following keys:
77
78	* exp_tag: name of the experiment
79	* env_name: environment class of the flow environment the experiment
80	is running on. (note: must be in an importable module.)
81	* network: network class the experiment uses.
82	* simulator: simulator that is used by the experiment (e.g. aimsun)
83	* sim: simulation-related parameters (see flow.core.params.SimParams)
84	* env: environment related parameters (see flow.core.params.EnvParams)
85	* net: network-related parameters (see flow.core.params.NetParams and
86	the network's documentation or ADDITIONAL_NET_PARAMS component)
87	* veh: vehicles to be placed in the network at the start of a rollout
88	(see flow.core.params.VehicleParams)
89	* initial: parameters affecting the positioning of vehicles upon
90	initialization/reset (see flow.core.params.InitialConfig)
91	* tls: traffic lights to be introduced to specific nodes (see
92	flow.core.params.TrafficLightParams)
93	"""
94	# collect all data from the json file
95	if type(config) == dict:	1✔
96	flow_params = json.loads(config['env_config']['flow_params'])	1✔
97	else:
98	flow_params = json.load(open(config, 'r'))	1✔
99	if 'env_config' in flow_params:	1✔
100	flow_params = json.loads(flow_params['env_config']['flow_params'])	×
101
102	# reinitialize the vehicles class from stored data
103	veh = VehicleParams()	1✔
104	for veh_params in flow_params["veh"]:	1✔
105	module = __import__(	1✔
106	"flow.controllers",
107	fromlist=[veh_params['acceleration_controller'][0]])
108	acc_class = getattr(module, veh_params['acceleration_controller'][0])	1✔
109	lc_class = getattr(module, veh_params['lane_change_controller'][0])	1✔
110
111	acc_controller = (acc_class, veh_params['acceleration_controller'][1])	1✔
112	lc_controller = (lc_class, veh_params['lane_change_controller'][1])	1✔
113
114	rt_controller = None	1✔
115	if veh_params['routing_controller'] is not None:	1✔
116	rt_class = getattr(module, veh_params['routing_controller'][0])	1✔
117	rt_controller = (rt_class, veh_params['routing_controller'][1])	1✔
118
119	# TODO: make ambiguous
120	car_following_params = SumoCarFollowingParams()	1✔
121	car_following_params.__dict__ = veh_params["car_following_params"]	1✔
122
123	# TODO: make ambiguous
124	lane_change_params = SumoLaneChangeParams()	1✔
125	lane_change_params.__dict__ = veh_params["lane_change_params"]	1✔
126
127	del veh_params["car_following_params"], \	1✔
128	veh_params["lane_change_params"], \
129	veh_params["acceleration_controller"], \
130	veh_params["lane_change_controller"], \
131	veh_params["routing_controller"]
132
133	veh.add(	1✔
134	acceleration_controller=acc_controller,
135	lane_change_controller=lc_controller,
136	routing_controller=rt_controller,
137	car_following_params=car_following_params,
138	lane_change_params=lane_change_params,
139	**veh_params)
140
141	# convert all parameters from dict to their object form
142	sim = SumoParams() # TODO: add check for simulation type	1✔
143	sim.__dict__ = flow_params["sim"].copy()	1✔
144
145	net = NetParams()	1✔
146	net.__dict__ = flow_params["net"].copy()	1✔
147	net.inflows = InFlows()	1✔
148	if flow_params["net"]["inflows"]:	1✔
149	net.inflows.__dict__ = flow_params["net"]["inflows"].copy()	1✔
150
151	if net.template is not None and len(net.template) > 0:	1✔
152	dirname = os.getcwd()	×
153	filename = os.path.join(dirname, '../../examples')	×
154	split = net.template.split('examples')[1][1:]	×
155	path = os.path.abspath(os.path.join(filename, split))	×
156	net.template = path	×
157
158	env = EnvParams()	1✔
159	env.__dict__ = flow_params["env"].copy()	1✔
160
161	initial = InitialConfig()	1✔
162	if "initial" in flow_params:	1✔
163	initial.__dict__ = flow_params["initial"].copy()	1✔
164
165	tls = TrafficLightParams()	1✔
166	if "tls" in flow_params:	1✔
167	tls.__dict__ = flow_params["tls"].copy()	1✔
168
169	env_name = flow_params['env_name']	1✔
170	if "." not in env_name: # coming from old flow_params	1✔
171	single_agent_envs = [env for env in dir(flow.envs)	1✔
172	if not env.startswith('__')]
173	if env_name in single_agent_envs:	1✔
174	env_loc = 'flow.envs'	1✔
175	else:
176	env_loc = 'flow.envs.multiagent'	×
177	else:
178	env_loc = ".".join(env_name.split(".")[:-1])	1✔
179	env_name = env_name.split(".")[-1]	1✔
180	env_module = __import__(env_loc, fromlist=[env_name])	1✔
181	env_instance = getattr(env_module, env_name)	1✔
182
183	network = flow_params['network']	1✔
184	if "." not in network: # coming from old flow_params	1✔
185	net_loc = 'flow.networks'	1✔
186	else:
187	net_loc = ".".join(network.split(".")[:-1])	1✔
188	network = network.split(".")[-1]	1✔
189	net_module = __import__(net_loc, fromlist=[network])	1✔
190	net_instance = getattr(net_module, network)	1✔
191
192	flow_params['env_name'] = env_instance	1✔
193	flow_params['network'] = net_instance	1✔
194	flow_params["sim"] = sim	1✔
195	flow_params["env"] = env	1✔
196	flow_params["initial"] = initial	1✔
197	flow_params["net"] = net	1✔
198	flow_params["veh"] = veh	1✔
199	flow_params["tls"] = tls	1✔
200
201	return flow_params	1✔
202
203
204	def get_rllib_config(path):	1✔
205	"""Return the data from the specified rllib configuration file."""
206	config_path = os.path.join(path, "params.json")	1✔
207	if not os.path.exists(config_path):	1✔
208	config_path = os.path.join(path, "../params.json")	×
209	if not os.path.exists(config_path):	1✔
210	raise ValueError(	×
211	"Could not find params.json in either the checkpoint dir or "
212	"its parent directory.")
213	with open(config_path) as f:	1✔
214	config = json.load(f)	1✔
215	return config	1✔
216
217
218	def get_rllib_pkl(path):	1✔
219	"""Return the data from the specified rllib configuration file."""
220	dirname = os.path.dirname(__file__)	1✔
221	filename = os.path.join(dirname, '../../examples/')	1✔
222	sys.path.append(filename)	1✔
223	config_path = os.path.join(path, "params.pkl")	1✔
224	if not os.path.exists(config_path):	1✔
225	config_path = os.path.join(path, "../params.pkl")	×
226	if not os.path.exists(config_path):	1✔
227	raise ValueError(	×
228	"Could not find params.pkl in either the checkpoint dir or "
229	"its parent directory.")
230	with open(config_path, 'rb') as f:	1✔
231	config = cloudpickle.load(f)	1✔
232	return config	1✔

flow-project / flow / 6934

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous