From 3fbfb8afcfc08513898b43ed8a9edd7854fc206c Mon Sep 17 00:00:00 2001
From: spiglerg <spiglerg@gmail.com>
Date: Fri, 19 Apr 2019 14:04:59 +0200
Subject: [PATCH] fixed branching of treesearch
---
flatland/core/env_observation_builder.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/flatland/core/env_observation_builder.py b/flatland/core/env_observation_builder.py
index 4d6da5b5..34a5bb53 100644
--- a/flatland/core/env_observation_builder.py
+++ b/flatland/core/env_observation_builder.py
@@ -262,7 +262,7 @@ class TreeObsForRailEnv(ObservationBuilder):
# until no transitions are possible along the current direction (i.e., dead-ends)
# We treat dead-ends as nodes, instead of going back, to avoid loops
exploring = True
- # TODO: last_isSwitch = False
+ last_isSwitch = False
# TODO: last_isTerminal = False # dead-end
# TODO: last_isTarget = False
while exploring:
@@ -306,7 +306,7 @@ class TreeObsForRailEnv(ObservationBuilder):
elif num_transitions > 0:
# Switch detected
- # TODO: last_isSwitch = True
+ last_isSwitch = True
break
elif num_transitions == 0:
@@ -331,7 +331,7 @@ class TreeObsForRailEnv(ObservationBuilder):
# Start from the current orientation, and see which transitions are available;
# organize them as [left, forward, right, back], relative to the current orientation
for branch_direction in [(direction+4+i) % 4 for i in range(-1, 3)]:
- if self.env.rail.get_transition((position[0], position[1], direction), branch_direction):
+ if last_isSwitch and self.env.rail.get_transition((position[0], position[1], direction), branch_direction):
new_cell = self._new_position(position, branch_direction)
branch_observation = self._explore_branch(handle, new_cell, branch_direction, depth+1)
--
GitLab