Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 15 additions & 18 deletions src/Active-Lane-Keeping-Assistant/agent.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
from __future__ import annotations

import os
import matplotlib.pyplot as plt
import numpy as np
import os

class Agent():
"""Agent that outputs the desired behaviour given
"""
SIMPLE_STEER_LIMIT = 0.75
SIMPLE_ERROR_TOLERANCE = 0.1
def __init__(self, tau_p:float = 0, tau_d:float = 0, tau_i:float = 0,
surface_lower_threshold:float = 20e6, throttle:float = 0.3,
suface_upper_threshold=30e6, controller:str = 'simple') -> None:

def __init__(self,
tau_p: float = 0,
tau_d: float = 0,
tau_i: float = 0,
surface_lower_threshold: float = 20e6,
throttle: float = 0.3,
surface_upper_threshold: float = 30e6, # Fixed typo: suface -> surface
controller: str = 'simple') -> None:
"""Constructor

Args:
Expand Down Expand Up @@ -43,7 +49,7 @@ def __init__(self, tau_p:float = 0, tau_d:float = 0, tau_i:float = 0,
self.tau_d = tau_d
self.tau_i = tau_i
self.surface_lower_threshold = surface_lower_threshold
self.surface_upper_threshold = suface_upper_threshold
self.surface_upper_threshold = surface_upper_threshold # Fixed assignment
self.prev_error = None
self.throttle = throttle
self.func = None
Expand Down Expand Up @@ -115,20 +121,10 @@ def save_error_fig(self, path:str, id:str) -> None:

def get_actions(self, detection_surface_area:float,
error:float) -> tuple[float, float]:
"""Retrieve action based on Observation

Args:
error (float): Difference to the center of the detected lane.
detection_surface_area (float): Detected surface area.

Returns:
tuple[float, float]:
[0]: Steering angle to use.
[1]: Throttle to apply.
"""
if (self.check_surface_area(detection_surface_area)):
steer = 0
if len(self.errors) > 0:
if self.errors:
self.errors.append(self.errors[-1])
else:
self.errors.append(0)
Expand Down Expand Up @@ -179,9 +175,10 @@ def _pd_controller(self, error:float) -> float:
self.prev_error = self.errors[-2]
else:
self.prev_error = self.errors[-1]

deviation = error - self.prev_error
steer = - self.tau_d * deviation/0.1 + self._p_controller(error)
dt = 0.1 # Delta time
steer = - self.tau_d * deviation / dt + self._p_controller(error)
return steer

def _pid_controller(self, error:float) -> float:
Expand Down
14 changes: 12 additions & 2 deletions src/Active-Lane-Keeping-Assistant/lane.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ class Lane:
ROI_TOP = 260
ROI_LEFT = 200
ROI_RIGHT = 440
# === 新增 ===
MARGIN_RATIO = 1.0 / 12.0
# ===========
def __init__(self, height:int, width:int, save:bool=False,
save_folder:str=join('img', 'examples')) -> None:
"""Constructor
Expand All @@ -32,7 +35,7 @@ def __init__(self, height:int, width:int, save:bool=False,
self.save_folder = save_folder
self.img_height = height
self.img_width = width
self.margin = int((1/12) * self.img_width)
self.margin = int(self.MARGIN_RATIO * self.img_width)
self.DEGREE = 2

# Variables to store for lines
Expand Down Expand Up @@ -63,7 +66,14 @@ def get_lines(self, img:np.ndarray) -> np.ndarray:
# Create threshold matrix to differentiate black and white based on the
# lightness (of HSL).
_, binary = cv2.threshold(hls[:, :, 1], self.HLS_L_THRESHOLD_MIN, self.HLS_L_THRESHOLD_MAX, cv2.THRESH_BINARY)
binary_blured = cv2.GaussianBlur(binary, (3, 3), 0)

# [Perception] Apply Morphological Closing to fill gaps in lane lines
# and remove small noise dots.
kernel = np.ones((5, 5), np.uint8)
binary_closed = cv2.morphologyEx(binary, cv2.MORPH_CLOSE, kernel)

# Blur the processed image
binary_blured = cv2.GaussianBlur(binary_closed, (3, 3), 0)

if self.save:
cv2.imwrite(join(self.save_folder, 'lines.jpg'), binary_blured)
Expand Down
7 changes: 4 additions & 3 deletions src/Active-Lane-Keeping-Assistant/world.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ def reset(self) -> tuple[float, float, np.ndarray, bool]:
self.collision_sensor = self.world.spawn_actor(blueprint,
carla.Transform(), attach_to=self.vehicle)
self.collision_detected = False
self.collision_sensor.listen(lambda e: {self._set_collision()})
# Remove redundant set brackets
self.collision_sensor.listen(lambda e: self._set_collision())
self.initialized = True

return 0.0, 0.0, np.zeros((self.image_height, self.image_width, 3)), False
Expand Down Expand Up @@ -203,8 +204,8 @@ def step(self, show: bool = True, throttle: float = 0,
transformed_image, error, detection_surface_area = self.lane \
.pipe(img=image)

#if show:
#World.show_image(image=transformed_image)
if show:
World.show_image(image=transformed_image)

return error, detection_surface_area, transformed_image, \
self.collision_detected
Loading