try remove pycubicspline dependency

AtsushiSakai · AtsushiSakai · commit 0a42ae7b9d2d · 2018-02-11T10:35:23.000-08:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,21 +1,6 @@
 [submodule "PathTracking/rear_wheel_feedback/pycubicspline"]
 	path = PathTracking/rear_wheel_feedback/pycubicspline
 	url = https://github.com/AtsushiSakai/pycubicspline.git
-[submodule "PathPlanning/LatticePlanner/matplotrecorder"]
-	path = PathPlanning/LatticePlanner/matplotrecorder
-	url = https://github.com/AtsushiSakai/matplotrecorder.git
-[submodule "PathPlanning/ModelPredictiveTrajectoryGenerator/matplotrecorder"]
-	path = PathPlanning/ModelPredictiveTrajectoryGenerator/matplotrecorder
-	url = https://github.com/AtsushiSakai/matplotrecorder
-[submodule "PathPlanning/Dijkstra/matplotrecorder"]
-	path = PathPlanning/Dijkstra/matplotrecorder
-	url = https://github.com/AtsushiSakai/matplotrecorder
-[submodule "PathPlanning/AStar/matplotrecorder"]
-	path = PathPlanning/AStar/matplotrecorder
-	url = https://github.com/AtsushiSakai/matplotrecorder
-[submodule "PathPlanning/MixIntegerPathPlanning/matplotrecorder"]
-	path = PathPlanning/MixIntegerPathPlanning/matplotrecorder
-	url = https://github.com/AtsushiSakai/matplotrecorder
 [submodule "PathTracking/stanley_controller/pycubicspline"]
 	path = PathTracking/stanley_controller/pycubicspline
 	url = https://github.com/AtsushiSakai/pycubicspline
diff --git a/PathTracking/lqr_speed_steer_control/lqr_speed_steer_control.py b/PathTracking/lqr_speed_steer_control/lqr_speed_steer_control.py
@@ -5,11 +5,14 @@
 author Atsushi Sakai (@Atsushi_twi)
 
 """
+import sys
+sys.path.append("../../PathPlanning/CubicSpline/")
+
 import numpy as np
 import math
 import matplotlib.pyplot as plt
 import scipy.linalg as la
-from pycubicspline import pycubicspline
+import cubic_spline_planner
 
 # LQR parameter
 Q = np.eye(5)
@@ -252,7 +255,8 @@ def main():
     ay = [0.0, -3.0, -5.0, 6.5, 3.0, 0.0, 0.0]
     goal = [ax[-1], ay[-1]]
 
-    cx, cy, cyaw, ck, s = pycubicspline.calc_spline_course(ax, ay, ds=0.1)
+    cx, cy, cyaw, ck, s = cubic_spline_planner.calc_spline_course(
+        ax, ay, ds=0.1)
     target_speed = 10.0 / 3.6  # simulation parameter km/h -> m/s
 
     sp = calc_speed_profile(cx, cy, cyaw, target_speed)
