steffen/FIKS_Entwicklungsumgebung
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	environments/factory/base_factory.py
This commit is contained in:
steffen-illium 2021-05-12 12:10:43 +02:00
commit 07ab28ea70
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
environments/factory/base_factory.py
View File

@ -63,24 +63,9 @@ class BaseFactory:
self.done = True
return self.state, r, self.done, info
def _is_moving_action(self, action):
movement_actions = (int(self.allow_vertical_movement) + int(self.allow_horizontal_movement)) * 4
if action < movement_actions:
return True
else:
return False
def check_all_collisions(self, agent_action_pos_valid_tuples: (int, int, (int, int), bool), collisions: int) -> np.ndarray:
collision_vecs = np.zeros((len(agent_action_pos_valid_tuples), collisions)) # n_agents x n_slices
for agent_i, action, pos, valid in agent_action_pos_valid_tuples:
if self._is_moving_action(action):
collision_vecs[agent_i] = self.check_collisions(agent_i, pos, valid)
return collision_vecs
def check_collisions(self, agent_i: int, pos: (int, int), valid: bool) -> np.ndarray:
def check_collisions(self, agent_i, pos, valid):
pos_x, pos_y = pos
# FixMe: We need to find a way to spare out some dimensions, eg. an info dimension etc... a[?,]
collisions_vec = self.state[:, pos_x, pos_y].copy() # "vertical fiber" at position of agent i
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:
# ToDo: Place a function hook here
@ -99,12 +84,10 @@ class BaseFactory:
dim=agent_i + h.AGENT_START_IDX,
action=action)
if valid:
# Does not collide width level boundrys
# Does not collide width level boundaries
self.do_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: