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

Fixed bug related to RoadOptions

This commit is contained in:
Guillermo 2021-01-27 11:09:17 +01:00 committed by bernat
parent 35c35c0055
commit 18f2558223
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,3 +1,8 @@
## Latest
* Fixed bug causing the RoadOptions at the BehaviorAgent to not work as intended
## CARLA 0.9.11 ## CARLA 0.9.11
* Improved the documentation for use with pandoc tool by converting html tags to their markdown equivalent * Improved the documentation for use with pandoc tool by converting html tags to their markdown equivalent

3
PythonAPI/carla/agents/navigation/behavior_agent.py
View File

@ -12,7 +12,8 @@ import random
import numpy as np import numpy as np
import carla import carla
from agents.navigation.agent import Agent from agents.navigation.agent import Agent
from agents.navigation.local_planner_behavior import LocalPlanner, RoadOption from agents.navigation.local_planner_behavior import LocalPlanner
from agents.navigation.local_planner import RoadOption
from agents.navigation.global_route_planner import GlobalRoutePlanner from agents.navigation.global_route_planner import GlobalRoutePlanner
from agents.navigation.global_route_planner_dao import GlobalRoutePlannerDAO from agents.navigation.global_route_planner_dao import GlobalRoutePlannerDAO
from agents.navigation.types_behavior import Cautious, Aggressive, Normal from agents.navigation.types_behavior import Cautious, Aggressive, Normal

15
PythonAPI/carla/agents/navigation/local_planner_behavior.py
View File

@ -14,23 +14,10 @@ from enum import Enum
import carla import carla
from agents.navigation.controller import VehiclePIDController from agents.navigation.controller import VehiclePIDController
from agents.navigation.local_planner import RoadOption
from agents.tools.misc import distance_vehicle, draw_waypoints from agents.tools.misc import distance_vehicle, draw_waypoints
class RoadOption(Enum):
"""
RoadOption represents the possible topological configurations
when moving from a segment of lane to other.
"""
VOID = -1
LEFT = 1
RIGHT = 2
STRAIGHT = 3
LANEFOLLOW = 4
CHANGELANELEFT = 5
CHANGELANERIGHT = 6
class LocalPlanner(object): class LocalPlanner(object):
""" """
LocalPlanner implements the basic behavior of following a trajectory LocalPlanner implements the basic behavior of following a trajectory