From 65cf5c5c6f4916dd1a489bc6d5a17ab21b5ca20c Mon Sep 17 00:00:00 2001 From: romue Date: Tue, 11 May 2021 17:45:27 +0200 Subject: [PATCH 1/2] updated base factory --- environments/factory/base_factory.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/environments/factory/base_factory.py b/environments/factory/base_factory.py index 3bd1286..a34ad9f 100644 --- a/environments/factory/base_factory.py +++ b/environments/factory/base_factory.py @@ -63,9 +63,7 @@ class BaseFactory: pos_x, pos_y = pos collisions_vec = self.state[:, pos_x, pos_y].copy() # "vertical fiber" at position of agent i collisions_vec[h.AGENT_START_IDX + agent_i] = h.IS_FREE_CELL # no self-collisions - if valid: - pass - else: + if not valid: collisions_vec[h.LEVEL_IDX] = h.IS_OCCUPIED_CELL return collisions_vec @@ -82,9 +80,7 @@ class BaseFactory: # Does not collide width level boundrys self.move(agent_i, old_pos, new_pos) return new_pos, valid - else: - # Agent seems to be trying to collide in this step - return old_pos, valid + return old_pos, valid @property def free_cells(self) -> np.ndarray: From 6b4ccf0a248477f9b10a4c005623d51a5fc855e0 Mon Sep 17 00:00:00 2001 From: romue Date: Tue, 11 May 2021 17:47:17 +0200 Subject: [PATCH 2/2] updated base factory --- environments/factory/base_factory.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/environments/factory/base_factory.py b/environments/factory/base_factory.py index a34ad9f..fd0e9ff 100644 --- a/environments/factory/base_factory.py +++ b/environments/factory/base_factory.py @@ -74,10 +74,10 @@ class BaseFactory: def move_or_colide(self, agent_i, action) -> ((int, int), bool): old_pos, new_pos, valid = h.check_agent_move(state=self.state, - dim=agent_i + h.AGENT_START_IDX, - action=action) + dim=agent_i + h.AGENT_START_IDX, + action=action) if valid: - # Does not collide width level boundrys + # Does not collide width level boundaries self.move(agent_i, old_pos, new_pos) return new_pos, valid return old_pos, valid