p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[SUMO co-simulation] Fixed computing not allowed routes (#3129) 

* Fixed bug computing not allowed routes

* Removed trailing spaces

Co-authored-by: bernat <bernatx@gmail.com>
This commit is contained in:
joel-mb 2020-07-30 15:31:04 +02:00 committed by GitHub
parent 245cd0abe9
commit aeb30d6b5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,6 +1,7 @@
## Latest ## Latest
* Upgraded to AD RSS v4.0.1 supporting unstructured scenes and pedestrians, and fixed spdlog to v1.7.0 * Fixed a bug in `spawn_npc_sumo` script computing not allowed routes for a given vehicle class
* Upgraded to AD RSS v4.0.1 supporting unstructured scenes and pedestrians
* Fixed a bug where `get_traffic_light` would always return `None` * Fixed a bug where `get_traffic_light` would always return `None`
* Changed frozen behavior for traffic lights. It now affects to all traffic lights at the same time * Changed frozen behavior for traffic lights. It now affects to all traffic lights at the same time
* Added API function `freeze_all_traffic_lights` and `reset_group` * Added API function `freeze_all_traffic_lights` and `reset_group`

5
Co-Simulation/Sumo/spawn_npc_sumo.py
View File

@ -161,8 +161,11 @@ def main(args):
sumo_edges = sumo_net.getEdges() sumo_edges = sumo_net.getEdges()
for i in range(args.number_of_vehicles): for i in range(args.number_of_vehicles):
edge = random.choice(sumo_edges)
type_id = random.choice(blueprints) type_id = random.choice(blueprints)
vclass = vtypes[type_id]['vClass']
allowed_edges = [e for e in sumo_edges if e.allows(vclass)]
edge = random.choice(allowed_edges)
traci.route.add('route_{}'.format(i), [edge.getID()]) traci.route.add('route_{}'.format(i), [edge.getID()])
traci.vehicle.add('sumo_{}'.format(i), 'route_{}'.format(i), typeID=type_id) traci.vehicle.add('sumo_{}'.format(i), 'route_{}'.format(i), typeID=type_id)