Skip to content

Commit 584dbd2

Browse files
committed
remove pycubicspline dependency
1 parent dd47c2d commit 584dbd2

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

.gitmodules

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +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 "PathTracking/lqr/matplotrecorder"]
5-
path = PathTracking/lqr/matplotrecorder
6-
url = https://github.com/AtsushiSakai/matplotrecorder
7-
[submodule "PathTracking/lqr/pycubicspline"]
8-
path = PathTracking/lqr/pycubicspline
9-
url = https://github.com/AtsushiSakai/pycubicspline.git
104
[submodule "PathPlanning/LatticePlanner/matplotrecorder"]
115
path = PathPlanning/LatticePlanner/matplotrecorder
126
url = https://github.com/AtsushiSakai/matplotrecorder.git
@@ -25,9 +19,6 @@
2519
[submodule "PathTracking/stanley_controller/pycubicspline"]
2620
path = PathTracking/stanley_controller/pycubicspline
2721
url = https://github.com/AtsushiSakai/pycubicspline
28-
[submodule "PathTracking/lqr_steer_control/pycubicspline"]
29-
path = PathTracking/lqr_steer_control/pycubicspline
30-
url = https://github.com/AtsushiSakai/pycubicspline
3122
[submodule "PathTracking/lqr_speed_steer_control/pycubicspline"]
3223
path = PathTracking/lqr_speed_steer_control/pycubicspline
3324
url = https://github.com/AtsushiSakai/pycubicspline

PathTracking/lqr_steer_control/lqr_steer_control.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@
55
author Atsushi Sakai (@Atsushi_twi)
66
77
"""
8+
9+
import sys
10+
sys.path.append("../../PathPlanning/CubicSpline/")
11+
812
import numpy as np
913
import math
1014
import matplotlib.pyplot as plt
1115
import scipy.linalg as la
12-
from pycubicspline import pycubicspline
16+
import cubic_spline_planner
1317

1418
Kp = 1.0 # speed proportional gain
1519

@@ -250,7 +254,8 @@ def main():
250254
ay = [0.0, -3.0, -5.0, 6.5, 3.0, 5.0, -2.0]
251255
goal = [ax[-1], ay[-1]]
252256

253-
cx, cy, cyaw, ck, s = pycubicspline.calc_spline_course(ax, ay, ds=0.1)
257+
cx, cy, cyaw, ck, s = cubic_spline_planner.calc_spline_course(
258+
ax, ay, ds=0.1)
254259
target_speed = 10.0 / 3.6 # simulation parameter km/h -> m/s
255260

256261
sp = calc_speed_profile(cx, cy, cyaw, target_speed)
Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)