Skip to content

Commit 1be285b

Browse files
committed
doc and layout update
1 parent fbb60c8 commit 1be285b

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

PythonAPI/carla/agents/conf/agent_settings_backend.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,12 @@ class BasicAgentDistanceSettings(AgentConfig):
260260
@dataclass
261261
class BehaviorAgentDistanceSettings(BasicAgentDistanceSettings):
262262
"""
263-
Collision Avoidance -----
263+
Collision Avoidance
264+
-------------------
264265
265-
Distance in which for vehicles are checked:
266-
usage: max_distance = max(min_proximity_threshold, self._speed_limit / (2 if <LANE CHANGE> else 3 ) )
266+
Distance in which for vehicles are checked.
267+
268+
Usage: max_distance = max(min_proximity_threshold, self._speed_limit / (2 if <LANE CHANGE> else 3 ) )
267269
"""
268270

269271
min_proximity_threshold : float = 10
@@ -580,6 +582,8 @@ class BehaviorAgentEmergencySettings(BasicAgentEmergencySettings):
580582
pass
581583

582584

585+
# ---------------------
586+
# Final Settings
583587
# ---------------------
584588

585589
@dataclass
@@ -625,7 +629,7 @@ class AutopilotBehavior(AgentConfig):
625629
The distance is in meters and will affect the minimum moving distance. It is computed from front to back of the vehicle objects.
626630
"""
627631

628-
vehicle_percentage_speed_difference : float = 30
632+
vehicle_percentage_speed_difference : float = 30 # in percent
629633
"""
630634
Sets the difference the vehicle's intended speed and its current speed limit.
631635
Speed limits can be exceeded by setting the percentage to a negative value.
@@ -641,14 +645,8 @@ class AutopilotBehavior(AgentConfig):
641645

642646
update_vehicle_lights : bool = False
643647
"""Sets if the Traffic Manager is responsible of updating the vehicle lights, or not."""
644-
645-
646648

647649

648-
# ---------------------
649-
# Final Settings
650-
# ---------------------
651-
652650
@dataclass
653651
class BasicAgentSettings(AgentConfig):
654652
overwrites : Optional[Dict[str, dict]] = field(default_factory=dict, repr=False) # type: Optional[Dict[str, Union[dict|AgentConfig]]]
@@ -661,6 +659,7 @@ class BasicAgentSettings(AgentConfig):
661659
planner : BasicAgentPlannerSettings = field(default_factory=BasicAgentPlannerSettings, init=False)
662660
emergency : BasicAgentEmergencySettings = field(default_factory=BasicAgentEmergencySettings, init=False)
663661

662+
664663
@dataclass
665664
class BehaviorAgentSettings(AgentConfig):
666665
overwrites : Optional[Dict[str, dict]] = field(default_factory=dict, repr=False) # type: Optional[Dict[str, Union[dict|AgentConfig]]]
@@ -673,7 +672,7 @@ class BehaviorAgentSettings(AgentConfig):
673672
planner : BehaviorAgentPlannerSettings = field(default_factory=BehaviorAgentPlannerSettings, init=False)
674673
emergency : BehaviorAgentEmergencySettings = field(default_factory=BehaviorAgentEmergencySettings, init=False)
675674
avoid_tailgators : bool = True
676-
675+
677676
@dataclass
678677
class SimpleBasicAgentSettings(SimpleConfig, LiveInfo, BasicAgentSpeedSettings, BasicAgentDistanceSettings, BasicAgentLaneChangeSettings, BasicAgentObstacleSettings, BasicAgentControllerSettings, BasicAgentPlannerSettings, BasicAgentEmergencySettings):
679678
_base_settings :ClassVar[BasicAgentSettings] = BasicAgentSettings

0 commit comments

Comments
 (0)