mirror of
https://github.com/zhm-real/PathPlanning.git
synced 2026-08-29 08:34:46 +08:00
update
This commit is contained in:
Binary file not shown.
|
Before Width: | Height: | Size: 249 KiB |
@@ -133,7 +133,6 @@ class DynamicRrt:
|
||||
for edge in self.edges:
|
||||
if self.is_collision_obs_add(edge.parent, edge.child):
|
||||
edge.child.flag = "INVALID"
|
||||
edge.flag = "INVALID"
|
||||
|
||||
def is_path_invalid(self):
|
||||
for node in self.waypoint:
|
||||
|
||||
@@ -148,7 +148,7 @@ def main():
|
||||
x_start = (2, 2) # Starting node
|
||||
x_goal = (49, 24) # Goal node
|
||||
|
||||
rrt_conn = RrtConnect(x_start, x_goal, 0.8, 0.03, 5000)
|
||||
rrt_conn = RrtConnect(x_start, x_goal, 0.8, 0.05, 5000)
|
||||
path = rrt_conn.planning()
|
||||
|
||||
rrt_conn.plotting.animation_connect(rrt_conn.V1, rrt_conn.V2, path, "RRT_CONNECT")
|
||||
|
||||
@@ -55,6 +55,7 @@ class RrtStar:
|
||||
node_new = self.new_state(node_near, node_rand)
|
||||
|
||||
if node_new and not self.utils.is_collision(node_near, node_new):
|
||||
self.vertex.append(node_new)
|
||||
neighbor_index = self.find_near_neighbor(node_new)
|
||||
if neighbor_index:
|
||||
node_new = self.choose_parent(node_new, neighbor_index)
|
||||
@@ -92,8 +93,9 @@ class RrtStar:
|
||||
r = min(self.search_radius * math.sqrt((math.log(n) / n)), self.step_len)
|
||||
|
||||
dist_table = [math.hypot(nd.x - node_new.x, nd.y - node_new.y) for nd in self.vertex]
|
||||
dist_table_index = [dist_table.index(d) for d in dist_table if d <= r and
|
||||
not self.utils.is_collision(node_new, self.vertex[dist_table.index(d)])]
|
||||
dist_table_index = [dist_table.index(d) for d in dist_table if d <= r]
|
||||
dist_table_index = [ind for ind in dist_table_index
|
||||
if not self.utils.is_collision(node_new, self.vertex[ind])]
|
||||
|
||||
return dist_table_index
|
||||
|
||||
|
||||
Reference in New Issue
Block a user