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
yoogottamk
Flatland
Commits
13399086
Commit
13399086
authored
5 years ago
by
Erik Nygren
Browse files
Options
Downloads
Patches
Plain Diff
minor update to city-city connections
parent
1d832003
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
flatland/envs/rail_generators.py
+5
-7
5 additions, 7 deletions
flatland/envs/rail_generators.py
with
5 additions
and
7 deletions
flatland/envs/rail_generators.py
+
5
−
7
View file @
13399086
...
...
@@ -654,7 +654,7 @@ def sparse_rail_generator(num_cities=5, num_intersections=4, num_trainstations=2
for
tmp_out_connection_point
in
connection_points
[
current_node
]:
tmp_dist_to_node
=
distance_on_rail
(
tmp_out_connection_point
,
node_positions
[
neighb
])
# Check if this connection node is on the city side facing the neighbour
if
tmp_dist_to_node
<
dist_from_center
-
1
:
if
tmp_dist_to_node
<
dist_from_center
:
min_connection_dist
=
np
.
inf
# Find closes connection point
...
...
@@ -663,12 +663,10 @@ def sparse_rail_generator(num_cities=5, num_intersections=4, num_trainstations=2
if
tmp_dist
<
min_connection_dist
:
min_connection_dist
=
tmp_dist
neighb_connection_point
=
tmp_in_connection_point
center_distance
=
distance_on_rail
(
node_positions
[
current_node
],
tmp_in_connection_point
)
if
distance_on_rail
(
tmp_out_connection_point
,
neighb_connection_point
)
<
center_distance
:
i
+=
1
connect_nodes
(
rail_trans
,
grid_map
,
tmp_out_connection_point
,
neighb_connection_point
)
boarder_connections
.
add
((
tmp_out_connection_point
,
current_node
))
boarder_connections
.
add
((
neighb_connection_point
,
neighb
))
i
+=
1
connect_nodes
(
rail_trans
,
grid_map
,
tmp_out_connection_point
,
neighb_connection_point
)
boarder_connections
.
add
((
tmp_out_connection_point
,
current_node
))
boarder_connections
.
add
((
neighb_connection_point
,
neighb
))
node_stack
.
pop
(
0
)
...
...
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