From 97adc97665307a9d5543cad8183b310afd896f3e Mon Sep 17 00:00:00 2001 From: Aryaz Eghbali Date: Thu, 12 Sep 2024 15:35:04 +0200 Subject: [PATCH 1/4] Fixed multitype list --- .../breadth_first_search.py | 26 +++++++++---------- PathPlanning/Dijkstra/dijkstra.py | 24 ++++++++--------- .../probabilistic_road_map.py | 24 ++++++++--------- .../VoronoiRoadMap/voronoi_road_map.py | 24 ++++++++--------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/PathPlanning/BreadthFirstSearch/breadth_first_search.py b/PathPlanning/BreadthFirstSearch/breadth_first_search.py index ff662170e7..db5da94dec 100644 --- a/PathPlanning/BreadthFirstSearch/breadth_first_search.py +++ b/PathPlanning/BreadthFirstSearch/breadth_first_search.py @@ -210,33 +210,33 @@ def main(): print(__file__ + " start!!") # start and goal position - sx = 10.0 # [m] - sy = 10.0 # [m] - gx = 50.0 # [m] - gy = 50.0 # [m] - grid_size = 2.0 # [m] - robot_radius = 1.0 # [m] + sx = 10 # [m] + sy = 10 # [m] + gx = 50 # [m] + gy = 50 # [m] + grid_size = 2 # [m] + robot_radius = 1 # [m] # set obstacle positions ox, oy = [], [] for i in range(-10, 60): ox.append(i) - oy.append(-10.0) + oy.append(-10) for i in range(-10, 60): - ox.append(60.0) + ox.append(60) oy.append(i) for i in range(-10, 61): ox.append(i) - oy.append(60.0) + oy.append(60) for i in range(-10, 61): - ox.append(-10.0) + ox.append(-10) oy.append(i) for i in range(-10, 40): - ox.append(20.0) + ox.append(20) oy.append(i) for i in range(0, 40): - ox.append(40.0) - oy.append(60.0 - i) + ox.append(40) + oy.append(60 - i) if show_animation: # pragma: no cover plt.plot(ox, oy, ".k") diff --git a/PathPlanning/Dijkstra/dijkstra.py b/PathPlanning/Dijkstra/dijkstra.py index 004e49f15a..1e2724cb63 100644 --- a/PathPlanning/Dijkstra/dijkstra.py +++ b/PathPlanning/Dijkstra/dijkstra.py @@ -211,33 +211,33 @@ def main(): print(__file__ + " start!!") # start and goal position - sx = -5.0 # [m] - sy = -5.0 # [m] - gx = 50.0 # [m] - gy = 50.0 # [m] - grid_size = 2.0 # [m] + sx = -5 # [m] + sy = -5 # [m] + gx = 50 # [m] + gy = 50 # [m] + grid_size = 2 # [m] robot_radius = 1.0 # [m] # set obstacle positions ox, oy = [], [] for i in range(-10, 60): ox.append(i) - oy.append(-10.0) + oy.append(-10) for i in range(-10, 60): - ox.append(60.0) + ox.append(60) oy.append(i) for i in range(-10, 61): ox.append(i) - oy.append(60.0) + oy.append(60) for i in range(-10, 61): - ox.append(-10.0) + ox.append(-10) oy.append(i) for i in range(-10, 40): - ox.append(20.0) + ox.append(20) oy.append(i) for i in range(0, 40): - ox.append(40.0) - oy.append(60.0 - i) + ox.append(40) + oy.append(60 - i) if show_animation: # pragma: no cover plt.plot(ox, oy, ".k") diff --git a/PathPlanning/ProbabilisticRoadMap/probabilistic_road_map.py b/PathPlanning/ProbabilisticRoadMap/probabilistic_road_map.py index 294c389023..3cb8c3033b 100644 --- a/PathPlanning/ProbabilisticRoadMap/probabilistic_road_map.py +++ b/PathPlanning/ProbabilisticRoadMap/probabilistic_road_map.py @@ -263,33 +263,33 @@ def main(rng=None): print(__file__ + " start!!") # start and goal position - sx = 10.0 # [m] - sy = 10.0 # [m] - gx = 50.0 # [m] - gy = 50.0 # [m] - robot_size = 5.0 # [m] + sx = 10 # [m] + sy = 10 # [m] + gx = 50 # [m] + gy = 50 # [m] + robot_size = 5 # [m] ox = [] oy = [] for i in range(60): ox.append(i) - oy.append(0.0) + oy.append(0) for i in range(60): - ox.append(60.0) + ox.append(60) oy.append(i) for i in range(61): ox.append(i) - oy.append(60.0) + oy.append(60) for i in range(61): - ox.append(0.0) + ox.append(0) oy.append(i) for i in range(40): - ox.append(20.0) + ox.append(20) oy.append(i) for i in range(40): - ox.append(40.0) - oy.append(60.0 - i) + ox.append(40) + oy.append(60 - i) if show_animation: plt.plot(ox, oy, ".k") diff --git a/PathPlanning/VoronoiRoadMap/voronoi_road_map.py b/PathPlanning/VoronoiRoadMap/voronoi_road_map.py index 0a1f6f5526..823425bbbc 100644 --- a/PathPlanning/VoronoiRoadMap/voronoi_road_map.py +++ b/PathPlanning/VoronoiRoadMap/voronoi_road_map.py @@ -136,33 +136,33 @@ def main(): print(__file__ + " start!!") # start and goal position - sx = 10.0 # [m] - sy = 10.0 # [m] - gx = 50.0 # [m] - gy = 50.0 # [m] - robot_size = 5.0 # [m] + sx = 10 # [m] + sy = 10 # [m] + gx = 50 # [m] + gy = 50 # [m] + robot_size = 5 # [m] ox = [] oy = [] for i in range(60): ox.append(i) - oy.append(0.0) + oy.append(0) for i in range(60): - ox.append(60.0) + ox.append(60) oy.append(i) for i in range(61): ox.append(i) - oy.append(60.0) + oy.append(60) for i in range(61): - ox.append(0.0) + ox.append(0) oy.append(i) for i in range(40): - ox.append(20.0) + ox.append(20) oy.append(i) for i in range(40): - ox.append(40.0) - oy.append(60.0 - i) + ox.append(40) + oy.append(60 - i) if show_animation: # pragma: no cover plt.plot(ox, oy, ".k") From e0f3bb15b3b92a99a76ec1142a9e8cbabc24b169 Mon Sep 17 00:00:00 2001 From: Aryaz Eghbali Date: Fri, 20 Dec 2024 14:50:13 +0100 Subject: [PATCH 2/4] Cast to float --- .../BreadthFirstSearch/breadth_first_search.py | 10 +++++----- PathPlanning/Dijkstra/dijkstra.py | 10 +++++----- .../ProbabilisticRoadMap/probabilistic_road_map.py | 10 +++++----- PathPlanning/VoronoiRoadMap/voronoi_road_map.py | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/PathPlanning/BreadthFirstSearch/breadth_first_search.py b/PathPlanning/BreadthFirstSearch/breadth_first_search.py index ff662170e7..ad994732a5 100644 --- a/PathPlanning/BreadthFirstSearch/breadth_first_search.py +++ b/PathPlanning/BreadthFirstSearch/breadth_first_search.py @@ -220,20 +220,20 @@ def main(): # set obstacle positions ox, oy = [], [] for i in range(-10, 60): - ox.append(i) + ox.append(float(i)) oy.append(-10.0) for i in range(-10, 60): ox.append(60.0) - oy.append(i) + oy.append(float(i)) for i in range(-10, 61): - ox.append(i) + ox.append(float(i)) oy.append(60.0) for i in range(-10, 61): ox.append(-10.0) - oy.append(i) + oy.append(float(i)) for i in range(-10, 40): ox.append(20.0) - oy.append(i) + oy.append(float(i)) for i in range(0, 40): ox.append(40.0) oy.append(60.0 - i) diff --git a/PathPlanning/Dijkstra/dijkstra.py b/PathPlanning/Dijkstra/dijkstra.py index 004e49f15a..8a585e4b18 100644 --- a/PathPlanning/Dijkstra/dijkstra.py +++ b/PathPlanning/Dijkstra/dijkstra.py @@ -221,20 +221,20 @@ def main(): # set obstacle positions ox, oy = [], [] for i in range(-10, 60): - ox.append(i) + ox.append(float(i)) oy.append(-10.0) for i in range(-10, 60): ox.append(60.0) - oy.append(i) + oy.append(float(i)) for i in range(-10, 61): - ox.append(i) + ox.append(float(i)) oy.append(60.0) for i in range(-10, 61): ox.append(-10.0) - oy.append(i) + oy.append(float(i)) for i in range(-10, 40): ox.append(20.0) - oy.append(i) + oy.append(float(i)) for i in range(0, 40): ox.append(40.0) oy.append(60.0 - i) diff --git a/PathPlanning/ProbabilisticRoadMap/probabilistic_road_map.py b/PathPlanning/ProbabilisticRoadMap/probabilistic_road_map.py index 294c389023..8bacfd5d19 100644 --- a/PathPlanning/ProbabilisticRoadMap/probabilistic_road_map.py +++ b/PathPlanning/ProbabilisticRoadMap/probabilistic_road_map.py @@ -273,20 +273,20 @@ def main(rng=None): oy = [] for i in range(60): - ox.append(i) + ox.append(float(i)) oy.append(0.0) for i in range(60): ox.append(60.0) - oy.append(i) + oy.append(float(i)) for i in range(61): - ox.append(i) + ox.append(float(i)) oy.append(60.0) for i in range(61): ox.append(0.0) - oy.append(i) + oy.append(float(i)) for i in range(40): ox.append(20.0) - oy.append(i) + oy.append(float(i)) for i in range(40): ox.append(40.0) oy.append(60.0 - i) diff --git a/PathPlanning/VoronoiRoadMap/voronoi_road_map.py b/PathPlanning/VoronoiRoadMap/voronoi_road_map.py index 0a1f6f5526..a27e1b6928 100644 --- a/PathPlanning/VoronoiRoadMap/voronoi_road_map.py +++ b/PathPlanning/VoronoiRoadMap/voronoi_road_map.py @@ -146,20 +146,20 @@ def main(): oy = [] for i in range(60): - ox.append(i) + ox.append(float(i)) oy.append(0.0) for i in range(60): ox.append(60.0) - oy.append(i) + oy.append(float(i)) for i in range(61): - ox.append(i) + ox.append(float(i)) oy.append(60.0) for i in range(61): ox.append(0.0) - oy.append(i) + oy.append(float(i)) for i in range(40): ox.append(20.0) - oy.append(i) + oy.append(float(i)) for i in range(40): ox.append(40.0) oy.append(60.0 - i) From c233ce9d5ceaf3e178890c49273b75a65a039050 Mon Sep 17 00:00:00 2001 From: Aryaz Eghbali Date: Mon, 20 Jan 2025 09:03:30 +0100 Subject: [PATCH 3/4] Reverted to all floats --- .../BreadthFirstSearch/breadth_first_search.py | 12 ++++++------ PathPlanning/Dijkstra/dijkstra.py | 10 +++++----- .../ProbabilisticRoadMap/probabilistic_road_map.py | 10 +++++----- PathPlanning/VoronoiRoadMap/voronoi_road_map.py | 10 +++++----- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/PathPlanning/BreadthFirstSearch/breadth_first_search.py b/PathPlanning/BreadthFirstSearch/breadth_first_search.py index 714e0a1c40..12f000e9af 100644 --- a/PathPlanning/BreadthFirstSearch/breadth_first_search.py +++ b/PathPlanning/BreadthFirstSearch/breadth_first_search.py @@ -210,12 +210,12 @@ def main(): print(__file__ + " start!!") # start and goal position - sx = 10 # [m] - sy = 10 # [m] - gx = 50 # [m] - gy = 50 # [m] - grid_size = 2 # [m] - robot_radius = 1 # [m] + sx = 10.0 # [m] + sy = 10.0 # [m] + gx = 50.0 # [m] + gy = 50.0 # [m] + grid_size = 2.0 # [m] + robot_radius = 1.0 # [m] # set obstacle positions ox, oy = [], [] diff --git a/PathPlanning/Dijkstra/dijkstra.py b/PathPlanning/Dijkstra/dijkstra.py index f674f0537b..6d8140f36c 100644 --- a/PathPlanning/Dijkstra/dijkstra.py +++ b/PathPlanning/Dijkstra/dijkstra.py @@ -211,11 +211,11 @@ def main(): print(__file__ + " start!!") # start and goal position - sx = -5 # [m] - sy = -5 # [m] - gx = 50 # [m] - gy = 50 # [m] - grid_size = 2 # [m] + sx = -5.0 # [m] + sy = -5.0 # [m] + gx = 50.0 # [m] + gy = 50.0 # [m] + grid_size = 2.0 # [m] robot_radius = 1.0 # [m] # set obstacle positions diff --git a/PathPlanning/ProbabilisticRoadMap/probabilistic_road_map.py b/PathPlanning/ProbabilisticRoadMap/probabilistic_road_map.py index fca1cbc84a..36682a5039 100644 --- a/PathPlanning/ProbabilisticRoadMap/probabilistic_road_map.py +++ b/PathPlanning/ProbabilisticRoadMap/probabilistic_road_map.py @@ -263,11 +263,11 @@ def main(rng=None): print(__file__ + " start!!") # start and goal position - sx = 10 # [m] - sy = 10 # [m] - gx = 50 # [m] - gy = 50 # [m] - robot_size = 5 # [m] + sx = 10.0 # [m] + sy = 10.0 # [m] + gx = 50.0 # [m] + gy = 50.0 # [m] + robot_size = 5.0 # [m] ox = [] oy = [] diff --git a/PathPlanning/VoronoiRoadMap/voronoi_road_map.py b/PathPlanning/VoronoiRoadMap/voronoi_road_map.py index 921b30a33b..e39f920143 100644 --- a/PathPlanning/VoronoiRoadMap/voronoi_road_map.py +++ b/PathPlanning/VoronoiRoadMap/voronoi_road_map.py @@ -136,11 +136,11 @@ def main(): print(__file__ + " start!!") # start and goal position - sx = 10 # [m] - sy = 10 # [m] - gx = 50 # [m] - gy = 50 # [m] - robot_size = 5 # [m] + sx = 10.0 # [m] + sy = 10.0 # [m] + gx = 50.0 # [m] + gy = 50.0 # [m] + robot_size = 5.0 # [m] ox = [] oy = [] From a2388fbb48ca62ab25212ee74c7f171fe3002d27 Mon Sep 17 00:00:00 2001 From: Aryaz Eghbali Date: Mon, 20 Jan 2025 09:05:48 +0100 Subject: [PATCH 4/4] Moved all remaining to float --- PathPlanning/BreadthFirstSearch/breadth_first_search.py | 4 ++-- PathPlanning/Dijkstra/dijkstra.py | 4 ++-- PathPlanning/ProbabilisticRoadMap/probabilistic_road_map.py | 4 ++-- PathPlanning/VoronoiRoadMap/voronoi_road_map.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PathPlanning/BreadthFirstSearch/breadth_first_search.py b/PathPlanning/BreadthFirstSearch/breadth_first_search.py index 12f000e9af..ad994732a5 100644 --- a/PathPlanning/BreadthFirstSearch/breadth_first_search.py +++ b/PathPlanning/BreadthFirstSearch/breadth_first_search.py @@ -235,8 +235,8 @@ def main(): ox.append(20.0) oy.append(float(i)) for i in range(0, 40): - ox.append(40) - oy.append(60 - i) + ox.append(40.0) + oy.append(60.0 - i) if show_animation: # pragma: no cover plt.plot(ox, oy, ".k") diff --git a/PathPlanning/Dijkstra/dijkstra.py b/PathPlanning/Dijkstra/dijkstra.py index 6d8140f36c..8a585e4b18 100644 --- a/PathPlanning/Dijkstra/dijkstra.py +++ b/PathPlanning/Dijkstra/dijkstra.py @@ -236,8 +236,8 @@ def main(): ox.append(20.0) oy.append(float(i)) for i in range(0, 40): - ox.append(40) - oy.append(60 - i) + ox.append(40.0) + oy.append(60.0 - i) if show_animation: # pragma: no cover plt.plot(ox, oy, ".k") diff --git a/PathPlanning/ProbabilisticRoadMap/probabilistic_road_map.py b/PathPlanning/ProbabilisticRoadMap/probabilistic_road_map.py index 36682a5039..8bacfd5d19 100644 --- a/PathPlanning/ProbabilisticRoadMap/probabilistic_road_map.py +++ b/PathPlanning/ProbabilisticRoadMap/probabilistic_road_map.py @@ -288,8 +288,8 @@ def main(rng=None): ox.append(20.0) oy.append(float(i)) for i in range(40): - ox.append(40) - oy.append(60 - i) + ox.append(40.0) + oy.append(60.0 - i) if show_animation: plt.plot(ox, oy, ".k") diff --git a/PathPlanning/VoronoiRoadMap/voronoi_road_map.py b/PathPlanning/VoronoiRoadMap/voronoi_road_map.py index e39f920143..a27e1b6928 100644 --- a/PathPlanning/VoronoiRoadMap/voronoi_road_map.py +++ b/PathPlanning/VoronoiRoadMap/voronoi_road_map.py @@ -161,8 +161,8 @@ def main(): ox.append(20.0) oy.append(float(i)) for i in range(40): - ox.append(40) - oy.append(60 - i) + ox.append(40.0) + oy.append(60.0 - i) if show_animation: # pragma: no cover plt.plot(ox, oy, ".k")