Skip to content

Commit af2061a

Browse files
authored
fix doc artifact link in CI (AtsushiSakai#660)
1 parent 38261ec commit af2061a

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

PathPlanning/HybridAStar/car.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
import numpy as np
1313
from scipy.spatial.transform import Rotation as Rot
1414

15-
WB = 3. # rear to front wheel
16-
W = 2. # width of car
15+
WB = 3.0 # rear to front wheel
16+
W = 2.0 # width of car
1717
LF = 3.3 # distance from rear to vehicle front end
1818
LB = 1.0 # distance from rear to vehicle back end
1919
MAX_STEER = 0.6 # [rad] maximum steering angle
2020

21-
W_BUBBLE_DIST = (LF - LB) / 2.0
22-
W_BUBBLE_R = sqrt(((LF + LB) / 2.0) ** 2 + 1)
21+
BUBBLE_DIST = (LF - LB) / 2.0 # distance from rear to center of vehicle.
22+
BUBBLE_R = np.hypot((LF + LB) / 2.0, W / 2.0) # bubble radius
2323

2424
# vehicle rectangle vertices
2525
VRX = [LF, LF, -LB, -LB, LF]
@@ -28,10 +28,10 @@
2828

2929
def check_car_collision(x_list, y_list, yaw_list, ox, oy, kd_tree):
3030
for i_x, i_y, i_yaw in zip(x_list, y_list, yaw_list):
31-
cx = i_x + W_BUBBLE_DIST * cos(i_yaw)
32-
cy = i_y + W_BUBBLE_DIST * sin(i_yaw)
31+
cx = i_x + BUBBLE_DIST * cos(i_yaw)
32+
cy = i_y + BUBBLE_DIST * sin(i_yaw)
3333

34-
ids = kd_tree.query_ball_point([cx, cy], W_BUBBLE_R)
34+
ids = kd_tree.query_ball_point([cx, cy], BUBBLE_R)
3535

3636
if not ids:
3737
continue

PathPlanning/HybridAStar/hybrid_a_star.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
try:
2121
from dynamic_programming_heuristic import calc_distance_heuristic
2222
import reeds_shepp_path_planning as rs
23-
from car import move, check_car_collision, MAX_STEER, WB, plot_car
23+
from car import move, check_car_collision, MAX_STEER, WB, plot_car,\
24+
BUBBLE_R
2425
except Exception:
2526
raise
2627

2728
XY_GRID_RESOLUTION = 2.0 # [m]
2829
YAW_GRID_RESOLUTION = np.deg2rad(15.0) # [rad]
2930
MOTION_RESOLUTION = 0.1 # [m] path interpolate resolution
3031
N_STEER = 20 # number of steer command
31-
VR = 1.0 # robot radius
3232

3333
SB_COST = 100.0 # switch back penalty cost
3434
BACK_COST = 5.0 # backward penalty cost
@@ -276,7 +276,7 @@ def hybrid_a_star_planning(start, goal, ox, oy, xy_resolution, yaw_resolution):
276276

277277
h_dp = calc_distance_heuristic(
278278
goal_node.x_list[-1], goal_node.y_list[-1],
279-
ox, oy, xy_resolution, VR)
279+
ox, oy, xy_resolution, BUBBLE_R)
280280

281281
pq = []
282282
openList[calc_index(start_node, config)] = start_node

0 commit comments

Comments
 (0)