steffen/marl-factory-grid
1
0
Fork 0
mirror of https://github.com/illiumst/marl-factory-grid.git synced 2025-05-23 15:26:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

in Debugging

Browse Source
This commit is contained in:
steffen-illium 2021-05-18 10:21:41 +02:00
parent b77a18259f
commit 8769bc8d7b
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/factory/base_factory.py
View File

@ -147,7 +147,7 @@ class BaseFactory:
pos_x, pos_y = positions[0] # a.flatten() pos_x, pos_y = positions[0] # a.flatten()
return pos_x, pos_y return pos_x, pos_y
def free_cells(self, excluded_slices: Union[None, List[int], int] = None) -> np.ndarray: def free_cells(self, excluded_slices: Union[None, List[int], int] = None) -> np.array:
excluded_slices = excluded_slices or [] excluded_slices = excluded_slices or []
assert isinstance(excluded_slices, (int, list)) assert isinstance(excluded_slices, (int, list))
excluded_slices = excluded_slices if isinstance(excluded_slices, list) else [excluded_slices] excluded_slices = excluded_slices if isinstance(excluded_slices, list) else [excluded_slices]

6
environments/factory/levels/simple.txt
View File

@ -1,10 +1,10 @@
---------- ----------
---------- ---#------
--------#- --------#-
---------- ----------
---------- --#-------
---------- ----------
----#----- ----#-----
---------- ----------
---------- -------#--
---------- ----------

9
environments/factory/simple_factory_getting_dirty.py
View File

@ -35,14 +35,15 @@ class GettingDirty(BaseFactory):
height, width = self.state.shape[1:] height, width = self.state.shape[1:]
self.renderer = Renderer(width, height, view_radius=0) self.renderer = Renderer(width, height, view_radius=0)
self.renderer.render( self.renderer.render(
OrderedDict(dirt=np.argwhere(self.state[DIRT_INDEX] > 0), OrderedDict(dirt=np.argwhere(self.state[DIRT_INDEX] > h.IS_FREE_CELL),
wall=np.argwhere(self.state[h.LEVEL_IDX] > 0), wall=np.argwhere(self.state[h.LEVEL_IDX] > h.IS_FREE_CELL),
agent=np.argwhere(self.state[h.AGENT_START_IDX] > 0) agent=np.argwhere(self.state[h.AGENT_START_IDX] > h.IS_FREE_CELL)
) )
) )
def spawn_dirt(self) -> None: def spawn_dirt(self) -> None:
free_for_dirt = self.free_cells(excluded_slices=DIRT_INDEX) free_for_dirt = self.free_cells(excluded_slices=DIRT_INDEX)
# randomly distribute dirt across the grid # randomly distribute dirt across the grid
n_dirt_tiles = int(random.uniform(0, self._dirt_properties.max_spawn_ratio) * len(free_for_dirt)) n_dirt_tiles = int(random.uniform(0, self._dirt_properties.max_spawn_ratio) * len(free_for_dirt))
for x, y in free_for_dirt[:n_dirt_tiles]: for x, y in free_for_dirt[:n_dirt_tiles]:
@ -91,7 +92,7 @@ class GettingDirty(BaseFactory):
def calculate_reward(self, agent_states: List[AgentState]) -> (int, dict): def calculate_reward(self, agent_states: List[AgentState]) -> (int, dict):
this_step_reward = 0 this_step_reward = 0
dirt_vs_level_collisions = np.argwhere(self.state[h.LEVEL_IDX, DIRT_INDEX].sum(0) == h.IS_FREE_CELL) dirt_vs_level_collisions = np.argwhere(self.state[h.LEVEL_IDX] * self.state[DIRT_INDEX] == h.IS_OCCUPIED_CELL)
for dirt_vs_level_collision in dirt_vs_level_collisions: for dirt_vs_level_collision in dirt_vs_level_collisions:
print(f'Dirt was placed on Level at: {dirt_vs_level_collision.squeeze()}') print(f'Dirt was placed on Level at: {dirt_vs_level_collision.squeeze()}')
pass pass