Skip to content

Commit 0a42ae7

Browse files
committed
try remove pycubicspline dependency
1 parent 584dbd2 commit 0a42ae7

File tree

2 files changed

+6
-17
lines changed

2 files changed

+6
-17
lines changed

.gitmodules

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
11
[submodule "PathTracking/rear_wheel_feedback/pycubicspline"]
22
path = PathTracking/rear_wheel_feedback/pycubicspline
33
url = https://github.com/AtsushiSakai/pycubicspline.git
4-
[submodule "PathPlanning/LatticePlanner/matplotrecorder"]
5-
path = PathPlanning/LatticePlanner/matplotrecorder
6-
url = https://github.com/AtsushiSakai/matplotrecorder.git
7-
[submodule "PathPlanning/ModelPredictiveTrajectoryGenerator/matplotrecorder"]
8-
path = PathPlanning/ModelPredictiveTrajectoryGenerator/matplotrecorder
9-
url = https://github.com/AtsushiSakai/matplotrecorder
10-
[submodule "PathPlanning/Dijkstra/matplotrecorder"]
11-
path = PathPlanning/Dijkstra/matplotrecorder
12-
url = https://github.com/AtsushiSakai/matplotrecorder
13-
[submodule "PathPlanning/AStar/matplotrecorder"]
14-
path = PathPlanning/AStar/matplotrecorder
15-
url = https://github.com/AtsushiSakai/matplotrecorder
16-
[submodule "PathPlanning/MixIntegerPathPlanning/matplotrecorder"]
17-
path = PathPlanning/MixIntegerPathPlanning/matplotrecorder
18-
url = https://github.com/AtsushiSakai/matplotrecorder
194
[submodule "PathTracking/stanley_controller/pycubicspline"]
205
path = PathTracking/stanley_controller/pycubicspline
216
url = https://github.com/AtsushiSakai/pycubicspline

PathTracking/lqr_speed_steer_control/lqr_speed_steer_control.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55
author Atsushi Sakai (@Atsushi_twi)
66
77
"""
8+
import sys
9+
sys.path.append("../../PathPlanning/CubicSpline/")
10+
811
import numpy as np
912
import math
1013
import matplotlib.pyplot as plt
1114
import scipy.linalg as la
12-
from pycubicspline import pycubicspline
15+
import cubic_spline_planner
1316

1417
# LQR parameter
1518
Q = np.eye(5)
@@ -252,7 +255,8 @@ def main():
252255
ay = [0.0, -3.0, -5.0, 6.5, 3.0, 0.0, 0.0]
253256
goal = [ax[-1], ay[-1]]
254257

255-
cx, cy, cyaw, ck, s = pycubicspline.calc_spline_course(ax, ay, ds=0.1)
258+
cx, cy, cyaw, ck, s = cubic_spline_planner.calc_spline_course(
259+
ax, ay, ds=0.1)
256260
target_speed = 10.0 / 3.6 # simulation parameter km/h -> m/s
257261

258262
sp = calc_speed_profile(cx, cy, cyaw, target_speed)

0 commit comments

Comments
 (0)