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

introduced base factory concept

Browse Source
This commit is contained in:
romue 2021-05-07 15:06:14 +02:00
parent e993e8642a
commit 4bd1272cd7
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
environments/factory/factory_cleaning.py → environments/factory/base_factory.py
View File

@ -3,7 +3,7 @@ from pathlib import Path
from environments import helpers as h from environments import helpers as h
class Factory(object): class BaseFactory(object):
LEVELS_DIR = 'levels' LEVELS_DIR = 'levels'
def __init__(self, level='simple', n_agents=1, max_steps=1e3): def __init__(self, level='simple', n_agents=1, max_steps=1e3):
@ -16,6 +16,7 @@ class Factory(object):
def reset(self): def reset(self):
self.done = False self.done = False
self.steps = 0
self.agents = np.zeros((self.n_agents, *self.level.shape), dtype=np.int8) self.agents = np.zeros((self.n_agents, *self.level.shape), dtype=np.int8)
free_cells = np.argwhere(self.level == 0) free_cells = np.argwhere(self.level == 0)
np.random.shuffle(free_cells) np.random.shuffle(free_cells)
@ -30,6 +31,7 @@ class Factory(object):
assert type(actions) in [int, list] assert type(actions) in [int, list]
if type(actions) == int: if type(actions) == int:
actions = [actions] actions = [actions]
self.steps += 1
r = 0 r = 0
# level, agent 1,..., agent n, # level, agent 1,..., agent n,
for i, a in enumerate(actions): for i, a in enumerate(actions):
@ -44,20 +46,26 @@ class Factory(object):
collisions_vec[i+1] = 0 # no self-collisions collisions_vec[i+1] = 0 # no self-collisions
collision_vecs.append(collisions_vec) collision_vecs.append(collisions_vec)
self.handle_collisions(collisions_vec) self.handle_collisions(collisions_vec)
r += self.step_core(collisions_vec, actions, r)
if self.steps >= self.max_steps:
self.done = True
return self.state, r, self.done, {} return self.state, r, self.done, {}
def make_move(self, agent_i, old_pos, new_pos): def make_move(self, agent_i, old_pos, new_pos):
(x, y), (x_new, y_new) = old_pos, new_pos (x, y), (x_new, y_new) = old_pos, new_pos
self.state[agent_i+1, x, y] = 0 self.state[agent_i+1, x, y] = 0
self.state[agent_i+1, x_new, y_new] = 1 self.state[agent_i+1, x_new, y_new] = 1
print( old_pos, new_pos) print(old_pos, new_pos)
def handle_collisions(self, vecs): def handle_collisions(self, vecs):
pass pass
def step_core(self, collisions_vec, actions, r):
return 0
if __name__ == '__main__': if __name__ == '__main__':
factory = Factory(n_agents=1) factory = BaseFactory(n_agents=1)
print(factory.state) print(factory.state)
state, r, done, _ = factory.step(0) state, r, done, _ = factory.step(0)
print(state) print(state)