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
525f1464
Commit
525f1464
authored
5 years ago
by
Erik Nygren
Browse files
Options
Downloads
Patches
Plain Diff
included warning message if predictor or observation builder does not provide cells to render.
parent
9b5f7626
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
examples/training_example.py
+2
-2
2 additions, 2 deletions
examples/training_example.py
flatland/envs/predictions.py
+1
-1
1 addition, 1 deletion
flatland/envs/predictions.py
flatland/utils/rendertools.py
+29
-20
29 additions, 20 deletions
flatland/utils/rendertools.py
with
32 additions
and
23 deletions
examples/training_example.py
+
2
−
2
View file @
525f1464
...
...
@@ -17,7 +17,7 @@ LocalGridObs = LocalObsForRailEnv(view_height=10, view_width=2, center=2)
env
=
RailEnv
(
width
=
50
,
height
=
50
,
rail_generator
=
complex_rail_generator
(
nr_start_goal
=
10
,
nr_extra
=
1
,
min_dist
=
8
,
max_dist
=
99999
,
seed
=
0
),
obs_builder_object
=
LocalGridObs
,
obs_builder_object
=
TreeObservation
,
number_of_agents
=
5
)
env_renderer
=
RenderTool
(
env
,
gl
=
"
PILSVG
"
,
)
...
...
@@ -84,7 +84,7 @@ for trials in range(1, n_trials + 1):
# Environment step which returns the observations for all agents, their corresponding
# reward and whether their are done
next_obs
,
all_rewards
,
done
,
_
=
env
.
step
(
action_dict
)
env_renderer
.
render_env
(
show
=
True
,
show_observations
=
Tru
e
,
show_predictions
=
Fals
e
)
env_renderer
.
render_env
(
show
=
True
,
show_observations
=
Fals
e
,
show_predictions
=
Tru
e
)
# Update replay buffer and train agent
for
a
in
range
(
env
.
get_num_agents
()):
...
...
This diff is collapsed.
Click to expand it.
flatland/envs/predictions.py
+
1
−
1
View file @
525f1464
...
...
@@ -163,7 +163,7 @@ class ShortestPathPredictorForRailEnv(PredictionBuilder):
# prediction is ready
prediction
[
index
]
=
[
index
,
*
new_position
,
new_direction
,
0
]
visited
.
add
((
new_position
[
0
],
new_position
[
1
],
new_direction
))
self
.
env
.
dev_pred_dict
[
agent
.
handle
]
=
visited
#
self.env.dev_pred_dict[agent.handle] = visited
prediction_dict
[
agent
.
handle
]
=
prediction
# cleanup: reset initial position
...
...
This diff is collapsed.
Click to expand it.
flatland/utils/rendertools.py
+
29
−
20
View file @
525f1464
import
time
import
warnings
from
collections
import
deque
from
enum
import
IntEnum
...
...
@@ -276,12 +277,17 @@ class RenderTool(object):
"""
rt
=
self
.
__class__
for
agent
in
agent_handles
:
color
=
self
.
gl
.
get_agent_color
(
agent
)
for
visited_cell
in
observation_dict
[
agent
]:
cell_coord
=
array
(
visited_cell
[:
2
])
cell_coord_trans
=
np
.
matmul
(
cell_coord
,
rt
.
row_col_to_xy
)
+
rt
.
x_y_half
self
.
_draw_square
(
cell_coord_trans
,
1
/
(
agent
+
1.1
),
color
,
layer
=
1
,
opacity
=
100
)
# Check if the observation builder provides an observation
if
len
(
observation_dict
)
<
1
:
warnings
.
warn
(
"
Observation Builder did not provide an observation_dict of all observed cells.
"
)
else
:
for
agent
in
agent_handles
:
color
=
self
.
gl
.
get_agent_color
(
agent
)
for
visited_cell
in
observation_dict
[
agent
]:
cell_coord
=
array
(
visited_cell
[:
2
])
cell_coord_trans
=
np
.
matmul
(
cell_coord
,
rt
.
row_col_to_xy
)
+
rt
.
x_y_half
self
.
_draw_square
(
cell_coord_trans
,
1
/
(
agent
+
1.1
),
color
,
layer
=
1
,
opacity
=
100
)
def
render_prediction
(
self
,
agent_handles
,
prediction_dict
):
"""
...
...
@@ -292,19 +298,22 @@ class RenderTool(object):
"""
rt
=
self
.
__class__
for
agent
in
agent_handles
:
color
=
self
.
gl
.
get_agent_color
(
agent
)
for
visited_cell
in
prediction_dict
[
agent
]:
cell_coord
=
array
(
visited_cell
[:
2
])
if
type
(
self
.
gl
)
is
PILSVG
:
# TODO : Track highlighting (Adrian)
r
=
cell_coord
[
0
]
c
=
cell_coord
[
1
]
transitions
=
self
.
env
.
rail
.
grid
[
r
,
c
]
self
.
gl
.
set_predicion_path_at
(
r
,
c
,
transitions
,
agent_rail_color
=
color
)
else
:
cell_coord_trans
=
np
.
matmul
(
cell_coord
,
rt
.
row_col_to_xy
)
+
rt
.
x_y_half
self
.
_draw_square
(
cell_coord_trans
,
1
/
(
agent
+
1.1
),
color
,
layer
=
1
,
opacity
=
100
)
if
len
(
prediction_dict
)
<
1
:
warnings
.
warn
(
"
Predictor did not provide any predicted cells to render.
"
)
else
:
for
agent
in
agent_handles
:
color
=
self
.
gl
.
get_agent_color
(
agent
)
for
visited_cell
in
prediction_dict
[
agent
]:
cell_coord
=
array
(
visited_cell
[:
2
])
if
type
(
self
.
gl
)
is
PILSVG
:
# TODO : Track highlighting (Adrian)
r
=
cell_coord
[
0
]
c
=
cell_coord
[
1
]
transitions
=
self
.
env
.
rail
.
grid
[
r
,
c
]
self
.
gl
.
set_predicion_path_at
(
r
,
c
,
transitions
,
agent_rail_color
=
color
)
else
:
cell_coord_trans
=
np
.
matmul
(
cell_coord
,
rt
.
row_col_to_xy
)
+
rt
.
x_y_half
self
.
_draw_square
(
cell_coord_trans
,
1
/
(
agent
+
1.1
),
color
,
layer
=
1
,
opacity
=
100
)
def
render_rail
(
self
,
spacing
=
False
,
rail_color
=
"
gray
"
,
curves
=
True
,
arrows
=
False
):
...
...
@@ -558,7 +567,7 @@ class RenderTool(object):
if
show_observations
:
self
.
render_observation
(
range
(
env
.
get_num_agents
()),
env
.
dev_obs_dict
)
if
show_predictions
and
len
(
env
.
dev_pred_dict
)
>
0
:
if
show_predictions
:
self
.
render_prediction
(
range
(
env
.
get_num_agents
()),
env
.
dev_pred_dict
)
if
show
:
self
.
gl
.
show
()
...
...
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