Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Flatland
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sfwatergit
Flatland
Commits
f3c323b6
Commit
f3c323b6
authored
5 years ago
by
hagrid67
Browse files
Options
Downloads
Patches
Plain Diff
a_star: changed open_ and closed_ to open_nodes and closed_nodes
parent
97b22d6f
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
flatland/envs/env_utils.py
+11
-11
11 additions, 11 deletions
flatland/envs/env_utils.py
with
11 additions
and
11 deletions
flatland/envs/env_utils.py
+
11
−
11
View file @
f3c323b6
...
@@ -108,14 +108,14 @@ def a_star(rail_trans, rail_array, start, end):
...
@@ -108,14 +108,14 @@ def a_star(rail_trans, rail_array, start, end):
rail_shape
=
rail_array
.
shape
rail_shape
=
rail_array
.
shape
start_node
=
AStarNode
(
None
,
start
)
start_node
=
AStarNode
(
None
,
start
)
end_node
=
AStarNode
(
None
,
end
)
end_node
=
AStarNode
(
None
,
end
)
open_
=
set
()
open_
nodes
=
set
()
closed_
=
set
()
closed_
nodes
=
set
()
open_
.
add
(
start_node
)
open_
nodes
.
add
(
start_node
)
while
len
(
open_
)
>
0
:
while
len
(
open_
nodes
)
>
0
:
# get node with current shortest est. path (lowest f)
# get node with current shortest est. path (lowest f)
current_node
=
None
current_node
=
None
for
item
in
open_
:
for
item
in
open_
nodes
:
if
current_node
is
None
:
if
current_node
is
None
:
current_node
=
item
current_node
=
item
continue
continue
...
@@ -123,8 +123,8 @@ def a_star(rail_trans, rail_array, start, end):
...
@@ -123,8 +123,8 @@ def a_star(rail_trans, rail_array, start, end):
current_node
=
item
current_node
=
item
# pop current off open list, add to closed list
# pop current off open list, add to closed list
open_
.
remove
(
current_node
)
open_
nodes
.
remove
(
current_node
)
closed_
.
add
(
current_node
)
closed_
nodes
.
add
(
current_node
)
# found the goal
# found the goal
if
current_node
==
end_node
:
if
current_node
==
end_node
:
...
@@ -158,7 +158,7 @@ def a_star(rail_trans, rail_array, start, end):
...
@@ -158,7 +158,7 @@ def a_star(rail_trans, rail_array, start, end):
# loop through children
# loop through children
for
child
in
children
:
for
child
in
children
:
# already in closed list?
# already in closed list?
if
child
in
closed_
:
if
child
in
closed_
nodes
:
continue
continue
# create the f, g, and h values
# create the f, g, and h values
...
@@ -171,14 +171,14 @@ def a_star(rail_trans, rail_array, start, end):
...
@@ -171,14 +171,14 @@ def a_star(rail_trans, rail_array, start, end):
child
.
f
=
child
.
g
+
child
.
h
child
.
f
=
child
.
g
+
child
.
h
# already in the open list?
# already in the open list?
if
child
in
open_
:
if
child
in
open_
nodes
:
continue
continue
# add the child to the open list
# add the child to the open list
open_
.
add
(
child
)
open_
nodes
.
add
(
child
)
# no full path found
# no full path found
if
len
(
open_
)
==
0
:
if
len
(
open_
nodes
)
==
0
:
return
[]
return
[]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment