Skip to content
Snippets Groups Projects
Commit 1ffa1266 authored by Erik Nygren's avatar Erik Nygren
Browse files

Bug fixing in curve detection. Still an issue with nbits in curve detection

parent e8ba8172
No related branches found
No related tags found
No related merge requests found
...@@ -30,13 +30,13 @@ env = RailEnv(width=20, ...@@ -30,13 +30,13 @@ env = RailEnv(width=20,
rail_generator=complex_rail_generator(nr_start_goal=20, min_dist=10, max_dist=99999, seed=0), rail_generator=complex_rail_generator(nr_start_goal=20, min_dist=10, max_dist=99999, seed=0),
number_of_agents=5) number_of_agents=5)
"""
env = RailEnv(width=20, env = RailEnv(width=20,
height=20, height=20,
rail_generator=rail_from_list_of_saved_GridTransitionMap_generator( rail_generator=rail_from_list_of_saved_GridTransitionMap_generator(
['../env-data/tests/circle.npy']), ['../env-data/tests/circle.npy']),
number_of_agents=1) number_of_agents=1)
"""
env_renderer = RenderTool(env, gl="QT") env_renderer = RenderTool(env, gl="QT")
handle = env.get_agent_handles() handle = env.get_agent_handles()
...@@ -109,7 +109,7 @@ for trials in range(1, n_trials + 1): ...@@ -109,7 +109,7 @@ for trials in range(1, n_trials + 1):
for a in range(env.number_of_agents): for a in range(env.number_of_agents):
if demo: if demo:
eps = 0 eps = 0
action = agent.act(np.array(obs[a]), eps=eps) action = 2 #agent.act(np.array(obs[a]), eps=eps)
action_prob[action] += 1 action_prob[action] += 1
action_dict.update({a: action}) action_dict.update({a: action})
#env.obs_builder.util_print_obs_subtree(tree=obs[a], num_features_per_node=5) #env.obs_builder.util_print_obs_subtree(tree=obs[a], num_features_per_node=5)
......
...@@ -1024,17 +1024,17 @@ class RailEnv(Environment): ...@@ -1024,17 +1024,17 @@ class RailEnv(Environment):
while tmp > 0: while tmp > 0:
nbits += (tmp & 1) nbits += (tmp & 1)
tmp = tmp >> 1 tmp = tmp >> 1
print(nbits)
movement = direction movement = direction
if action == 1: if action == 1:
movement = direction - 1 movement = direction - 1
if nbits <= 2: if nbits <= 2:
transition_isValid == False transition_isValid = False
elif action == 3: elif action == 3:
movement = direction + 1 movement = direction + 1
if nbits <= 2: if nbits <= 2:
transition_isValid == False transition_isValid = False
if movement < 0: if movement < 0:
movement += 4 movement += 4
if movement >= 4: if movement >= 4:
...@@ -1080,6 +1080,7 @@ class RailEnv(Environment): ...@@ -1080,6 +1080,7 @@ class RailEnv(Environment):
movement = curv_dir movement = curv_dir
curv_dir = (curv_dir + 1) % 4 curv_dir = (curv_dir + 1) % 4
new_position = self._new_position(pos, movement) new_position = self._new_position(pos, movement)
# Is it a legal move? 1) transition allows the movement in the # Is it a legal move? 1) transition allows the movement in the
# cell, 2) the new cell is not empty (case 0), 3) the cell is # cell, 2) the new cell is not empty (case 0), 3) the cell is
......
...@@ -310,7 +310,7 @@ ...@@ -310,7 +310,7 @@
{ {
"data": { "data": {
"application/vnd.jupyter.widget-view+json": { "application/vnd.jupyter.widget-view+json": {
"model_id": "fbe86fd356b949c3846636fbdfe839f9", "model_id": "b9dd949deac8442e861062288de2645e",
"version_major": 2, "version_major": 2,
"version_minor": 0 "version_minor": 0
}, },
...@@ -359,12 +359,12 @@ ...@@ -359,12 +359,12 @@
{ {
"data": { "data": {
"application/vnd.jupyter.widget-view+json": { "application/vnd.jupyter.widget-view+json": {
"model_id": "fb76bfd340e34fe8be29569d5c41786a", "model_id": "12cc530aba7e471f9c79001b23d64c8d",
"version_major": 2, "version_major": 2,
"version_minor": 0 "version_minor": 0
}, },
"text/plain": [ "text/plain": [
"Output(outputs=({'output_type': 'stream', 'text': \"filename = C:/Users/u224870/Projekte_Git/flatland/env-data…" "Output()"
] ]
}, },
"metadata": {}, "metadata": {},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment