diff --git a/flatland/envs/rail_env_utils.py b/flatland/envs/rail_env_utils.py
index dd351aa76c11bd130242820626de25392c3f40cd..8b29bbe851478450fae91e002222eef0099c8736 100644
--- a/flatland/envs/rail_env_utils.py
+++ b/flatland/envs/rail_env_utils.py
@@ -15,7 +15,7 @@ from flatland.envs.schedule_generators import schedule_from_file
from flatland.utils.ordered_set import OrderedSet
WalkingElement = \
- NamedTuple('Path_Element',
+ NamedTuple('WalkingElement',
[('position', Tuple[int, int]), ('direction', int), ('next_action_element', RailEnvNextAction)])
diff --git a/tests/test_shortest_path.py b/tests/test_shortest_path.py
index 462164367921a58a7e00eaedfe38a7670e1d7310..094b5603c062229aeca2049652721448c59bef5e 100644
--- a/tests/test_shortest_path.py
+++ b/tests/test_shortest_path.py
@@ -1,7 +1,7 @@
import numpy as np
from flatland.envs.rail_env import RailEnvNextAction, RailEnvActions
-from flatland.envs.rail_env_utils import load_flatland_environment_from_file, get_shortest_paths
+from flatland.envs.rail_env_utils import load_flatland_environment_from_file, get_shortest_paths, WalkingElement
def test_get_shortest_paths():
@@ -9,42 +9,122 @@ def test_get_shortest_paths():
actual = get_shortest_paths(env.distance_map)
expected = {
- 0: [RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(1, 2), next_direction=1),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(1, 3), next_direction=1),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 3), next_direction=2),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 4), next_direction=1),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 5), next_direction=1),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 6), next_direction=1),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 7), next_direction=1),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 8), next_direction=1),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 9), next_direction=1),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 10), next_direction=1),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 11), next_direction=1),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 12), next_direction=1),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 13), next_direction=1),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 14), next_direction=1),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 15), next_direction=1),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 16), next_direction=1),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 17), next_direction=1),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 18), next_direction=1)],
- 1: [RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(3, 17), next_direction=3),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(3, 16), next_direction=3),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 16), next_direction=0),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 15), next_direction=3),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 14), next_direction=3),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 13), next_direction=3),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 12), next_direction=3),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 11), next_direction=3),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 10), next_direction=3),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 9), next_direction=3),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 8), next_direction=3),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 7), next_direction=3),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 6), next_direction=3),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 5), next_direction=3),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 4), next_direction=3),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 3), next_direction=3),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 2), next_direction=3),
- RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD, next_position=(2, 1), next_direction=3)]
+ 0: [
+ WalkingElement(position=(1, 1), direction=1,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(1, 2), next_direction=1)),
+ WalkingElement(position=(1, 2), direction=1,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(1, 3), next_direction=1)),
+ WalkingElement(position=(1, 3), direction=1,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 3), next_direction=2)),
+ WalkingElement(position=(2, 3), direction=2,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 4), next_direction=1)),
+ WalkingElement(position=(2, 4), direction=1,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 5), next_direction=1)),
+ WalkingElement(position=(2, 5), direction=1,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 6), next_direction=1)),
+ WalkingElement(position=(2, 6), direction=1,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 7), next_direction=1)),
+ WalkingElement(position=(2, 7), direction=1,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 8), next_direction=1)),
+ WalkingElement(position=(2, 8), direction=1,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 9), next_direction=1)),
+ WalkingElement(position=(2, 9), direction=1,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 10), next_direction=1)),
+ WalkingElement(position=(2, 10), direction=1,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 11), next_direction=1)),
+ WalkingElement(position=(2, 11), direction=1,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 12), next_direction=1)),
+ WalkingElement(position=(2, 12), direction=1,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 13), next_direction=1)),
+ WalkingElement(position=(2, 13), direction=1,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 14), next_direction=1)),
+ WalkingElement(position=(2, 14), direction=1,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 15), next_direction=1)),
+ WalkingElement(position=(2, 15), direction=1,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 16), next_direction=1)),
+ WalkingElement(position=(2, 16), direction=1,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 17), next_direction=1)),
+ WalkingElement(position=(2, 17), direction=1,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 18), next_direction=1)),
+ WalkingElement(position=(2, 18), direction=1,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.STOP_MOVING,
+ next_position=(2, 18), next_direction=1))],
+ 1: [
+ WalkingElement(position=(3, 18), direction=3,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(3, 17), next_direction=3)),
+ WalkingElement(position=(3, 17), direction=3,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(3, 16), next_direction=3)),
+ WalkingElement(position=(3, 16), direction=3,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 16), next_direction=0)),
+ WalkingElement(position=(2, 16), direction=0,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 15), next_direction=3)),
+ WalkingElement(position=(2, 15), direction=3,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 14), next_direction=3)),
+ WalkingElement(position=(2, 14), direction=3,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 13), next_direction=3)),
+ WalkingElement(position=(2, 13), direction=3,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 12), next_direction=3)),
+ WalkingElement(position=(2, 12), direction=3,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 11), next_direction=3)),
+ WalkingElement(position=(2, 11), direction=3,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 10), next_direction=3)),
+ WalkingElement(position=(2, 10), direction=3,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 9), next_direction=3)),
+ WalkingElement(position=(2, 9), direction=3,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 8), next_direction=3)),
+ WalkingElement(position=(2, 8), direction=3,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 7), next_direction=3)),
+ WalkingElement(position=(2, 7), direction=3,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 6), next_direction=3)),
+ WalkingElement(position=(2, 6), direction=3,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 5), next_direction=3)),
+ WalkingElement(position=(2, 5), direction=3,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 4), next_direction=3)),
+ WalkingElement(position=(2, 4), direction=3,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 3), next_direction=3)),
+ WalkingElement(position=(2, 3), direction=3,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 2), next_direction=3)),
+ WalkingElement(position=(2, 2), direction=3,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.MOVE_FORWARD,
+ next_position=(2, 1), next_direction=3)),
+ WalkingElement(position=(2, 1), direction=3,
+ next_action_element=RailEnvNextAction(action=RailEnvActions.STOP_MOVING,
+ next_position=(2, 1), next_direction=3))]
}
for agent_handle in expected: