diff --git a/PathPlanning/ModelPredictiveTrajectoryGenerator/model_predictive_trajectory_generator.py b/PathPlanning/ModelPredictiveTrajectoryGenerator/model_predictive_trajectory_generator.py index 4d14a90b..e8cf338e 100644 --- a/PathPlanning/ModelPredictiveTrajectoryGenerator/model_predictive_trajectory_generator.py +++ b/PathPlanning/ModelPredictiveTrajectoryGenerator/model_predictive_trajectory_generator.py @@ -8,14 +8,12 @@ import numpy as np import matplotlib.pyplot as plt import math import motion_model -from matplotrecorder import matplotrecorder # optimization parameter max_iter = 100 h = np.matrix([0.5, 0.02, 0.02]).T # parameter sampling distanse cost_th = 0.1 -matplotrecorder.donothing = True show_graph = False @@ -99,7 +97,6 @@ def show_trajectory(target, xc, yc): plt.axis("equal") plt.grid(True) plt.pause(0.1) - matplotrecorder.save_frame() def optimize_trajectory(target, k0, p): @@ -145,7 +142,6 @@ def test_optimize_trajectory(): x, y, yaw, p = optimize_trajectory(target, k0, init_p) show_trajectory(target, x, y) - matplotrecorder.save_movie("animation.gif", 0.1) # plt.plot(x, y, "-r") plot_arrow(target.x, target.y, target.yaw) plt.axis("equal") diff --git a/PathPlanning/StateLatticePlanner/BiasedPolarSampling.gif b/PathPlanning/StateLatticePlanner/BiasedPolarSampling.gif new file mode 100644 index 00000000..d56f4f0e Binary files /dev/null and b/PathPlanning/StateLatticePlanner/BiasedPolarSampling.gif differ diff --git a/PathPlanning/StateLatticePlanner/LaneSampling.gif b/PathPlanning/StateLatticePlanner/LaneSampling.gif new file mode 100644 index 00000000..20b03d16 Binary files /dev/null and b/PathPlanning/StateLatticePlanner/LaneSampling.gif differ diff --git a/PathPlanning/StateLatticePlanner/UniformPolarSampling.gif b/PathPlanning/StateLatticePlanner/UniformPolarSampling.gif new file mode 100644 index 00000000..f734c76a Binary files /dev/null and b/PathPlanning/StateLatticePlanner/UniformPolarSampling.gif differ diff --git a/PathPlanning/StateLatticePlanner/state_lattice_planner.py b/PathPlanning/StateLatticePlanner/state_lattice_planner.py index c540bf87..33c17ac3 100644 --- a/PathPlanning/StateLatticePlanner/state_lattice_planner.py +++ b/PathPlanning/StateLatticePlanner/state_lattice_planner.py @@ -230,7 +230,7 @@ def uniform_terminal_state_sampling_test2(): def biased_terminal_state_sampling_test1(): - k0 = 0.0 + lane_state_sampling_test1 = 0.0 nxy = 30 nh = 2 d = 20