Skip to content

Commit e4a60d3

Browse files
committed
Renamed breaking_distance for more semantics
1 parent 8610bb0 commit e4a60d3

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

PythonAPI/carla/agents/conf/agent_settings_backend.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ class BehaviorAgentDistanceSettings(BasicAgentDistanceSettings):
271271
min_proximity_threshold : float = 10
272272
"""Range in which cars are detected. NOTE: Speed limit overwrites"""
273273

274-
braking_distance : float = 5
274+
emergency_braking_distance : float = 5
275275
"""Emergency Stop Distance Trigger"""
276276

277277

PythonAPI/carla/agents/conf/behavior_types.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Cautious(SimpleBehaviorAgentSettings):
1414
speed_decrease = 12
1515
safety_time = 3
1616
min_proximity_threshold = 12
17-
braking_distance = 6
17+
emergency_braking_distance = 6
1818
avoid_tailgators = True
1919

2020
@dataclass
@@ -25,7 +25,7 @@ class Normal(SimpleBehaviorAgentSettings):
2525
speed_decrease = 10
2626
safety_time = 3
2727
min_proximity_threshold = 10
28-
braking_distance = 5
28+
emergency_braking_distance = 5
2929
avoid_tailgators = True
3030

3131
@dataclass
@@ -36,5 +36,5 @@ class Aggressive(SimpleBehaviorAgentSettings):
3636
speed_decrease = 8
3737
safety_time = 3
3838
min_proximity_threshold = 8
39-
braking_distance = 4
39+
emergency_braking_distance = 4
4040
avoid_tailgators = False

PythonAPI/carla/agents/navigation/behavior_agent.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ def run_step(self, debug=False):
284284
self._vehicle.bounding_box.extent.y, self._vehicle.bounding_box.extent.x)
285285

286286
# Emergency brake if the car is very close.
287-
if distance < self.config.distance.braking_distance:
287+
if distance < self.config.distance.emergency_braking_distance:
288288
return self.emergency_stop()
289289

290290
# 2.2: Car following behaviors
@@ -298,7 +298,7 @@ def run_step(self, debug=False):
298298
self._vehicle.bounding_box.extent.y, self._vehicle.bounding_box.extent.x)
299299

300300
# Emergency brake if the car is very close.
301-
if distance < self.config.distance.braking_distance:
301+
if distance < self.config.distance.emergency_braking_distance:
302302
return self.emergency_stop()
303303
else:
304304
control = self.car_following_manager(vehicle, distance)

0 commit comments

Comments
 (0)